Commits

commits@gajim.org

17632 discussions

gajim: Fix missing import
by Denis Fomin 15 May '13

15 May '13

changeset f78750b1abba in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=f78750b1abba description: Fix missing import diffstat: src/history_manager.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 82f394c70a00 -r f78750b1abba src/history_manager.py --- a/src/history_manager.py Mon May 06 23:25:49 2013 +0400 +++ b/src/history_manager.py Wed May 15 12:51:23 2013 +0400 @@ -50,6 +50,7 @@ import sys import signal from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import GObject import time import locale

1 0

gajim: add missing icon
by Yann Leboulanger 13 May '13

13 May '13

changeset 9b8e5189d751 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9b8e5189d751 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 9f58f7e82e95 -r 9b8e5189d751 icons/hicolor/16x16/actions/gajim-receipt_received.png Binary file icons/hicolor/16x16/actions/gajim-receipt_received.png has changed

1 0

gajim: - regroup display PEP info in roster options
by Yann Leboulanger 12 May '13

12 May '13

changeset 9f58f7e82e95 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9f58f7e82e95 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 | 77 ++++++++++------------------------------- src/common/config.py | 1 + src/config.py | 47 +++++++++--------------- src/conversation_textview.py | 34 ++++++++++++------ 4 files changed, 61 insertions(+), 98 deletions(-) diffs (271 lines): diff -r 115e3d3fc64b -r 9f58f7e82e95 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 @@ -226,15 +226,15 @@ </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, ...)</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 mood of contacts in the roster window</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_mood_in_roster_checkbutton_toggled"/> + <signal name="toggled" handler="on_show_pep_in_roster_checkbutton_toggled"/> </object> <packing> <property name="expand">False</property> @@ -243,58 +243,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="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_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_activity_in_roster_checkbutton_toggled"/> - </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="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_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_tunes_in_roster_checkbutton_toggled"/> - </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="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_underline">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_location_in_roster_checkbutton_toggled"/> - </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="spacing">6</property> @@ -339,7 +287,7 @@ </child> </object> <packing> - <property name="position">6</property> + <property name="position">3</property> </packing> </child> </object> @@ -376,7 +324,7 @@ <object class="GtkTable" id="table1"> <property name="visible">True</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> @@ -530,6 +478,21 @@ <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="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_positive_184_ack_checkbutton_toggled"/> + </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> diff -r 115e3d3fc64b -r 9f58f7e82e95 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 115e3d3fc64b -r 9f58f7e82e95 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 @@ -126,25 +126,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') @@ -210,6 +201,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') @@ -668,19 +663,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() @@ -770,6 +756,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 115e3d3fc64b -r 9f58f7e82e95 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 @@ -169,9 +169,12 @@ ) ) - FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap('gajim-muc_separator') + FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap( + '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') @@ -549,22 +552,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_]) - end_iter = begin_iter.copy() - # XXX: Is there a nicer way? - end_iter.forward_char() - end_iter.forward_char() + end_iter = begin_iter.copy() + # XXX: Is there a nicer way? + end_iter.forward_char() + end_iter.forward_char() - buffer_.delete(begin_iter, end_iter) - buffer_.delete_mark(self.xep0184_marks[id_]) + buffer_.delete(begin_iter, end_iter) + + if gajim.config.get('positive_184_ack'): + begin_iter = buffer_.get_iter_at_mark(self.xep0184_marks[id_]) + buffer_.insert(begin_iter, ' ') + anchor = buffer_.create_child_anchor(begin_iter) + img = TextViewImage(anchor, '') + img.set_from_pixbuf(ConversationTextview.XEP0184_RECEIVED_PIXBUF) + img.show() + self.tv.add_child_at_anchor(img, anchor) + + self.xep0184_shown[id_] = ALREADY_RECEIVED buffer_.end_user_action()

1 0

gajim: Command system fix (python2 - > python3)
by Denis Fomin 06 May '13

06 May '13

changeset 82f394c70a00 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=82f394c70a00 description: Command system fix (python2 - > python3) diffstat: src/command_system/implementation/execute.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 7cf21f16ea95 -r 82f394c70a00 src/command_system/implementation/execute.py --- a/src/command_system/implementation/execute.py Sat May 04 18:27:32 2013 +0400 +++ b/src/command_system/implementation/execute.py Mon May 06 23:25:49 2013 +0400 @@ -64,7 +64,7 @@ @classmethod def monitor(cls, processor, popen): poller = cls.poller(processor, popen) - GObject.timeout_add(cls.POLL_INTERVAL, poller.next) + GObject.timeout_add(cls.POLL_INTERVAL, next, poller) @classmethod def poller(cls, processor, popen): @@ -101,7 +101,7 @@ @staticmethod def clean(text): strip = chr(10) + chr(32) - return text.strip(strip) + return text.decode().strip(strip) class Show(Execute):

1 0

gajim: PluginSystem. xhtml in available tab
by Denis Fomin 04 May '13

04 May '13

changeset 7cf21f16ea95 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=7cf21f16ea95 description: PluginSystem. xhtml in available tab diffstat: data/gui/plugins_window.ui | 31 +++++++++++++++++++------------ src/plugins/gui.py | 31 +++++++++++++++++++------------ 2 files changed, 38 insertions(+), 24 deletions(-) diffs (136 lines): diff -r f554b921996d -r 7cf21f16ea95 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Sat Apr 27 14:38:38 2013 +0200 +++ b/data/gui/plugins_window.ui Sat May 04 18:27:32 2013 +0400 @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <interface>  - <object class="GtkTextBuffer" id="textbuffer1"> - <property name="text" translatable="yes">Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization.</property> - </object> <object class="GtkWindow" id="plugins_window"> <property name="width_request">650</property> <property name="height_request">500</property> @@ -299,17 +296,24 @@ </packing> </child> <child> - <object class="GtkTextView" id="plugin_description_textview"> + <object class="GtkScrolledWindow" id="scrolledwindow"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="pixels_above_lines">6</property> - <property name="editable">False</property> - <property name="wrap_mode">word</property> - <property name="left_margin">6</property> - <property name="right_margin">6</property> - <property name="indent">1</property> - <property name="buffer">textbuffer1</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="plugin_description_textview"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="pixels_above_lines">6</property> + <property name="editable">False</property> + <property name="wrap_mode">word</property> + <property name="left_margin">6</property> + <property name="right_margin">6</property> + <property name="indent">1</property> + <property name="buffer">textbuffer1</property> + </object> + </child> </object> <packing> <property name="expand">True</property> @@ -493,4 +497,7 @@ </object> </child> </object> + <object class="GtkTextBuffer" id="textbuffer1"> + <property name="text" translatable="yes">Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization.</property> + </object> </interface> diff -r f554b921996d -r 7cf21f16ea95 src/plugins/gui.py --- a/src/plugins/gui.py Sat Apr 27 14:38:38 2013 +0200 +++ b/src/plugins/gui.py Sat May 04 18:27:32 2013 +0400 @@ -36,6 +36,7 @@ from dialogs import WarningDialog, YesNoDialog, ArchiveChooserDialog from common import gajim from plugins.helpers import log_calls, log +from conversation_textview import ConversationTextview from plugins.helpers import GajimPluginActivateException from common.exceptions import PluginsystemError @@ -99,7 +100,7 @@ self.installed_plugins_treeview_selection_changed) selection.set_mode(Gtk.SelectionMode.SINGLE) - self._clear_installed_plugin_info() + #self._clear_installed_plugin_info() self.fill_installed_plugins_model() root_iter = self.installed_plugins_model.get_iter_first() @@ -121,6 +122,11 @@ @log_calls('PluginsWindow') def installed_plugins_treeview_selection_changed(self, treeview_selection): model, iter = treeview_selection.get_selected() + self.xml.get_object('scrolledwindow').get_children()[0].destroy() + self.plugin_description_textview = ConversationTextview(None) + sw = self.xml.get_object('scrolledwindow') + sw.add(self.plugin_description_textview.tv) + sw.show_all() if iter: plugin = model.get_value(iter, PLUGIN) plugin_name = model.get_value(iter, NAME) @@ -131,6 +137,7 @@ self._clear_installed_plugin_info() def _display_installed_plugin_info(self, plugin): + from plugins.plugins_i18n import _ self.plugin_name_label.set_text(plugin.name) self.plugin_version_label.set_text(plugin.version) self.plugin_authors_label.set_text(plugin.authors) @@ -140,19 +147,21 @@ label.set_ellipsize(Pango.EllipsizeMode.END) self.plugin_homepage_linkbutton.set_property('sensitive', True) - desc_textbuffer = self.plugin_description_textview.get_buffer() - from plugins.plugins_i18n import _ txt = plugin.description if plugin.available_text: txt += '\n\n' + _('Warning: %s') % plugin.available_text - desc_textbuffer.set_text(txt) - self.plugin_description_textview.set_property('sensitive', True) + if not txt.startswith('<body '): + txt = '<body xmlns=\'http://www.w3.org/1999/xhtml\'>' + \ + txt + ' </body>' + txt = txt.replace('\n', '<br/>') + self.plugin_description_textview.tv.display_html( + txt, self.plugin_description_textview) + + self.plugin_description_textview.tv.set_property('sensitive', True) self.uninstall_plugin_button.set_property('sensitive', gajim.PLUGINS_DIRS[1] in plugin.__path__) - if plugin.config_dialog is None: - self.configure_plugin_button.set_property('sensitive', False) - else: - self.configure_plugin_button.set_property('sensitive', True) + self.configure_plugin_button.set_property( + 'sensitive', not plugin.config_dialog is None) def _clear_installed_plugin_info(self): self.plugin_name_label.set_text('') @@ -162,9 +171,7 @@ self.plugin_homepage_linkbutton.set_label('') self.plugin_homepage_linkbutton.set_property('sensitive', False) - desc_textbuffer = self.plugin_description_textview.get_buffer() - desc_textbuffer.set_text('') - self.plugin_description_textview.set_property('sensitive', False) + self.plugin_description_textview.tv.set_property('sensitive', False) self.uninstall_plugin_button.set_property('sensitive', False) self.configure_plugin_button.set_property('sensitive', False)

1 0

gajim: add missing icon
by Yann Leboulanger 02 May '13

02 May '13

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

1 0

gajim: fix traceback. Fixes #7340
by Yann Leboulanger 02 May '13

02 May '13

changeset 73cbc9629ca1 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=73cbc9629ca1 description: fix traceback. Fixes #7340 diffstat: src/chat_control.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 4eebe6e0b402 -r 73cbc9629ca1 src/chat_control.py --- a/src/chat_control.py Sat Apr 27 14:37:41 2013 +0200 +++ b/src/chat_control.py Thu May 02 21:46:10 2013 +0200 @@ -988,7 +988,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

gajim: remember with which nickname we entered rooms. Fixes #7334
by Yann Leboulanger 27 Apr '13

27 Apr '13

changeset f554b921996d in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=f554b921996d description: remember with which nickname we entered rooms. Fixes #7334 diffstat: src/dialogs.py | 44 ++++++++++++++++++++++++++++---------------- 1 files changed, 28 insertions(+), 16 deletions(-) diffs (110 lines): diff -r 15fb14070ab9 -r f554b921996d src/dialogs.py --- a/src/dialogs.py Mon Apr 22 18:09:58 2013 +0400 +++ b/src/dialogs.py Sat Apr 27 14:38:38 2013 +0200 @@ -2332,15 +2332,15 @@ class JoinGroupchatWindow: def __init__(self, account=None, room_jid='', nick='', password='', - automatic=False): + automatic=False): """ Automatic is a dict like {'invities': []}. If automatic is not empty, this means room must be automaticaly configured and when done, invities must be automatically invited """ if account: - if room_jid != '' and room_jid in gajim.gc_connected[account] and\ - gajim.gc_connected[account][room_jid]: + if room_jid != '' and room_jid in gajim.gc_connected[account] and \ + gajim.gc_connected[account][room_jid]: ErrorDialog(_('You are already in group chat %s') % room_jid) raise GajimGeneralException('You are already in this group chat') if nick == '': @@ -2405,7 +2405,7 @@ hbox1.pack_start(self.server_comboboxentry, False, False, 0) self.recently_combobox = self.xml.get_object('recently_combobox') - liststore = Gtk.ListStore(str) + liststore = Gtk.ListStore(str, str) self.recently_combobox.set_model(liststore) cell = Gtk.CellRendererText() self.recently_combobox.pack_start(cell, True) @@ -2417,8 +2417,15 @@ if 'jabber' in gajim.connections[account].muc_jid: server_list.append(gajim.connections[account].muc_jid['jabber']) for g in self.recently_groupchat: - liststore.append([g]) - server = gajim.get_server_from_jid(g) + r_jid = gajim.get_jid_without_resource(g) + nick = gajim.get_resource_from_jid(g) + if nick: + show = '%(nick)s on %(room_jid)s' % {'nick': nick, + 'room_jid': r_jid} + else: + show = r_jid + liststore.append([show, g]) + server = gajim.get_server_from_jid(r_jid) if server not in server_list and not server.startswith('irc'): server_list.append(server) @@ -2484,17 +2491,20 @@ self.account = model[iter_][0] self.on_required_entry_changed(self._nickname_entry) - def _set_room_jid(self, room_jid): + def _set_room_jid(self, full_jid): + room_jid, nick = gajim.get_room_and_nick_from_fjid(full_jid) room, server = gajim.get_name_and_server_from_jid(room_jid) self._room_jid_entry.set_text(room) model = self.server_comboboxentry.get_model() self.server_comboboxentry.get_child().set_text(server) + if nick: + self._nickname_entry.set_text(nick) def on_recently_combobox_changed(self, widget): model = widget.get_model() iter_ = widget.get_active_iter() - room_jid = model[iter_][0] - self._set_room_jid(room_jid) + full_jid = model[iter_][1] + self._set_room_jid(full_jid) def on_browse_rooms_button_clicked(self, widget): server = self.server_comboboxentry.get_child().get_text() @@ -2561,13 +2571,15 @@ ErrorDialog(_('This is not a group chat'), _('%s is not the name of a group chat.') % room_jid) return - if room_jid in self.recently_groupchat: - self.recently_groupchat.remove(room_jid) - self.recently_groupchat.insert(0, room_jid) + + full_jid = room_jid + '/' + nickname + if full_jid in self.recently_groupchat: + self.recently_groupchat.remove(full_jid) + self.recently_groupchat.insert(0, full_jid) if len(self.recently_groupchat) > 10: self.recently_groupchat = self.recently_groupchat[0:10] gajim.config.set('recently_groupchat', - ' '.join(self.recently_groupchat)) + ' '.join(self.recently_groupchat)) if self.xml.get_object('bookmark_checkbutton').get_active(): if self.xml.get_object('auto_join_checkbutton').get_active(): @@ -2576,13 +2588,13 @@ autojoin = '0' # Add as bookmark, with autojoin and not minimized name = gajim.get_nick_from_jid(room_jid) - gajim.interface.add_gc_bookmark(self.account, name, room_jid, autojoin, - '0', password, nickname) + gajim.interface.add_gc_bookmark(self.account, name, room_jid, + autojoin, '0', password, nickname) if self.automatic: gajim.automatic_rooms[self.account][room_jid] = self.automatic - gajim.interface.join_gc_room(self.account, room_jid, nickname, password) + gajim.interface.join_gc_room(self.account, room_jid, nickname, password) self.window.destroy()

1 0

gajim: remember with which nickname we entered rooms. Fixes #7334
by Yann Leboulanger 27 Apr '13

27 Apr '13

changeset 4eebe6e0b402 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4eebe6e0b402 description: remember with which nickname we entered rooms. Fixes #7334 diffstat: src/dialogs.py | 44 ++++++++++++++++++++++++++++---------------- 1 files changed, 28 insertions(+), 16 deletions(-) diffs (108 lines): diff -r 961edbee221a -r 4eebe6e0b402 src/dialogs.py --- a/src/dialogs.py Fri Apr 26 13:01:05 2013 +0400 +++ b/src/dialogs.py Sat Apr 27 14:37:41 2013 +0200 @@ -2310,15 +2310,15 @@ class JoinGroupchatWindow: def __init__(self, account=None, room_jid='', nick='', password='', - automatic=False): + automatic=False): """ Automatic is a dict like {'invities': []}. If automatic is not empty, this means room must be automaticaly configured and when done, invities must be automatically invited """ if account: - if room_jid != '' and room_jid in gajim.gc_connected[account] and\ - gajim.gc_connected[account][room_jid]: + if room_jid != '' and room_jid in gajim.gc_connected[account] and \ + gajim.gc_connected[account][room_jid]: ErrorDialog(_('You are already in group chat %s') % room_jid) raise GajimGeneralException, 'You are already in this group chat' if nick == '': @@ -2382,15 +2382,22 @@ server_list.append(gajim.connections[account].muc_jid['jabber']) self.recently_combobox = self.xml.get_object('recently_combobox') - liststore = gtk.ListStore(str) + liststore = gtk.ListStore(str, str) self.recently_combobox.set_model(liststore) cell = gtk.CellRendererText() self.recently_combobox.pack_start(cell, True) self.recently_combobox.add_attribute(cell, 'text', 0) self.recently_groupchat = gajim.config.get('recently_groupchat').split() for g in self.recently_groupchat: - self.recently_combobox.append_text(g) - server = gajim.get_server_from_jid(g) + r_jid = gajim.get_jid_without_resource(g) + nick = gajim.get_resource_from_jid(g) + if nick: + show = '%(nick)s on %(room_jid)s' % {'nick': nick, + 'room_jid': r_jid} + else: + show = r_jid + liststore.append([show, g]) + server = gajim.get_server_from_jid(r_jid) if server not in server_list and not server.startswith('irc'): server_list.append(server) @@ -2456,16 +2463,19 @@ self.account = model[iter_][0].decode('utf-8') self.on_required_entry_changed(self._nickname_entry) - def _set_room_jid(self, room_jid): + def _set_room_jid(self, full_jid): + room_jid, nick = gajim.get_room_and_nick_from_fjid(full_jid) room, server = gajim.get_name_and_server_from_jid(room_jid) self._room_jid_entry.set_text(room) self.server_comboboxentry.child.set_text(server) + if nick: + self._nickname_entry.set_text(nick) def on_recently_combobox_changed(self, widget): model = widget.get_model() iter_ = widget.get_active_iter() - room_jid = model[iter_][0].decode('utf-8') - self._set_room_jid(room_jid) + full_jid = model[iter_][1].decode('utf-8') + self._set_room_jid(full_jid) def on_browse_rooms_button_clicked(self, widget): server = self.server_comboboxentry.child.get_text().decode('utf-8') @@ -2533,13 +2543,15 @@ ErrorDialog(_('This is not a group chat'), _('%s is not the name of a group chat.') % room_jid) return - if room_jid in self.recently_groupchat: - self.recently_groupchat.remove(room_jid) - self.recently_groupchat.insert(0, room_jid) + + full_jid = room_jid + '/' + nickname + if full_jid in self.recently_groupchat: + self.recently_groupchat.remove(full_jid) + self.recently_groupchat.insert(0, full_jid) if len(self.recently_groupchat) > 10: self.recently_groupchat = self.recently_groupchat[0:10] gajim.config.set('recently_groupchat', - ' '.join(self.recently_groupchat)) + ' '.join(self.recently_groupchat)) if self.xml.get_object('bookmark_checkbutton').get_active(): if self.xml.get_object('auto_join_checkbutton').get_active(): @@ -2548,13 +2560,13 @@ autojoin = '0' # Add as bookmark, with autojoin and not minimized name = gajim.get_nick_from_jid(room_jid) - gajim.interface.add_gc_bookmark(self.account, name, room_jid, autojoin, - '0', password, nickname) + gajim.interface.add_gc_bookmark(self.account, name, room_jid, + autojoin, '0', password, nickname) if self.automatic: gajim.automatic_rooms[self.account][room_jid] = self.automatic - gajim.interface.join_gc_room(self.account, room_jid, nickname, password) + gajim.interface.join_gc_room(self.account, room_jid, nickname, password) self.window.destroy()

1 0

gajim: Fix missing import
by Denis Fomin 26 Apr '13

26 Apr '13

changeset 961edbee221a in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=961edbee221a description: Fix missing import diffstat: src/common/connection_handlers.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 6eab1b6a3441 -r 961edbee221a 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 import common.caps_cache as capscache +from pep import LOCATION_DATA from common import helpers from common import gajim from common import exceptions

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