Commits

commits@gajim.org

17632 discussions

gajim: fix buttons popup menu
by Denis Fomin 30 Jul '13

30 Jul '13

changeset 3aed37852ec6 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=3aed37852ec6 description: fix buttons popup menu diffstat: src/chat_control.py | 2 ++ 1 файлов изменено, 2 вставок(+), 0 удалений(-) различия (19 строк): diff -r 882b0cc47f48 -r 3aed37852ec6 src/chat_control.py --- a/src/chat_control.py Tue Jul 30 18:45:20 2013 +0400 +++ b/src/chat_control.py Tue Jul 30 20:05:28 2013 +0400 @@ -1162,6 +1162,7 @@ menu.append(item) menu.show_all() + menu.attach_to_widget(widget, None) gtkgui_helpers.popup_emoticons_under_button(menu, widget, self.parent_win) @@ -1183,6 +1184,7 @@ """ menu = self.prepare_context_menu(hide_buttonbar_items=True) menu.show_all() + menu.attach_to_widget(widget, None) gtkgui_helpers.popup_emoticons_under_button(menu, widget, self.parent_win)

1 0

gajim: fix textbuffer get_text
by Denis Fomin 30 Jul '13

30 Jul '13

changeset 882b0cc47f48 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=882b0cc47f48 description: fix textbuffer get_text diffstat: src/conversation_textview.py | 4 ++-- 1 файлов изменено, 2 вставок(+), 2 удалений(-) различия (21 строк): diff -r 271ac5e80c76 -r 882b0cc47f48 src/conversation_textview.py --- a/src/conversation_textview.py Mon Jul 29 21:41:01 2013 +0200 +++ b/src/conversation_textview.py Tue Jul 30 18:45:20 2013 +0400 @@ -489,7 +489,7 @@ buffer_ = self.tv.get_buffer() i1 = buffer_.get_iter_at_mark(m1) i2 = buffer_.get_iter_at_mark(m2) - txt = buffer_.get_text(i1, i2) + txt = buffer_.get_text(i1, i2, True) buffer_.delete(i1, i2) i2 = self.print_real_text(message, text_tags=['outgoingtxt'], name=name, xhtml=xhtml, iter_=i1) @@ -507,7 +507,7 @@ buffer_ = self.tv.get_buffer() i1 = buffer_.get_iter_at_mark(m1) i2 = buffer_.get_iter_at_mark(m2) - txt = buffer_.get_text(i1, i2) + txt = buffer_.get_text(i1, i2, True) buffer_.delete(i1, i2) i2 = self.print_real_text(message, text_tags=['incomingtxt'], name=name, xhtml=xhtml, iter_=i1)

1 0

gajim: don't crash when there is no plugin installed
by Yann Leboulanger 30 Jul '13

30 Jul '13

changeset 07c06b35d103 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=07c06b35d103 description: don't crash when there is no plugin installed diffstat: src/plugins/gui.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 6461a04f4664 -r 07c06b35d103 src/plugins/gui.py --- a/src/plugins/gui.py Sun Jul 28 13:54:45 2013 +0200 +++ b/src/plugins/gui.py Tue Jul 30 14:56:32 2013 +0200 @@ -102,7 +102,9 @@ self._clear_installed_plugin_info() self.fill_installed_plugins_model() - selection.select_iter(self.installed_plugins_model.get_iter_root()) + root_iter = self.installed_plugins_model.get_iter_root() + if root_iter: + selection.select_iter(root_iter) self.xml.connect_signals(self)

1 0

gajim: don't cycle through blobk nicknames when autocompletting ...
by Yann Leboulanger 29 Jul '13

29 Jul '13

changeset 14310e6d053d in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=14310e6d053d description: don't cycle through blobk nicknames when autocompletting nicks. Fixes #7398 diffstat: src/groupchat_control.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 1b82c080d974 -r 14310e6d053d src/groupchat_control.py --- a/src/groupchat_control.py Mon Jul 29 21:11:40 2013 +0200 +++ b/src/groupchat_control.py Mon Jul 29 22:05:39 2013 +0200 @@ -2297,7 +2297,9 @@ list_nick.remove(self.nick) # Skip self for nick in list_nick: - if nick.lower().startswith(begin.lower()): + fjid = self.room_jid + '/' + nick + if nick.lower().startswith(begin.lower()) and not \ + helpers.jid_is_blocked(self.account, fjid): # the word is the begining of a nick self.nick_hits.append(nick) if len(self.nick_hits):

1 0

gajim: GObject -> GLib
by Yann Leboulanger 29 Jul '13

29 Jul '13

changeset 271ac5e80c76 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=271ac5e80c76 description: GObject -> GLib diffstat: src/atom_window.py | 18 +++++++++--------- src/common/pep.py | 22 +++++++++++----------- src/history_manager.py | 9 ++++----- src/notify.py | 9 +++++---- 4 files changed, 29 insertions(+), 29 deletions(-) diffs (178 lines): diff -r 4bffdac79cba -r 271ac5e80c76 src/atom_window.py --- a/src/atom_window.py Sun Jul 28 12:58:15 2013 +0200 +++ b/src/atom_window.py Mon Jul 29 21:41:01 2013 +0200 @@ -23,7 +23,7 @@ from gi.repository import Gtk -from gi.repository import GObject +from gi.repository import GLib import gtkgui_helpers from common import helpers @@ -85,23 +85,23 @@ if newentry.feed_link is not None: self.feed_title_label.set_markup( '%s' % \ - GObject.markup_escape_text(newentry.feed_title)) + GLib.markup_escape_text(newentry.feed_title)) else: - self.feed_title_label.set_markup( - GObject.markup_escape_text(newentry.feed_title)) + self.feed_title_label.set_markup(GLib.markup_escape_text( + newentry.feed_title)) self.feed_tagline_label.set_markup( - '%s' % \ - GObject.markup_escape_text(newentry.feed_tagline)) + '%s' % GLib.markup_escape_text( + newentry.feed_tagline)) if newentry.title: if newentry.uri is not None: self.entry_title_label.set_markup( '%s' % \ - GObject.markup_escape_text(newentry.title)) + GLib.markup_escape_text(newentry.title)) else: - self.entry_title_label.set_markup( - GObject.markup_escape_text(newentry.title)) + self.entry_title_label.set_markup(GLib.markup_escape_text( + newentry.title)) else: self.entry_title_label.set_markup('') diff -r 4bffdac79cba -r 271ac5e80c76 src/common/pep.py --- a/src/common/pep.py Sun Jul 28 12:58:15 2013 +0200 +++ b/src/common/pep.py Mon Jul 29 21:41:01 2013 +0200 @@ -215,7 +215,7 @@ 'timestamp': _('timestamp'), 'uri': _('uri')} -from gi.repository import GObject +from gi.repository import GLib from gi.repository import Gtk from gi.repository import GdkPixbuf @@ -299,10 +299,10 @@ assert not self._retracted untranslated_mood = self._pep_specific_data['mood'] mood = self._translate_mood(untranslated_mood) - markuptext = '%s' % GObject.markup_escape_text(mood) + markuptext = '%s' % GLib.markup_escape_text(mood) if 'text' in self._pep_specific_data: text = self._pep_specific_data['text'] - markuptext += ' (%s)' % GObject.markup_escape_text(text) + markuptext += ' (%s)' % GLib.markup_escape_text(text) return markuptext def _translate_mood(self, mood): @@ -339,13 +339,13 @@ tune = self._pep_specific_data artist = tune.get('artist', _('Unknown Artist')) - artist = GObject.markup_escape_text(artist) + artist = GLib.markup_escape_text(artist) title = tune.get('title', _('Unknown Title')) - title = GObject.markup_escape_text(title) + title = GLib.markup_escape_text(title) source = tune.get('source', _('Unknown Source')) - source = GObject.markup_escape_text(source) + source = GLib.markup_escape_text(source) tune_string = _('"%(title)s" by %(artist)s\n' 'from %(source)s') % {'title': title, @@ -392,12 +392,12 @@ subactivity = ACTIVITIES[activity][subactivity] activity = ACTIVITIES[activity]['category'] - markuptext = '' + GObject.markup_escape_text(activity) + markuptext = '' + GLib.markup_escape_text(activity) if subactivity: - markuptext += ': ' + GObject.markup_escape_text(subactivity) + markuptext += ': ' + GLib.markup_escape_text(subactivity) markuptext += '' if text: - markuptext += ' (%s)' % GObject.markup_escape_text(text) + markuptext += ' (%s)' % GLib.markup_escape_text(text) return markuptext @@ -463,7 +463,7 @@ for entry in location.keys(): text = location[entry] - text = GObject.markup_escape_text(text) + text = GLib.markup_escape_text(text) # Translate standart location tag tag = LOCATION_DATA.get(entry, entry) location_string += '\n%(tag)s: %(text)s' % \ @@ -473,4 +473,4 @@ SUPPORTED_PERSONAL_USER_EVENTS = [UserMoodPEP, UserTunePEP, UserActivityPEP, - UserNicknamePEP, UserLocationPEP] \ No newline at end of file + UserNicknamePEP, UserLocationPEP] diff -r 4bffdac79cba -r 271ac5e80c76 src/history_manager.py --- a/src/history_manager.py Sun Jul 28 12:58:15 2013 +0200 +++ b/src/history_manager.py Mon Jul 29 21:41:01 2013 +0200 @@ -51,7 +51,7 @@ import signal from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import GObject +from gi.repository import GLib import time import locale @@ -417,10 +417,9 @@ message_ = '<span' if color: message_ += ' foreground="%s"' % color - message_ += '>%s' % \ - GObject.markup_escape_text(message) - self.logs_liststore.append((str(log_line_id), str(jid_id), time_, - message_, subject, nickname)) + message_ += '>%s' % GLib.markup_escape_text(message) + self.logs_liststore.append((str(log_line_id), str(jid_id), + time_, message_, subject, nickname)) def _fill_search_results_listview(self, text): """ diff -r 4bffdac79cba -r 271ac5e80c76 src/notify.py --- a/src/notify.py Sun Jul 28 12:58:15 2013 +0200 +++ b/src/notify.py Mon Jul 29 21:41:01 2013 +0200 @@ -31,6 +31,7 @@ import time from dialogs import PopupNotificationWindow from gi.repository import GObject +from gi.repository import GLib import gtkgui_helpers from gi.repository import Gtk @@ -89,7 +90,7 @@ if gajim.config.get('use_notif_daemon') and dbus_support.supported: try: DesktopNotification(event_type, jid, account, msg_type, - path_to_image, title, GObject.markup_escape_text(text), timeout) + path_to_image, title, GLib.markup_escape_text(text), timeout) return # sucessfully did D-Bus Notification procedure! except dbus.DBusException as e: # Connection to D-Bus failed @@ -103,10 +104,10 @@ if not text and event_type == 'new_message': # empty text for new_message means do_preview = False # -> default value for text - _text = GObject.markup_escape_text( - gajim.get_name_from_jid(account, jid)) + _text = GLib.markup_escape_text(gajim.get_name_from_jid(account, + jid)) else: - _text = GObject.markup_escape_text(text) + _text = GLib.markup_escape_text(text) if not title: _title = ''

1 0

gajim: fix var name
by Yann Leboulanger 29 Jul '13

29 Jul '13

changeset 4bffdac79cba in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4bffdac79cba description: fix var name diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e054e60443e2 -r 4bffdac79cba src/common/connection.py --- a/src/common/connection.py Mon Jul 29 23:01:53 2013 +0400 +++ b/src/common/connection.py Sun Jul 28 12:58:15 2013 +0200 @@ -457,7 +457,7 @@ iqs.append(iq) msg_iq = iqs else: - msg_id.setTo(fjid) + msg_iq.setTo(fjid) if resource: contact = gajim.contacts.get_contact(self.name, jid, resource) else:

1 0

gajim: use correct function to set tooltip
by Yann Leboulanger 29 Jul '13

29 Jul '13

changeset 1b82c080d974 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1b82c080d974 description: use correct function to set tooltip diffstat: src/chat_control.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (25 lines): diff -r f5c74802fc40 -r 1b82c080d974 src/chat_control.py --- a/src/chat_control.py Mon Jul 29 10:54:48 2013 +0200 +++ b/src/chat_control.py Mon Jul 29 21:11:40 2013 +0200 @@ -1755,16 +1755,16 @@ # Formatting if self.contact.supports(NS_XHTML_IM) and not self.gpg_is_active: self._formattings_button.set_sensitive(True) - self._formattings_button.set_tooltip(_( + self._formattings_button.set_tooltip_text(_( 'Show a list of formattings')) else: self._formattings_button.set_sensitive(False) if self.contact.supports(NS_XHTML_IM): - self._formattings_button.set_tooltip(_('Formattings are not ' - 'available when GPG is active')) + self._formattings_button.set_tooltip_text(_('Formattings are ' + 'not available when GPG is active')) else: - self._formattings_button.set_tooltip(_('This contact does not ' - 'support HTML')) + self._formattings_button.set_tooltip_text(_('This contact does ' + 'not support HTML')) # Add to roster if not isinstance(self.contact, GC_Contact) \

1 0

gajim: Fix roster resizing in one window mode
by Denis Fomin 29 Jul '13

29 Jul '13

changeset e054e60443e2 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e054e60443e2 description: Fix roster resizing in one window mode diffstat: src/roster_window.py | 1 + 1 файлов изменено, 1 вставок(+), 0 удалений(-) различия (11 строк): diff -r 493b1afcd45d -r e054e60443e2 src/roster_window.py --- a/src/roster_window.py Mon Jul 29 18:35:49 2013 +0200 +++ b/src/roster_window.py Mon Jul 29 23:01:53 2013 +0400 @@ -6474,6 +6474,7 @@ self.status_combobox.add_attribute(cell, 'sensitive', 3) cell = Gtk.CellRendererText() + cell.set_property('ellipsize', Pango.EllipsizeMode.END) cell.set_property('xpad', 5) # padding for status text self.status_combobox.pack_start(cell, True) # text to show is in in first column of liststore

1 0

gajim: render_icon -> render_icon_pixbuf
by Yann Leboulanger 29 Jul '13

29 Jul '13

changeset 2aa7b24c6157 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=2aa7b24c6157 description: render_icon -> render_icon_pixbuf diffstat: src/filetransfers_window.py | 3 ++- src/plugins/gui.py | 2 +- src/roster_window.py | 7 +++---- 3 files changed, 6 insertions(+), 6 deletions(-) diffs (49 lines): diff -r 8683c53f409f -r 2aa7b24c6157 src/filetransfers_window.py --- a/src/filetransfers_window.py Mon Jul 29 18:22:19 2013 +0200 +++ b/src/filetransfers_window.py Mon Jul 29 18:29:24 2013 +0200 @@ -473,7 +473,8 @@ def get_icon(self, ident): return self.images.setdefault(ident, - self.window.render_icon(self.icons[ident], Gtk.IconSize.MENU)) + self.window.render_icon_pixbuf(self.icons[ident], + Gtk.IconSize.MENU)) def set_status(self,file_props, status): """ diff -r 8683c53f409f -r 2aa7b24c6157 src/plugins/gui.py --- a/src/plugins/gui.py Mon Jul 29 18:22:19 2013 +0200 +++ b/src/plugins/gui.py Mon Jul 29 18:29:24 2013 +0200 @@ -91,7 +91,7 @@ self.installed_plugins_treeview.append_column(col) icon = Gtk.Image() - self.def_icon = icon.render_icon(Gtk.STOCK_PREFERENCES, + self.def_icon = icon.render_icon_pixbuf(Gtk.STOCK_PREFERENCES, Gtk.IconSize.MENU) # connect signal for selection change diff -r 8683c53f409f -r 2aa7b24c6157 src/roster_window.py --- a/src/roster_window.py Mon Jul 29 18:22:19 2013 +0200 +++ b/src/roster_window.py Mon Jul 29 18:29:24 2013 +0200 @@ -262,9 +262,8 @@ tls_pixbuf = None if gajim.account_is_securely_connected(account): # the only way to create a pixbuf from stock - tls_pixbuf = self.window.render_icon( - Gtk.STOCK_DIALOG_AUTHENTICATION, - Gtk.IconSize.MENU) + tls_pixbuf = self.window.render_icon_pixbuf( + Gtk.STOCK_DIALOG_AUTHENTICATION, Gtk.IconSize.MENU) it = self.model.append(None, [ gajim.interface.jabber_state_images['16'][show], @@ -1040,7 +1039,7 @@ if gajim.account_is_securely_connected(account) and not self.regroup or\ self.regroup and num_of_secured and num_of_secured == num_of_accounts: # the only way to create a pixbuf from stock - tls_pixbuf = self.window.render_icon( + tls_pixbuf = self.window.render_icon_pixbuf( Gtk.STOCK_DIALOG_AUTHENTICATION, Gtk.IconSize.MENU) self.model[child_iter][C_PADLOCK_PIXBUF] = tls_pixbuf else:

1 0

gajim: GObject -> GLib
by Yann Leboulanger 29 Jul '13

29 Jul '13

changeset 493b1afcd45d in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=493b1afcd45d description: GObject -> GLib diffstat: src/command_system/implementation/execute.py | 4 ++-- src/common/protocol/bytestream.py | 6 +++--- src/common/zeroconf/connection_zeroconf.py | 4 ++-- src/dataforms_widget.py | 3 ++- src/history_window.py | 6 +++--- src/ipython_view.py | 9 +++++---- src/message_textview.py | 3 ++- src/remote_control.py | 22 +++++++++++----------- 8 files changed, 30 insertions(+), 27 deletions(-) diffs (263 lines): diff -r 2aa7b24c6157 -r 493b1afcd45d src/command_system/implementation/execute.py --- a/src/command_system/implementation/execute.py Mon Jul 29 18:29:24 2013 +0200 +++ b/src/command_system/implementation/execute.py Mon Jul 29 18:35:49 2013 +0200 @@ -35,7 +35,7 @@ from subprocess import Popen, PIPE from os.path import expanduser -from gi.repository import GObject +from gi.repository import GLib from ..framework import CommandContainer, command, doc from .hosts import * @@ -64,7 +64,7 @@ @classmethod def monitor(cls, processor, popen): poller = cls.poller(processor, popen) - GObject.timeout_add(cls.POLL_INTERVAL, next, poller) + GLib.timeout_add(cls.POLL_INTERVAL, next, poller) @classmethod def poller(cls, processor, popen): diff -r 2aa7b24c6157 -r 493b1afcd45d src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Mon Jul 29 18:29:24 2013 +0200 +++ b/src/common/protocol/bytestream.py Mon Jul 29 18:35:49 2013 +0200 @@ -30,7 +30,7 @@ import socket import base64 -from gi.repository import GObject +from gi.repository import GLib import time import nbxmpp @@ -442,7 +442,7 @@ def cleanup_gupnp(): if self.no_gupnp_reply_id: - GObject.source_remove(self.no_gupnp_reply_id) + GLib.source_remove(self.no_gupnp_reply_id) self.no_gupnp_reply_id = 0 gajim.gupnp_igd.disconnect(self.ok_id) gajim.gupnp_igd.disconnect(self.fail_id) @@ -482,7 +482,7 @@ self.fail_id = gajim.gupnp_igd.connect('error-mapping-port', fail) port = gajim.config.get('file_transfers_port') - self.no_gupnp_reply_id = GObject.timeout_add_seconds(10, no_upnp_reply) + self.no_gupnp_reply_id = GLib.timeout_add_seconds(10, no_upnp_reply) gajim.gupnp_igd.add_port('TCP', 0, my_ip, port, 3600, 'Gajim file transfer') diff -r 2aa7b24c6157 -r 493b1afcd45d src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Mon Jul 29 18:29:24 2013 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Mon Jul 29 18:35:49 2013 +0200 @@ -39,7 +39,7 @@ if os.name != 'nt': signal.signal(signal.SIGPIPE, signal.SIG_DFL) import getpass -from gi.repository import GObject +from gi.repository import GLib from common.connection import CommonConnection from common import gajim @@ -239,7 +239,7 @@ # refresh all contacts data every five seconds self.call_resolve_timeout = True - GObject.timeout_add_seconds(5, self._on_resolve_timeout) + GLib.timeout_add_seconds(5, self._on_resolve_timeout) return True def disconnect(self, on_purpose=False): diff -r 2aa7b24c6157 -r 493b1afcd45d src/dataforms_widget.py --- a/src/dataforms_widget.py Mon Jul 29 18:29:24 2013 +0200 +++ b/src/dataforms_widget.py Mon Jul 29 18:35:49 2013 +0200 @@ -29,6 +29,7 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GObject +from gi.repository import GLib import base64 import gtkgui_helpers @@ -640,7 +641,7 @@ dialogs.ErrorDialog( _('Jabber ID already in list'), _('The Jabber ID you entered is already in the list. Choose another one.')) - GObject.idle_add(treeview.set_cursor, path) + GLib.idle_add(treeview.set_cursor, path) return model[path][0]=newtext diff -r 2aa7b24c6157 -r 493b1afcd45d src/history_window.py --- a/src/history_window.py Mon Jul 29 18:29:24 2013 +0200 +++ b/src/history_window.py Mon Jul 29 18:35:49 2013 +0200 @@ -27,7 +27,7 @@ from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import GObject +from gi.repository import GLib import time import calendar @@ -120,7 +120,7 @@ # This will load history too task = self._fill_completion_dict() - GObject.idle_add(next, task) + GLib.idle_add(next, task) if jid: self.jid_entry.set_text(jid) @@ -634,7 +634,7 @@ self.jid_entry.set_text(jid) if account and account not in self.accounts_seen_online: # Update dict to not only show bare jid - GObject.idle_add(next, self._fill_completion_dict()) + GLib.idle_add(next, self._fill_completion_dict()) else: # Only in that case because it's called by self._fill_completion_dict() # otherwise diff -r 2aa7b24c6157 -r 493b1afcd45d src/ipython_view.py --- a/src/ipython_view.py Mon Jul 29 18:29:24 2013 +0200 +++ b/src/ipython_view.py Mon Jul 29 18:35:49 2013 +0200 @@ -44,6 +44,7 @@ from gi.repository import Gtk from gi.repository import GObject +from gi.repository import GLib import re import sys import os @@ -367,7 +368,7 @@ self.connect('key-press-event', self.onKeyPress) def write(self, text, editable=False): - GObject.idle_add(self._write, text, editable) + GLib.idle_add(self._write, text, editable) def _write(self, text, editable=False): """ @@ -401,7 +402,7 @@ def showPrompt(self, prompt): - GObject.idle_add(self._showPrompt, prompt) + GLib.idle_add(self._showPrompt, prompt) def _showPrompt(self, prompt): """ @@ -415,7 +416,7 @@ self.text_buffer.get_end_iter()) def changeLine(self, text): - GObject.idle_add(self._changeLine, text) + GLib.idle_add(self._changeLine, text) def _changeLine(self, text): """ @@ -442,7 +443,7 @@ return rv def showReturned(self, text): - GObject.idle_add(self._showReturned, text) + GLib.idle_add(self._showReturned, text) def _showReturned(self, text): """ diff -r 2aa7b24c6157 -r 493b1afcd45d src/message_textview.py --- a/src/message_textview.py Mon Jul 29 18:29:24 2013 +0200 +++ b/src/message_textview.py Mon Jul 29 18:35:49 2013 +0200 @@ -26,6 +26,7 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GObject +from gi.repository import GLib from gi.repository import Pango import gtkgui_helpers @@ -284,7 +285,7 @@ return None def destroy(self): - GObject.idle_add(gc.collect) + GLib.idle_add(gc.collect) def clear(self, widget = None): """ diff -r 2aa7b24c6157 -r 493b1afcd45d src/remote_control.py --- a/src/remote_control.py Mon Jul 29 18:29:24 2013 +0200 +++ b/src/remote_control.py Mon Jul 29 18:35:49 2013 +0200 @@ -26,7 +26,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -from gi.repository import GObject +from gi.repository import GLib from gi.repository import Gtk import os import base64 @@ -559,8 +559,8 @@ if account not in gajim.connections: return DBUS_BOOLEAN(False) status = gajim.SHOW_LIST[gajim.connections[account].connected] - GObject.idle_add(gajim.interface.roster.send_status, account, - status, message) + GLib.idle_add(gajim.interface.roster.send_status, account, status, + message) else: # account not specified, so change the status of all accounts for acc in gajim.contacts.get_accounts(): @@ -573,8 +573,8 @@ if acc not in gajim.connections: continue status_ = gajim.SHOW_LIST[gajim.connections[acc].connected] - GObject.idle_add(gajim.interface.roster.send_status, acc, - status_, message) + GLib.idle_add(gajim.interface.roster.send_status, acc, status_, + message) return DBUS_BOOLEAN(False) @dbus.service.method(INTERFACE, in_signature='ss', out_signature='') @@ -587,8 +587,8 @@ gajim.config.set_per('accounts', account, 'priority', prio) show = gajim.SHOW_LIST[gajim.connections[account].connected] status = gajim.connections[account].status - GObject.idle_add(gajim.connections[account].change_status, show, - status) + GLib.idle_add(gajim.connections[account].change_status, show, + status) else: # account not specified, so change prio of all accounts for acc in gajim.contacts.get_accounts(): @@ -600,8 +600,8 @@ gajim.config.set_per('accounts', acc, 'priority', prio) show = gajim.SHOW_LIST[gajim.connections[acc].connected] status = gajim.connections[acc].status - GObject.idle_add(gajim.connections[acc].change_status, show, - status) + GLib.idle_add(gajim.connections[acc].change_status, show, + status) @dbus.service.method(INTERFACE, in_signature='', out_signature='') def show_next_pending_event(self): @@ -693,7 +693,7 @@ """ win = gajim.interface.roster.window if win.get_property('visible'): - GObject.idle_add(win.hide) + GLib.idle_add(win.hide) else: win.present() # preserve the 'steal focus preservation' @@ -723,7 +723,7 @@ win = gajim.ipython_window if win: if win.window.is_visible(): - GObject.idle_add(win.hide) + GLib.idle_add(win.hide) else: win.show_all() win.present()

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits