Commits February 2010

commits@gajim.org

4 participants
103 discussions

gajim: add StartCom's Root CA Certificate. Fixes #5569
by Yann Leboulanger 14 Feb '10

14 Feb '10

changeset 8062f56beacc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8062f56beacc description: add StartCom's Root CA Certificate. Fixes #5569 diffstat: data/other/cacerts.pem | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diffs (52 lines): diff -r 977eb238924a -r 8062f56beacc data/other/cacerts.pem --- a/data/other/cacerts.pem Mon Jan 25 18:17:43 2010 +0100 +++ b/data/other/cacerts.pem Mon Jan 25 18:54:43 2010 +0100 @@ -2507,3 +2507,48 @@ lhMZMHD/ivqg8faZSQNYMg6xq7I= -----END CERTIFICATE----- +StartCom_root_Certificate +-----BEGIN CERTIFICATE----- +MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW +MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg +Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh +dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9 +MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi +U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh +cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA +A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk +pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf +OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C +Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT +Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi +HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM +Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w ++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+ +Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3 +Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B +26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID +AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE +FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j +ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js +LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM +BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0 +Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy +dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh +cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh +YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg +dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp +bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ +YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT +TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ +9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8 +jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW +FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz +ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1 +ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L +EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu +L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq +yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC +O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V +um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh +NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14= +-----END CERTIFICATE-----

1 0

gajim: make rename and remove buttons insensitive when no accoun...
by Yann Leboulanger 14 Feb '10

14 Feb '10

changeset 977eb238924a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=977eb238924a description: make rename and remove buttons insensitive when no account is selected. Fixes #5577 diffstat: src/config.py | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diffs (39 lines): diff -r 5b1c4bd2a134 -r 977eb238924a src/config.py --- a/src/config.py Wed Jan 20 12:23:46 2010 +0100 +++ b/src/config.py Mon Jan 25 18:17:43 2010 +0100 @@ -1342,8 +1342,8 @@ self.accounts_treeview.set_model(model) # column renderer = gtk.CellRendererText() - self.accounts_treeview.insert_column_with_attributes(-1, - _('Name'), renderer, text = 0) + self.accounts_treeview.insert_column_with_attributes(-1, _('Name'), + renderer, text=0) self.current_account = None # When we fill info, we don't want to handle the changed signals @@ -1360,7 +1360,8 @@ st = gajim.config.get('mergeaccounts') checkbutton = self.xml.get_widget('merge_checkbutton') checkbutton.set_active(st) - # prevent roster redraws by connecting the signal after button state is set + # prevent roster redraws by connecting the signal after button state is + # set checkbutton.connect('toggled', self.on_merge_checkbutton_toggled) self.avahi_available = True @@ -1476,8 +1477,12 @@ self.check_resend_relog() - self.remove_button.set_sensitive(True) - self.rename_button.set_sensitive(True) + if account: + self.remove_button.set_sensitive(True) + self.rename_button.set_sensitive(True) + else: + self.remove_button.set_sensitive(False) + self.rename_button.set_sensitive(False) if iter_: self.current_account = account if account == gajim.ZEROCONF_ACC_NAME:

1 0

gajim: send pep info only once we are connected. Fixes #5567
by Yann Leboulanger 14 Feb '10

14 Feb '10

changeset 5b1c4bd2a134 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5b1c4bd2a134 description: send pep info only once we are connected. Fixes #5567 diffstat: src/common/connection.py | 9 +++++---- src/common/connection_handlers.py | 25 +++++++++++++++++++++++++ src/common/pep.py | 22 ++++++++++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) diffs (134 lines): diff -r 8578bc7cbd4e -r 5b1c4bd2a134 src/common/connection.py --- a/src/common/connection.py Tue Jan 19 22:52:17 2010 +0100 +++ b/src/common/connection.py Wed Jan 20 12:23:46 2010 +0100 @@ -217,6 +217,7 @@ # We are doing disconnect at so many places, better use one function in all def disconnect(self, on_purpose=False): gajim.interface.music_track_changed(None, None, self.name) + self.reset_awaiting_pep() self.on_purpose = on_purpose self.connected = 0 self.time_to_reconnect = None @@ -973,16 +974,16 @@ self.priority = priority self.dispatch('STATUS', 'invisible') if initial: - #ask our VCard + # ask our VCard self.request_vcard(None) - #Get bookmarks from private namespace + # Get bookmarks from private namespace self.get_bookmarks() - #Get annotations + # Get annotations self.get_annotations() - #Inform GUI we just signed in + # Inform GUI we just signed in self.dispatch('SIGNED_IN', ()) def test_gpg_passphrase(self, password): diff -r 8578bc7cbd4e -r 5b1c4bd2a134 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jan 19 22:52:17 2010 +0100 +++ b/src/common/connection_handlers.py Wed Jan 20 12:23:46 2010 +0100 @@ -1480,6 +1480,7 @@ self.gmail_last_tid = None self.gmail_last_time = None + self.reset_awaiting_pep() def build_http_auth_answer(self, iq_obj, answer): if not self.connection or self.connected < 2: @@ -2145,6 +2146,29 @@ self.dispatch('GC_INVITATION',(frm, jid_from, reason, password, is_continued)) + def reset_awaiting_pep(self): + self.to_be_sent_activity = None + self.to_be_sent_mood = None + self.to_be_sent_tune = None + self.to_be_sent_nick = None + self.to_be_sent_location = None + + def send_awaiting_pep(self): + """ + Send pep info that were waiting for connection + """ + if self.to_be_sent_activity: + self.send_activity(*self.to_be_sent_activity) + if self.to_be_sent_mood: + self.send_mood(*self.to_be_sent_mood) + if self.to_be_sent_tune: + self.send_tune(*self.to_be_sent_tune) + if self.to_be_sent_nick: + self.send_nick(self.to_be_sent_nick) + if self.to_be_sent_location: + self.send_location(self.to_be_sent_location) + self.reset_awaiting_pep() + def _pubsubEventCB(self, con, msg): ''' Called when we receive <message/> with pubsub event. ''' # TODO: Logging? (actually services where logging would be useful, should @@ -2694,6 +2718,7 @@ # Inform GUI we just signed in self.dispatch('SIGNED_IN', ()) + self.send_awaiting_pep() self.continue_connect_info = None def request_gmail_notifications(self): diff -r 8578bc7cbd4e -r 5b1c4bd2a134 src/common/pep.py --- a/src/common/pep.py Tue Jan 19 22:52:17 2010 +0100 +++ b/src/common/pep.py Wed Jan 20 12:23:46 2010 +0100 @@ -470,6 +470,11 @@ contact.contact_name = '' def user_send_mood(account, mood, message=''): + if common.gajim.connections[account].connected == 1: + # We are connecting, keep mood in mem and send it when we'll be + # conencted + common.gajim.connections[account].to_be_sent_mood = (mood, message) + return if not common.gajim.connections[account].pep_supported: return item = xmpp.Node('mood', {'xmlns': xmpp.NS_MOOD}) @@ -483,6 +488,12 @@ '0') def user_send_activity(account, activity, subactivity='', message=''): + if common.gajim.connections[account].connected == 1: + # We are connecting, keep activity in mem and send it when we'll be + # conencted + common.gajim.connections[account].to_be_sent_activity = (activity, + subactivity, message) + return if not common.gajim.connections[account].pep_supported: return item = xmpp.Node('activity', {'xmlns': xmpp.NS_ACTIVITY}) @@ -499,6 +510,12 @@ def user_send_tune(account, artist='', title='', source='', track=0, length=0, items=None): + if common.gajim.connections[account].connected == 1: + # We are connecting, keep tune in mem and send it when we'll be + # conencted + common.gajim.connections[account].to_be_sent_tune = tune = (artist, + title, source, track, length, items) + return if not (common.gajim.config.get_per('accounts', account, 'publish_tune') and\ common.gajim.connections[account].pep_supported): return @@ -525,6 +542,11 @@ '0') def user_send_nickname(account, nick): + if common.gajim.connections[account].connected == 1: + # We are connecting, keep nickname in mem and send it when we'll be + # conencted + common.gajim.connections[account].to_be_sent_nick = nick + return if not common.gajim.connections[account].pep_supported: return item = xmpp.Node('nick', {'xmlns': xmpp.NS_NICK})

1 0

gajim: prevent printing a useless traceback when gajim fails to ...
by Yann Leboulanger 14 Feb '10

14 Feb '10

changeset 8578bc7cbd4e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8578bc7cbd4e description: prevent printing a useless traceback when gajim fails to start diffstat: src/gajim.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 3ecfd0b5f0ea -r 8578bc7cbd4e src/gajim.py --- a/src/gajim.py Fri Jan 15 20:20:56 2010 +0100 +++ b/src/gajim.py Tue Jan 19 22:52:17 2010 +0100 @@ -389,7 +389,8 @@ if os.path.exists(pid_filename): os.remove(pid_filename) # Shutdown GUI and save config - gajim.interface.roster.prepare_quit() + if hasattr(gajim.interface, 'roster'): + gajim.interface.roster.prepare_quit() import atexit atexit.register(on_exit)

1 0

gajim: don't set default action fot gtkhexcepthook window. Fixes...
by Yann Leboulanger 14 Feb '10

14 Feb '10

changeset 3ecfd0b5f0ea in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3ecfd0b5f0ea description: don't set default action fot gtkhexcepthook window. Fixes #5556 diffstat: src/gtkexcepthook.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 86f514ca1093 -r 3ecfd0b5f0ea src/gtkexcepthook.py --- a/src/gtkexcepthook.py Sun Feb 14 11:24:37 2010 +0100 +++ b/src/gtkexcepthook.py Fri Jan 15 20:20:56 2010 +0100 @@ -52,7 +52,6 @@ RESPONSE_REPORT_BUG = 42 dialog.add_buttons(gtk.STOCK_CLOSE, gtk.BUTTONS_CLOSE, _('_Report Bug'), RESPONSE_REPORT_BUG) - dialog.set_default_response(RESPONSE_REPORT_BUG) report_button = dialog.action_area.get_children()[0] # right to left report_button.grab_focus()

1 0

gajim: process network events faster under windows so Gajim reac...
by Yann Leboulanger 14 Feb '10

14 Feb '10

changeset 156370d12880 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=156370d12880 description: process network events faster under windows so Gajim reacts faster. diffstat: src/common/xmpp/idlequeue.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 53a7f6738002 -r 156370d12880 src/common/xmpp/idlequeue.py --- a/src/common/xmpp/idlequeue.py Fri Feb 12 22:35:07 2010 +0100 +++ b/src/common/xmpp/idlequeue.py Sun Feb 14 21:07:19 2010 +0100 @@ -215,7 +215,7 @@ # (timeout, boolean) # Boolean is True if timeout is specified in seconds, False means miliseconds - PROCESS_TIMEOUT = (200, False) + PROCESS_TIMEOUT = (100, False) def __init__(self): self.queue = {}

1 0

gajim: [Mattj] Fix connection to facebook server that don't unde...
by Yann Leboulanger 14 Feb '10

14 Feb '10

changeset 86f514ca1093 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=86f514ca1093 description: [Mattj] Fix connection to facebook server that don't understand ver="" in roster query. diffstat: src/common/connection_handlers.py | 9 +++++++-- src/common/xmpp/protocol.py | 1 + src/common/xmpp/roster_nb.py | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) diffs (53 lines): diff -r cbcb30a77ac6 -r 86f514ca1093 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Jan 29 22:29:25 2010 +0100 +++ b/src/common/connection_handlers.py Sun Feb 14 11:24:37 2010 +0100 @@ -1182,9 +1182,14 @@ else: if iq_obj.getErrorCode() not in ('403', '406', '404'): self.private_storage_supported = False + # We can now continue connection by requesting the roster - version = gajim.config.get_per('accounts', self.name, - 'roster_version') + version = None + if con.Stream.features.getTag('ver', + namespace=common.xmpp.NS_ROSTER_VER): + version = gajim.config.get_per('accounts', self.name, + 'roster_version') + iq_id = self.connection.initRoster(version=version) self.awaiting_answers[iq_id] = (ROSTER_ARRIVED, ) elif self.awaiting_answers[id_][0] == ROSTER_ARRIVED: diff -r cbcb30a77ac6 -r 86f514ca1093 src/common/xmpp/protocol.py --- a/src/common/xmpp/protocol.py Fri Jan 29 22:29:25 2010 +0100 +++ b/src/common/xmpp/protocol.py Sun Feb 14 11:24:37 2010 +0100 @@ -86,6 +86,7 @@ NS_REGISTER ='jabber:iq:register' NS_ROSTER ='jabber:iq:roster' NS_ROSTERX ='http://jabber.org/protocol/rosterx' # XEP-0144 +NS_ROSTER_VER ='urn:xmpp:features:rosterver' # XEP-0273 NS_RPC ='jabber:iq:rpc' # XEP-0009 NS_SASL ='urn:ietf:params:xml:ns:xmpp-sasl' NS_SEARCH ='jabber:iq:search' diff -r cbcb30a77ac6 -r 86f514ca1093 src/common/xmpp/roster_nb.py --- a/src/common/xmpp/roster_nb.py Fri Jan 29 22:29:25 2010 +0100 +++ b/src/common/xmpp/roster_nb.py Sun Feb 14 11:24:37 2010 +0100 @@ -36,7 +36,7 @@ You can also use mapping interface for access to the internal representation of contacts in roster. ''' - def __init__(self, version=''): + def __init__(self, version=None): ''' Init internal variables. ''' PlugIn.__init__(self) self.version = version @@ -52,7 +52,8 @@ elif not force: return iq = Iq('get',NS_ROSTER) - iq.setTagAttr('query', 'ver', self.version) + if self.version is not None: + iq.setTagAttr('query', 'ver', self.version) id_ = self._owner.getAnID() iq.setID(id_) self._owner.send(iq)

1 0

gajim: improve bigger avatar behaviour in case on_avatar_eventbo...
by Yann Leboulanger 12 Feb '10

12 Feb '10

changeset 53a7f6738002 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=53a7f6738002 description: improve bigger avatar behaviour in case on_avatar_eventbox_enter_notify_event is called twice (when using unclutter). Fixes #5590 diffstat: src/chat_control.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (20 lines): diff -r 31cb58641c1d -r 53a7f6738002 src/chat_control.py --- a/src/chat_control.py Thu Feb 11 18:57:39 2010 +0100 +++ b/src/chat_control.py Fri Feb 12 22:35:07 2010 +0100 @@ -1689,6 +1689,8 @@ # do we have something bigger to show? if avatar_w > scaled_buf_w or avatar_h > scaled_buf_h: # wait for 0.5 sec in case we leave earlier + if self.show_bigger_avatar_timeout_id is not None: + gobject.source_remove(self.show_bigger_avatar_timeout_id) self.show_bigger_avatar_timeout_id = gobject.timeout_add(500, self.show_bigger_avatar, widget) @@ -1699,6 +1701,7 @@ # did we add a timeout? if yes remove it if self.show_bigger_avatar_timeout_id is not None: gobject.source_remove(self.show_bigger_avatar_timeout_id) + self.show_bigger_avatar_timeout_id = None def on_avatar_eventbox_button_press_event(self, widget, event): """

1 0

gajim: rename gc_banner_status_image to banner_status_image so i...
by Yann Leboulanger 12 Feb '10

12 Feb '10

changeset 96aff3fee71f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=96aff3fee71f description: rename gc_banner_status_image to banner_status_image so it's the same than schat control diffstat: data/gui/groupchat_control.ui | 2 +- src/groupchat_control.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 70290e2cb9a3 -r 96aff3fee71f data/gui/groupchat_control.ui --- a/data/gui/groupchat_control.ui Fri Feb 12 20:41:21 2010 +0100 +++ b/data/gui/groupchat_control.ui Fri Feb 12 21:08:40 2010 +0100 @@ -19,7 +19,7 @@ <object class="GtkHBox" id="hbox3024"> <property name="visible">True</property> <child> - <object class="GtkImage" id="gc_banner_status_image"> + <object class="GtkImage" id="banner_status_image"> <property name="visible">True</property> <property name="stock">gtk-missing-image</property> </object> diff -r 70290e2cb9a3 -r 96aff3fee71f src/groupchat_control.py --- a/src/groupchat_control.py Fri Feb 12 20:41:21 2010 +0100 +++ b/src/groupchat_control.py Fri Feb 12 21:08:40 2010 +0100 @@ -580,7 +580,7 @@ self.change_roster_style() def _update_banner_state_image(self): - banner_status_img = self.xml.get_object('gc_banner_status_image') + banner_status_img = self.xml.get_object('banner_status_image') images = gajim.interface.jabber_state_images if self.room_jid in gajim.gc_connected[self.account] and \ gajim.gc_connected[self.account][self.room_jid]:

1 0

gajim: fix acronyms expander plugin
by Yann Leboulanger 12 Feb '10

12 Feb '10

changeset 70290e2cb9a3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=70290e2cb9a3 description: fix acronyms expander plugin diffstat: plugins/acronyms_expander.py | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diffs (43 lines): diff -r 76cf197892e5 -r 70290e2cb9a3 plugins/acronyms_expander.py --- a/plugins/acronyms_expander.py Fri Feb 12 09:14:47 2010 +0100 +++ b/plugins/acronyms_expander.py Fri Feb 12 20:41:21 2010 +0100 @@ -27,6 +27,7 @@ import sys import gtk +import gobject from plugins import GajimPlugin from plugins.helpers import log, log_calls @@ -70,19 +71,15 @@ t = tb.get_text(tb.get_start_iter(), tb.get_end_iter()) #log.debug('%s %d'%(t, len(t))) if t and t[-1] == INVOKER: - #log.debug("changing msg text") + #log.debug('changing msg text') base,sep,head=t[:-1].rpartition(INVOKER) - #log.debug('%s | %s | %s'%(base, sep, head)) + log.debug('%s | %s | %s'%(base, sep, head)) if head in ACRONYMS: head = ACRONYMS[head] - log.debug("head: %s"%(head)) - t = "".join((base, sep, head, INVOKER)) - #log.debug("turning off notify") - tb.freeze_notify() + #log.debug('head: %s'%(head)) + t = ''.join((base, sep, head, INVOKER)) #log.debug("setting text: '%s'"%(t)) - tb.set_text(t) - #log.debug("turning on notify") - tb.thaw_notify() + gobject.idle_add(tb.set_text, t) @log_calls('AcronymsExpanderPlugin') def connect_with_chat_control_base(self, chat_control): @@ -101,4 +98,4 @@ d = chat_control.acronyms_expander_plugin_data tv = chat_control.msg_textview tv.get_buffer().disconnect(d['h_id']) - \ No newline at end of file +

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2010