Commits

commits@gajim.org

17632 discussions

gajim: cache jabber servers too in trnasports_cache table so tha...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 3983c75f7987 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=3983c75f7987 description: cache jabber servers too in trnasports_cache table so that they are not considered as transports. Fixes #7360 diffstat: src/common/connection.py | 5 ++++- src/common/logger.py | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diffs (50 lines): diff -r 41f05309aca1 -r 3983c75f7987 src/common/connection.py --- a/src/common/connection.py Sun May 26 12:58:19 2013 +0200 +++ b/src/common/connection.py Sun Jun 02 21:02:33 2013 +0200 @@ -1845,11 +1845,14 @@ if 'category' in identity and identity['category'] in ('gateway', 'headline') and 'type' in identity: transport_type = identity['type'] + if 'category' in identity and identity['category'] == 'server' and \ + 'type' in identity and identity['type'] == 'im': + transport_type = 'jabber' # it's a jabber server if 'category' in identity and identity['category'] == 'conference' \ and 'type' in identity and identity['type'] == 'text': is_muc = True - if transport_type and obj.fjid not in gajim.transport_type: + if transport_type != '' and obj.fjid not in gajim.transport_type: gajim.transport_type[obj.fjid] = transport_type gajim.logger.save_transport_type(obj.fjid, transport_type) diff -r 41f05309aca1 -r 3983c75f7987 src/common/logger.py --- a/src/common/logger.py Sun May 26 12:58:19 2013 +0200 +++ b/src/common/logger.py Sun Jun 02 21:02:33 2013 +0200 @@ -92,7 +92,8 @@ self.TYPE_RSS, self.TYPE_WEATHER, self.TYPE_MRIM, - ) = range(14) + self.TYPE_NO_TRANSPORT, + ) = range(15) ( self.SUBSCRIPTION_NONE, @@ -339,6 +340,8 @@ return constants.TYPE_WEATHER if type_ == 'mrim': return constants.TYPE_MRIM + if type_ == 'jabber': + return constants.TYPE_NO_TRANSPORT return None def convert_api_values_to_human_transport_type(self, type_id): @@ -373,6 +376,8 @@ return 'weather' if type_id == constants.TYPE_MRIM: return 'mrim' + if type_id == constants.TYPE_NO_TRANSPORT: + return 'jabber' def convert_human_subscription_values_to_db_api_values(self, sub): """

1 0

gajim: discover server of our contacts on startup if it's not al...
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 1d0891a3b1ec in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=1d0891a3b1ec description: discover server of our contacts on startup if it's not already done. diffstat: src/common/connection_handlers.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diffs (37 lines): diff -r 3983c75f7987 -r 1d0891a3b1ec src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jun 02 21:02:33 2013 +0200 +++ b/src/common/connection_handlers.py Sun Jun 02 22:02:43 2013 +0200 @@ -33,6 +33,7 @@ import sys import operator import hashlib +import gobject from time import (altzone, daylight, gmtime, localtime, mktime, strftime, time as time_time, timezone, tzname) @@ -559,6 +560,7 @@ self.discover_ft_proxies() gajim.nec.push_incoming_event(RosterReceivedEvent(None, conn=self)) + gobject.timeout_add_seconds(10, self.discover_servers) elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED: if iq_obj.getType() != 'error': self.privacy_rules_supported = True @@ -2062,6 +2064,17 @@ gajim.proxy65_manager.resolve(proxy, self.connection, our_jid, testit=testit) + def discover_servers(self): + if not self.connection: + return + servers = [] + for c in gajim.contacts.iter_contacts(self.name): + s = gajim.get_server_from_jid(c.jid) + if s not in servers and s not in gajim.transport_type: + servers.append(s) + for s in servers: + self.discoverInfo(s) + def _on_roster_set(self, roster): gajim.nec.push_incoming_event(RosterReceivedEvent(None, conn=self, xmpp_roster=roster))

1 0

gajim: gobject -> GObject
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset bd2264bfd4c6 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=bd2264bfd4c6 description: gobject -> GObject diffstat: src/common/connection_handlers.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 1d0891a3b1ec -r bd2264bfd4c6 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jun 02 22:02:43 2013 +0200 +++ b/src/common/connection_handlers.py Sun Jul 28 17:54:55 2013 +0200 @@ -33,7 +33,7 @@ import sys import operator import hashlib -import gobject +from gi.repository import GObject from time import (altzone, daylight, gmtime, localtime, mktime, strftime, time as time_time, timezone, tzname) @@ -560,7 +560,7 @@ self.discover_ft_proxies() gajim.nec.push_incoming_event(RosterReceivedEvent(None, conn=self)) - gobject.timeout_add_seconds(10, self.discover_servers) + GObject.timeout_add_seconds(10, self.discover_servers) elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED: if iq_obj.getType() != 'error': self.privacy_rules_supported = True

1 0

gajim: add missing icon
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset b62af7daeda4 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=b62af7daeda4 description: add missing icon diffstat: icons/hicolor/16x16/actions/gajim-receipt_received.png | Bin 1 files changed, 0 insertions(+), 0 deletions(-) diffs (2 lines): diff -r 0d03a343abcc -r b62af7daeda4 icons/hicolor/16x16/actions/gajim-receipt_received.png Binary file icons/hicolor/16x16/actions/gajim-receipt_received.png has changed

1 0

gajim: enable nbxmpp logging when using -v
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 8db2f41338f8 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=8db2f41338f8 description: enable nbxmpp logging when using -v diffstat: src/common/logging_helpers.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (15 lines): diff -r b62af7daeda4 -r 8db2f41338f8 src/common/logging_helpers.py --- a/src/common/logging_helpers.py Mon May 13 21:31:57 2013 +0200 +++ b/src/common/logging_helpers.py Thu May 16 21:06:41 2013 +0200 @@ -163,9 +163,11 @@ def set_verbose(): parseAndSetLogLevels('gajim=1') + parseAndSetLogLevels('.nbxmpp=1') def set_quiet(): parseAndSetLogLevels('gajim=CRITICAL') + parseAndSetLogLevels('.nbxmpp=CRITICAL') # tests

1 0

gajim: Make plugin config dialog not modal
by Denis Fomin 28 Jul '13

28 Jul '13

changeset 29c6ba3df210 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=29c6ba3df210 description: Make plugin config dialog not modal diffstat: src/dialogs.py | 2 +- src/plugins/gui.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diffs (41 lines): diff -r 8db2f41338f8 -r 29c6ba3df210 src/dialogs.py --- a/src/dialogs.py Thu May 16 21:06:41 2013 +0200 +++ b/src/dialogs.py Sun May 19 20:40:20 2013 +0400 @@ -2571,7 +2571,7 @@ ErrorDialog(_('This is not a group chat'), _('%s is not the name of a group chat.') % room_jid) return - + full_jid = room_jid + '/' + nickname if full_jid in self.recently_groupchat: self.recently_groupchat.remove(full_jid) diff -r 8db2f41338f8 -r 29c6ba3df210 src/plugins/gui.py --- a/src/plugins/gui.py Thu May 16 21:06:41 2013 +0200 +++ b/src/plugins/gui.py Sun May 19 20:40:20 2013 +0400 @@ -315,19 +315,22 @@ Gtk.Dialog.__init__(self, '%s %s'%(plugin.name, _('Configuration')), **kwargs) self.plugin = plugin - self.add_button('gtk-close', Gtk.ResponseType.CLOSE) + button = self.add_button('gtk-close', Gtk.ResponseType.CLOSE) + button.connect('clicked', self.on_close_button_clicked) self.get_child().set_spacing(3) self.init() + def on_close_button_clicked(self, widget): + self.hide() + @log_calls('GajimPluginConfigDialog') def run(self, parent=None): self.set_transient_for(parent) self.on_run() self.show_all() - result = super(GajimPluginConfigDialog, self).run() - self.hide() + result = super(GajimPluginConfigDialog, self) return result def init(self):

1 0

gajim: get files from 0.15 branch
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 02183268dc3b in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=02183268dc3b description: get files from 0.15 branch diffstat: ChangeLog | 6 ++++++ autogen.sh | 2 +- gajim.nsi | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diffs (38 lines): diff -r 29c6ba3df210 -r 02183268dc3b ChangeLog --- a/ChangeLog Sun May 19 20:40:20 2013 +0400 +++ b/ChangeLog Sat May 25 20:53:36 2013 +0200 @@ -8,6 +8,12 @@ * Support XEP-0224 Attention * Support XEP-0191 Blocking command +Gajim 0.15.4 (25 May 2013) + + * Fix usage of OTR plugin + * Fix connection to non-SSL server + * Fix receiving GPG-encrypted messages while offline. + Gajim 0.15.3 (17 March 2013) * Better handling of SSL errors diff -r 29c6ba3df210 -r 02183268dc3b autogen.sh --- a/autogen.sh Sun May 19 20:40:20 2013 +0400 +++ b/autogen.sh Sat May 25 20:53:36 2013 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.3" + gajimversion="0.15.4" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 29c6ba3df210 -r 02183268dc3b gajim.nsi --- a/gajim.nsi Sun May 19 20:40:20 2013 +0400 +++ b/gajim.nsi Sat May 25 20:53:36 2013 +0200 @@ -200,7 +200,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.3" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.4" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe"

1 0

gajim: - regroup display PEP info in roster options
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 0d03a343abcc in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=0d03a343abcc description: - regroup display PEP info in roster options - add option to show positive XEP-0184 ack in message window. Fixes 7341 diffstat: data/gui/preferences_window.ui | 125 +++++++++++++--------------------------- src/common/config.py | 1 + src/config.py | 47 +++++--------- src/conversation_textview.py | 31 ++++++--- 4 files changed, 80 insertions(+), 124 deletions(-) diffs (truncated from 327 to 300 lines): diff -r 8c5d6c908de8 -r 0d03a343abcc data/gui/preferences_window.ui --- a/data/gui/preferences_window.ui Thu May 02 21:50:16 2013 +0200 +++ b/data/gui/preferences_window.ui Sun May 12 21:32:29 2013 +0200 @@ -148,6 +148,24 @@ </row> </data> </object> + <object class="GtkListStore" id="status_message_liststore"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> <object class="GtkWindow" id="preferences_window"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -234,8 +252,8 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="show_mood_in_roster_checkbutton"> - <property name="label" translatable="yes">Display m_ood of contacts in roster</property> + <object class="GtkCheckButton" id="show_pep_in_roster_checkbutton"> + <property name="label" translatable="yes">Display e_xtra information of contacts in roster (mood, activity, ...)m_ood of contacts in roster</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -245,7 +263,7 @@ <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_mood_in_roster_checkbutton_toggled" swapped="no"/> + <signal name="toggled" handler="on_show_pep_in_roster_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -254,67 +272,6 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="show_activity_in_roster_checkbutton"> - <property name="label" translatable="yes">Display _activity of contacts in roster</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will display the activity of contacts in the roster window</property> - <property name="use_action_appearance">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_activity_in_roster_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="show_tunes_in_roster_checkbutton"> - <property name="label" translatable="yes">Display _tunes of contacts in roster</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will display the tunes of contacts in the roster window</property> - <property name="use_action_appearance">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_tunes_in_roster_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="show_location_in_roster_checkbutton"> - <property name="label" translatable="yes">Display _location of contacts in roster</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will display the location of contacts in the roster window</property> - <property name="use_action_appearance">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_location_in_roster_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">5</property> - </packing> - </child> - <child> <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -373,7 +330,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">3</property> </packing> </child> </object> @@ -415,7 +372,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="n_rows">6</property> + <property name="n_rows">7</property> <property name="n_columns">2</property> <property name="column_spacing">6</property> <property name="row_spacing">6</property> @@ -585,6 +542,24 @@ <property name="bottom_attach">3</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="positive_184_ack_checkbutton"> + <property name="label" translatable="yes">Show icon when your messages are received</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_action_appearance">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_positive_184_ack_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="right_attach">2</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + </packing> + </child> </object> </child> </object> @@ -3299,22 +3274,4 @@ </object> </child> </object> - <object class="GtkListStore" id="status_message_liststore"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> - </columns> - </object> </interface> diff -r 8c5d6c908de8 -r 0d03a343abcc src/common/config.py --- a/src/common/config.py Thu May 02 21:50:16 2013 +0200 +++ b/src/common/config.py Sun May 12 21:32:29 2013 +0200 @@ -315,6 +315,7 @@ 'global_proxy': [opt_str, '', _('Proxy used for all outgoing connections if the account does not have a specific proxy configured')], 'ignore_incoming_attention': [opt_bool, False, _('If True, Gajim will ignore incoming attention requestd ("wizz").')], 'remember_opened_chat_controls': [ opt_bool, True, _('If enabled, Gajim will reopen chat windows that were opened last time Gajim was closed.')], + 'positive_184_ack': [ opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')], }, {}) __options_per_key = { diff -r 8c5d6c908de8 -r 0d03a343abcc src/config.py --- a/src/config.py Thu May 02 21:50:16 2013 +0200 +++ b/src/config.py Sun May 12 21:32:29 2013 +0200 @@ -128,25 +128,16 @@ self.xml.get_object('show_status_msgs_in_roster_checkbutton'). \ set_active( st) - # Display mood in roster - st = gajim.config.get('show_mood_in_roster') - self.xml.get_object('show_mood_in_roster_checkbutton'). \ - set_active(st) - - # Display activity in roster - st = gajim.config.get('show_activity_in_roster') - self.xml.get_object('show_activity_in_roster_checkbutton'). \ - set_active(st) - - # Display tunes in roster - st = gajim.config.get('show_tunes_in_roster') - self.xml.get_object('show_tunes_in_roster_checkbutton'). \ - set_active(st) - - # Display location in roster - st = gajim.config.get('show_location_in_roster') - self.xml.get_object('show_location_in_roster_checkbutton'). \ - set_active(st) + # Display PEP in roster + st1 = gajim.config.get('show_mood_in_roster') + st2 = gajim.config.get('show_activity_in_roster') + st3 = gajim.config.get('show_tunes_in_roster') + st4 = gajim.config.get('show_location_in_roster') + w = self.xml.get_object('show_pep_in_roster_checkbutton') + if st1 == st2 == st3 == st4: + w.set_active(st1) + else: + w.set_inconsistent(True) # Sort contacts by show st = gajim.config.get('sort_by_show_in_roster') @@ -212,6 +203,10 @@ else: self.xml.get_object('speller_checkbutton').set_sensitive(False) + # XEP-0184 positive ack + st = gajim.config.get('positive_184_ack') + self.xml.get_object('positive_184_ack_checkbutton').set_active(st) + ### Style tab ### # Themes theme_combobox = self.xml.get_object('theme_combobox') @@ -670,19 +665,10 @@ for ctrl in self._get_all_muc_controls(): ctrl.update_ui() - def on_show_mood_in_roster_checkbutton_toggled(self, widget): + def on_show_pep_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_mood_in_roster') - gajim.interface.roster.setup_and_draw_roster() - - def on_show_activity_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_activity_in_roster') - gajim.interface.roster.setup_and_draw_roster() - - def on_show_tunes_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_tunes_in_roster') - gajim.interface.roster.setup_and_draw_roster() - - def on_show_location_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_location_in_roster') gajim.interface.roster.setup_and_draw_roster() @@ -772,6 +758,9 @@ else: self.remove_speller() + def on_positive_184_ack_checkbutton_toggled(self, widget): + self.on_checkbutton_toggled(widget, 'positive_184_ack') + def on_theme_combobox_changed(self, widget): model = widget.get_model() active = widget.get_active() diff -r 8c5d6c908de8 -r 0d03a343abcc src/conversation_textview.py --- a/src/conversation_textview.py Thu May 02 21:50:16 2013 +0200 +++ b/src/conversation_textview.py Sun May 12 21:32:29 2013 +0200 @@ -176,6 +176,8 @@ 'gajim-muc_separator') XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap( 'gajim-receipt_missing') + XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'gajim-receipt_received') MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( 'gajim-message_corrected') @@ -554,22 +556,29 @@ if id_ not in self.xep0184_marks: return - if self.xep0184_shown[id_] == NOT_SHOWN: - self.xep0184_shown[id_] = ALREADY_RECEIVED - return - buffer_ = self.tv.get_buffer() buffer_.begin_user_action() - begin_iter = buffer_.get_iter_at_mark(self.xep0184_marks[id_]) + if self.xep0184_shown[id_] != NOT_SHOWN: + begin_iter = buffer_.get_iter_at_mark(self.xep0184_marks[id_])

1 0

gajim: Fix missing import
by Denis Fomin 28 Jul '13

28 Jul '13

changeset fb8063bb4801 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=fb8063bb4801 description: Fix missing import diffstat: src/common/connection_handlers.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r f42100bef7cd -r fb8063bb4801 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Thu Apr 25 21:36:28 2013 +0200 +++ b/src/common/connection_handlers.py Fri Apr 26 13:01:05 2013 +0400 @@ -41,6 +41,7 @@ import nbxmpp from common import caps_cache as capscache +from pep import LOCATION_DATA from common import helpers from common import gajim from common import exceptions

1 0

gajim: fix traceback. Fixes #7340
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 6809fc371f77 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=6809fc371f77 description: fix traceback. Fixes #7340 diffstat: src/chat_control.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r fb8063bb4801 -r 6809fc371f77 src/chat_control.py --- a/src/chat_control.py Fri Apr 26 13:01:05 2013 +0400 +++ b/src/chat_control.py Thu May 02 21:46:10 2013 +0200 @@ -1022,7 +1022,8 @@ return if kind in ('incoming', 'outgoing'): self.last_received_txt[name] = text - self.last_received_id[name] = correct_id[0] + if correct_id: + self.last_received_id[name] = correct_id[0] if kind == 'incoming': if not self.type_id == message_control.TYPE_GC or \ gajim.config.get('notify_on_all_muc_messages') or \

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