Commits December 2011

commits@gajim.org

3 participants
147 discussions

gajim: improve strings
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset c08418f0aeec in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c08418f0aeec description: improve strings diffstat: src/chat_control.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diffs (33 lines): diff -r 63efde9ea069 -r c08418f0aeec src/chat_control.py --- a/src/chat_control.py Mon Oct 17 17:12:19 2011 +0200 +++ b/src/chat_control.py Mon Oct 17 17:55:43 2011 +0200 @@ -3234,11 +3234,11 @@ """ Show an InfoBar on top of control """ - markup = '' + _('File transfer:') + ' ' + file_props['name'] + markup = '%s: %s' % (_('File transfer'), file_props['name']) if file_props['desc']: - markup += ' (' + file_props['desc'] + ')' - markup += '\n' + _('Size:') + ' ' + helpers.convert_bytes( - file_props['size']) + markup += ' (%s)' % file_props['desc'] + markup += '\n%s: %s' % (_('Size'), helpers.convert_bytes( + file_props['size'])) b1 = gtk.Button(_('_Accept')) b1.connect('clicked', self._on_accept_file_request, file_props) b2 = gtk.Button(stock=gtk.STOCK_CANCEL) @@ -3262,10 +3262,10 @@ gajim.events.remove_events(self.account, self.contact.jid, event=ev) def _got_file_completed(self, file_props): - markup = '' + _('File transfer completed:') + ' ' + \ - file_props['name'] + markup = '%s: %s' % (_('File transfer completed'), + file_props['name']) if file_props['desc']: - markup += ' (' + file_props['desc'] + ')' + markup += ' (%s)' % file_props['desc'] b1 = gtk.Button(_('_Open Containing Folder')) b1.connect('clicked', self._on_open_ft_folder, file_props) b2 = gtk.Button(stock=gtk.STOCK_OK)

1 0

gajim: add infobar in chat window for file transfer events. Fixe...
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset 63efde9ea069 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=63efde9ea069 description: add infobar in chat window for file transfer events. Fixes #1205 diffstat: src/chat_control.py | 168 ++++++++++++++++++++++++++++++++++++++++++++ src/filetransfers_window.py | 123 +++++++++++++++++--------------- 2 files changed, 233 insertions(+), 58 deletions(-) diffs (truncated from 336 to 300 lines): diff -r 64241dd9dffc -r 63efde9ea069 src/chat_control.py --- a/src/chat_control.py Mon Oct 17 18:03:30 2011 +0300 +++ b/src/chat_control.py Mon Oct 17 17:12:19 2011 +0200 @@ -1591,6 +1591,22 @@ id_ = widget.connect('value_changed', self.on_sound_hscale_value_changed) self.handlers[id_] = widget + self.info_bar = gtk.InfoBar() + content_area = self.info_bar.get_content_area() + self.info_bar_label = gtk.Label() + self.info_bar_label.set_use_markup(True) + self.info_bar_label.set_alignment(0, 0) + content_area.add(self.info_bar_label) + self.info_bar.set_no_show_all(True) + widget = self.xml.get_object('vbox2') + widget.pack_start(self.info_bar, expand=False, padding=5) + widget.reorder_child(self.info_bar, 1) + + # List of waiting infobar messages + self.info_bar_queue = [] + + self.subscribe_events() + if not session: # Don't use previous session if we want to a specific resource # and it's not the same @@ -1660,6 +1676,20 @@ # instance object gajim.plugin_manager.gui_extension_point('chat_control', self) + def subscribe_events(self): + """ + Register listeners to the events class + """ + gajim.events.event_added_subscribe(self.on_event_added) + gajim.events.event_removed_subscribe(self.on_event_removed) + + def unsubscribe_events(self): + """ + Unregister listeners to the events class + """ + gajim.events.event_added_unsubscribe(self.on_event_added) + gajim.events.event_removed_unsubscribe(self.on_event_removed) + def _update_toolbar(self): # Formatting if self.contact.supports(NS_XHTML_IM) and not self.gpg_is_active: @@ -2647,6 +2677,8 @@ gajim.ged.remove_event_handler('caps-received', ged.GUI1, self._nec_caps_received) + self.unsubscribe_events() + # Send 'gone' chatstate self.send_chatstate('gone', self.contact) self.contact.chatstate = None @@ -3158,3 +3190,139 @@ self.print_conversation(' (', 'status', simple=True) self.print_conversation('%s' % (status), 'status', simple=True) self.print_conversation(')', 'status', simple=True) + + def _info_bar_show_message(self): + if self.info_bar.get_visible(): + # A message is already shown + return + if not self.info_bar_queue: + return + markup, buttons, args, type_ = self.info_bar_queue[0] + self.info_bar_label.set_markup(markup) + for button in buttons: + self.info_bar.add_action_widget(button, 0) + self.info_bar.set_message_type(type_) + self.info_bar.set_no_show_all(False) + self.info_bar.show_all() + + def _add_info_bar_message(self, markup, buttons, args, + type_=gtk.MESSAGE_INFO): + self.info_bar_queue.append((markup, buttons, args, type_)) + self._info_bar_show_message() + + def _get_file_props_event(self, file_props, type_): + evs = gajim.events.get_events(self.account, self.contact.jid, [type_]) + for ev in evs: + if ev.parameters == file_props: + return ev + return None + + def _on_accept_file_request(self, widget, file_props): + gajim.interface.instances['file_transfers'].on_file_request_accepted( + self.account, self.contact, file_props) + ev = self._get_file_props_event(file_props, 'file-request') + if ev: + gajim.events.remove_events(self.account, self.contact.jid, event=ev) + + def _on_cancel_file_request(self, widget, file_props): + gajim.connections[self.account].send_file_rejection(file_props) + ev = self._get_file_props_event(file_props, 'file-request') + if ev: + gajim.events.remove_events(self.account, self.contact.jid, event=ev) + + def _got_file_request(self, file_props): + """ + Show an InfoBar on top of control + """ + markup = '' + _('File transfer:') + ' ' + file_props['name'] + if file_props['desc']: + markup += ' (' + file_props['desc'] + ')' + markup += '\n' + _('Size:') + ' ' + helpers.convert_bytes( + file_props['size']) + b1 = gtk.Button(_('_Accept')) + b1.connect('clicked', self._on_accept_file_request, file_props) + b2 = gtk.Button(stock=gtk.STOCK_CANCEL) + b2.connect('clicked', self._on_cancel_file_request, file_props) + self._add_info_bar_message(markup, [b1, b2], file_props, + gtk.MESSAGE_QUESTION) + + def _on_open_ft_folder(self, widget, file_props): + if 'file-name' not in file_props: + return + path = os.path.split(file_props['file-name'])[0] + if os.path.exists(path) and os.path.isdir(path): + helpers.launch_file_manager(path) + ev = self._get_file_props_event(file_props, 'file-completed') + if ev: + gajim.events.remove_events(self.account, self.contact.jid, event=ev) + + def _on_ok(self, widget, file_props, type_): + ev = self._get_file_props_event(file_props, type_) + if ev: + gajim.events.remove_events(self.account, self.contact.jid, event=ev) + + def _got_file_completed(self, file_props): + markup = '' + _('File transfer completed:') + ' ' + \ + file_props['name'] + if file_props['desc']: + markup += ' (' + file_props['desc'] + ')' + b1 = gtk.Button(_('_Open Containing Folder')) + b1.connect('clicked', self._on_open_ft_folder, file_props) + b2 = gtk.Button(stock=gtk.STOCK_OK) + b2.connect('clicked', self._on_ok, file_props, 'file-completed') + self._add_info_bar_message(markup, [b1, b2], file_props) + + def _got_file_error(self, file_props, type_, pri_txt, sec_txt): + markup = '%s: %s' % (pri_txt, sec_txt) + b = gtk.Button(stock=gtk.STOCK_OK) + b.connect('clicked', self._on_ok, file_props, type_) + self._add_info_bar_message(markup, [b], file_props, gtk.MESSAGE_ERROR) + + def on_event_added(self, event): + if event.account != self.account: + return + if event.jid != self.contact.jid: + return + if event.type_ == 'file-request': + self._got_file_request(event.parameters) + elif event.type_ == 'file-completed': + self._got_file_completed(event.parameters) + elif event.type_ in ('file-error', 'file-stopped'): + msg_err = '' + if event.parameters['error'] == -1: + msg_err = _('Remote contact stopped transfer') + elif event.parameters['error'] == -6: + msg_err = _('Error opening file') + self._got_file_error(event.parameters, event.type_, + _('File transfer stopped'), msg_err) + elif event.type_ in ('file-request-error', 'file-send-error'): + self._got_file_error(event.parameters, event.type_, + _('File transfer cancelled'), + _('Connection with peer cannot be established.')) + + def on_event_removed(self, event_list): + """ + Called when one or more events are removed from the event list + """ + for ev in event_list: + if ev.account != self.account: + continue + if ev.jid != self.contact.jid: + continue + if ev.type_ not in ('file-request', 'file-completed', 'file-error', + 'file-stopped', 'file-request-error', 'file-send-error'): + continue + i = 0 + for ib_msg in self.info_bar_queue: + if ib_msg[2] == ev.parameters: + self.info_bar_queue.remove(ib_msg) + if i == 0: + # We are removing the one currently displayed + area = self.info_bar.get_action_area() + for b in area.get_children(): + area.remove(b) + self.info_bar.hide() + # show next one? + gobject.idle_add(self._info_bar_show_message) + break + i += 1 diff -r 64241dd9dffc -r 63efde9ea069 src/filetransfers_window.py --- a/src/filetransfers_window.py Mon Oct 17 18:03:30 2011 +0300 +++ b/src/filetransfers_window.py Mon Oct 17 17:12:19 2011 +0200 @@ -320,6 +320,70 @@ self.add_transfer(account, contact, file_props) gajim.connections[account].send_file_approval(file_props) + def on_file_request_accepted(self, account, contact, file_props): + def on_ok(widget, account, contact, file_props): + file_path = dialog2.get_filename() + file_path = gtkgui_helpers.decode_filechooser_file_paths( + (file_path,))[0] + if os.path.exists(file_path): + # check if we have write permissions + if not os.access(file_path, os.W_OK): + file_name = os.path.basename(file_path) + dialogs.ErrorDialog( + _('Cannot overwrite existing file "%s"' % file_name), + _('A file with this name already exists and you do not ' + 'have permission to overwrite it.')) + return + stat = os.stat(file_path) + dl_size = stat.st_size + file_size = file_props['size'] + dl_finished = dl_size >= file_size + + def on_response(response): + if response < 0: + return + elif response == 100: + file_props['offset'] = dl_size + dialog2.destroy() + self._start_receive(file_path, account, contact, file_props) + + dialog = dialogs.FTOverwriteConfirmationDialog( + _('This file already exists'), _('What do you want to do?'), + propose_resume=not dl_finished, on_response=on_response) + dialog.set_transient_for(dialog2) + dialog.set_destroy_with_parent(True) + return + else: + dirname = os.path.dirname(file_path) + if not os.access(dirname, os.W_OK) and os.name != 'nt': + # read-only bit is used to mark special folder under + # windows, not to mark that a folder is read-only. + # See ticket #3587 + dialogs.ErrorDialog(_('Directory "%s" is not writable') % \ + dirname, _('You do not have permission to create files ' + 'in this directory.')) + return + dialog2.destroy() + self._start_receive(file_path, account, contact, file_props) + + def on_cancel(widget, account, contact, file_props): + dialog2.destroy() + gajim.connections[account].send_file_rejection(file_props) + + dialog2 = dialogs.FileChooserDialog( + title_text=_('Save File as...'), + action=gtk.FILE_CHOOSER_ACTION_SAVE, + buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_SAVE, gtk.RESPONSE_OK), + default_response=gtk.RESPONSE_OK, + current_folder=gajim.config.get('last_save_dir'), + on_response_ok=(on_ok, account, contact, file_props), + on_response_cancel=(on_cancel, account, contact, file_props)) + + dialog2.set_current_name(file_props['name']) + dialog2.connect('delete-event', lambda widget, event: + on_cancel(widget, account, contact, file_props)) + def show_file_request(self, account, contact, file_props): """ Show dialog asking for comfirmation and store location of new file @@ -340,64 +404,7 @@ dialog = None def on_response_ok(account, contact, file_props): - - def on_ok(widget, account, contact, file_props): - file_path = dialog2.get_filename() - file_path = gtkgui_helpers.decode_filechooser_file_paths( - (file_path,))[0] - if os.path.exists(file_path): - # check if we have write permissions - if not os.access(file_path, os.W_OK): - file_name = os.path.basename(file_path) - dialogs.ErrorDialog(_('Cannot overwrite existing file "%s"' % file_name), - _('A file with this name already exists and you do not have permission to overwrite it.')) - return - stat = os.stat(file_path) - dl_size = stat.st_size - file_size = file_props['size'] - dl_finished = dl_size >= file_size - - def on_response(response): - if response < 0: - return - elif response == 100: - file_props['offset'] = dl_size - dialog2.destroy() - self._start_receive(file_path, account, contact, file_props) - - dialog = dialogs.FTOverwriteConfirmationDialog(

1 0

gajim: catch the error in the plugins manifest file
by Fomin Denis 01 Dec '11

01 Dec '11

changeset 18975845c562 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=18975845c562 description: catch the error in the plugins manifest file diffstat: src/plugins/pluginmanager.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diffs (18 lines): diff -r a5e5b7525fb0 -r 18975845c562 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sun Oct 16 11:14:40 2011 +0200 +++ b/src/plugins/pluginmanager.py Sun Oct 16 22:40:42 2011 +0300 @@ -480,6 +480,14 @@ # all fields are required log.debug('%s : %s' % (module_attr_name, 'wrong manifest file. all fields are required!')) + except ConfigParser.NoSectionError, type_error: + # info section are required + log.debug('%s : %s' % (module_attr_name, + 'wrong manifest file. info section are required!')) + except ConfigParser.MissingSectionHeaderError, type_error: + # info section are required + log.debug('%s : %s' % (module_attr_name, + 'wrong manifest file. section are required!')) return plugins_found

1 0

gajim: add button icons in the account window
by Fomin Denis 01 Dec '11

01 Dec '11

changeset 64241dd9dffc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=64241dd9dffc description: add button icons in the account window diffstat: data/gui/accounts_window.ui | 133 +++++++++++++++++++++++++++++-------------- 1 files changed, 88 insertions(+), 45 deletions(-) diffs (172 lines): diff -r 18975845c562 -r 64241dd9dffc data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Sun Oct 16 22:40:42 2011 +0300 +++ b/data/gui/accounts_window.ui Mon Oct 17 18:03:30 2011 +0300 @@ -63,13 +63,42 @@ </child> <child> <object class="GtkButton" id="add_button"> - <property name="label">gtk-add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="use_stock">True</property> <signal name="clicked" handler="on_add_button_clicked"/> + <child> + <object class="GtkAlignment" id="alignment5"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-add</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label29"> + <property name="visible">True</property> + <property name="label" translatable="yes">Add</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -78,13 +107,42 @@ </child> <child> <object class="GtkButton" id="remove_button"> - <property name="label">gtk-remove</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">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="use_stock">True</property> <signal name="clicked" handler="on_remove_button_clicked"/> + <child> + <object class="GtkAlignment" id="alignment7"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkHBox" id="hbox7"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="stock">gtk-remove</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label26"> + <property name="visible">True</property> + <property name="label" translatable="yes">Delete</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -99,52 +157,37 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <signal name="clicked" handler="on_rename_button_clicked"/> <child> - <object class="GtkHBox" id="hbox8"> + <object class="GtkAlignment" id="alignment6"> <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="spacing">6</property> + <property name="xscale">0</property> + <property name="yscale">0</property> <child> - <object class="GtkLabel" id="label26"> + <object class="GtkHBox" id="hbox8"> <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="spacing">2</property> + <child> + <object class="GtkImage" id="rename_image"> + <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="stock">gtk-missing-image</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label25"> + <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="label" translatable="yes">Re_name</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="rename_image"> - <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="stock">gtk-missing-image</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label25"> - <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="label" translatable="yes">Re_name</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label27"> - <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> - </object> - <packing> - <property name="position">3</property> - </packing> </child> </object> </child>

1 0

gajim: prevent traceback when obj.msg_id is not set
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset a5e5b7525fb0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a5e5b7525fb0 description: prevent traceback when obj.msg_id is not set diffstat: src/session.py | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diffs (53 lines): diff -r 51b82872570c -r a5e5b7525fb0 src/session.py --- a/src/session.py Sat Oct 15 10:47:22 2011 +0200 +++ b/src/session.py Sun Oct 16 11:14:40 2011 +0200 @@ -73,7 +73,7 @@ if self.control and self.control.resource: self.control.change_resource(self.resource) - msg_id = None + obj.msg_id = None if obj.mtype == 'chat': if not obj.stanza.getTag('body') and obj.chatstate is None: @@ -89,7 +89,7 @@ msg_to_log = obj.xhtml else: msg_to_log = obj.msgtxt - msg_id = gajim.logger.write(log_type, obj.fjid, + obj.msg_id = gajim.logger.write(log_type, obj.fjid, msg_to_log, tim=obj.timestamp, subject=obj.subject) except exceptions.PysqliteOperationalError, e: self.conn.dispatch('ERROR', (_('Disk WriteError'), str(e))) @@ -101,8 +101,6 @@ common.logger.LOG_DB_PATH self.conn.dispatch('ERROR', (pritext, sectext)) - obj.msg_id = msg_id - treat_as = gajim.config.get('treat_incoming_messages') if treat_as: obj.mtype = treat_as @@ -134,8 +132,8 @@ # Brand new message, incoming. contact.our_chatstate = obj.chatstate contact.chatstate = obj.chatstate - if msg_id: # Do not overwrite an existing msg_id with None - contact.msg_id = msg_id + if obj.msg_id: # Do not overwrite an existing msg_id with None + contact.msg_id = obj.msg_id # THIS MUST BE AFTER chatstates handling # AND BEFORE playsound (else we ear sounding on chatstates!) @@ -168,8 +166,9 @@ if gajim.interface.remote_ctrl: gajim.interface.remote_ctrl.raise_signal('NewMessage', ( self.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp, - obj.encrypted, obj.mtype, obj.subject, obj.chatstate, msg_id, - obj.composing_xep, obj.user_nick, obj.xhtml, obj.form_node])) + obj.encrypted, obj.mtype, obj.subject, obj.chatstate, + obj.msg_id, obj.composing_xep, obj.user_nick, obj.xhtml, + obj.form_node])) def roster_message2(self, obj): """

1 0

gajim: request room config when we convert a chat to groupchat s...
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset 51b82872570c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=51b82872570c description: request room config when we convert a chat to groupchat so that we can configure it. Fixes #7014 diffstat: src/groupchat_control.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diffs (18 lines): diff -r 7c1604014731 -r 51b82872570c src/groupchat_control.py --- a/src/groupchat_control.py Thu Oct 13 22:23:40 2011 +0200 +++ b/src/groupchat_control.py Sat Oct 15 10:47:22 2011 +0200 @@ -1495,6 +1495,14 @@ # http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes-\ # init if obj.status_code: + if '110' in obj.status_code: + # We just join the room + if self.room_jid in gajim.automatic_rooms[self.account] and \ + gajim.automatic_rooms[self.account][self.room_jid]['invities']: + if self.room_jid not in gajim.interface.instances[ + self.account]['gc_config']: + gajim.connections[self.account].request_gc_config( + self.room_jid) if '100' in obj.status_code: # Can be a message (see handle_event_gc_config_change in # gajim.py)

1 0

gajim: don't generate wrong jid when sending a single message to...
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset e5b83d61366b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e5b83d61366b description: don't generate wrong jid when sending a single message to several contacts diffstat: src/dialogs.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (17 lines): diff -r 002c0d0a2ef8 -r e5b83d61366b src/dialogs.py --- a/src/dialogs.py Thu Oct 13 18:04:43 2011 +0200 +++ b/src/dialogs.py Thu Oct 13 21:44:29 2011 +0200 @@ -3067,7 +3067,12 @@ _('Please make sure you are connected with "%s".') % self.account) return if isinstance(self.to, list): - sender_list = [i[0].jid + '/' + i[0].resource for i in self.to] + sender_list = [] + for i in self.to: + if i[0].resource: + sender_list.append(i[0].jid + '/' + i[0].resource) + else: + sender_list.append(i[0].jid) else: sender_list = [self.to_entry.get_text().decode('utf-8')]

1 0

gajim: tryin to unpickle a GNU dbm file doesn't produce the same...
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset 7c1604014731 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7c1604014731 description: tryin to unpickle a GNU dbm file doesn't produce the same exception as bsddb. Handle both. Fixes #7013 diffstat: src/plugins/plugin.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e5b83d61366b -r 7c1604014731 src/plugins/plugin.py --- a/src/plugins/plugin.py Thu Oct 13 21:44:29 2011 +0200 +++ b/src/plugins/plugin.py Thu Oct 13 22:23:40 2011 +0200 @@ -250,7 +250,7 @@ try: self.data = cPickle.load(fd) fd.close() - except EOFError: + except: fd.close() try: import shelve

1 0

gajim: handle default value in seclabel combobox. see #7010
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset 002c0d0a2ef8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=002c0d0a2ef8 description: handle default value in seclabel combobox. see #7010 diffstat: src/chat_control.py | 11 +++++++++-- src/common/connection_handlers.py | 6 +++++- 2 files changed, 14 insertions(+), 3 deletions(-) diffs (45 lines): diff -r 797dd9d03316 -r 002c0d0a2ef8 src/chat_control.py --- a/src/chat_control.py Wed Oct 12 21:07:02 2011 +0200 +++ b/src/chat_control.py Thu Oct 13 18:04:43 2011 +0200 @@ -310,9 +310,16 @@ def on_seclabels_ready(self): lb = self.seclabel_combo.get_model() lb.clear() - for label in gajim.connections[self.account].seclabel_catalogues[self.contact.jid][2]: + i = 0 + sel = 0 + catalogue = gajim.connections[self.account].seclabel_catalogues[ + self.contact.jid] + for label in catalogue[2]: lb.append([label]) - self.seclabel_combo.set_active(0) + if label == catalogue[3]: + sel = i + i += 1 + self.seclabel_combo.set_active(sel) self.seclabel_combo.set_no_show_all(False) self.seclabel_combo.show_all() diff -r 797dd9d03316 -r 002c0d0a2ef8 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Oct 12 21:07:02 2011 +0200 +++ b/src/common/connection_handlers.py Thu Oct 13 18:04:43 2011 +0200 @@ -1417,14 +1417,18 @@ items = query.getTags('item') labels = {} ll = [] + default = None for item in items: label = item.getAttr('selector') labels[label] = item.getTag('securitylabel') ll.append(label) + if item.getAttr('default') == 'true': + default = label if to not in self.seclabel_catalogues: - self.seclabel_catalogues[to] = [[], None, None] + self.seclabel_catalogues[to] = [[], None, None, None] self.seclabel_catalogues[to][1] = labels self.seclabel_catalogues[to][2] = ll + self.seclabel_catalogues[to][3] = default for callback in self.seclabel_catalogues[to][0]: callback() self.seclabel_catalogues[to][0] = []

1 0

gajim: prevent traceback when going offline while a jingle sessi...
by Yann Leboulanger 01 Dec '11

01 Dec '11

changeset 797dd9d03316 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=797dd9d03316 description: prevent traceback when going offline while a jingle session is active diffstat: src/common/jingle_session.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (17 lines): diff -r 3f7a9d2d9d3c -r 797dd9d03316 src/common/jingle_session.py --- a/src/common/jingle_session.py Tue Oct 11 21:44:02 2011 +0200 +++ b/src/common/jingle_session.py Wed Oct 12 21:07:02 2011 +0200 @@ -672,9 +672,10 @@ def __content_remove(self, content, reason=None): assert self.state != JingleStates.ended - stanza, jingle = self.__make_jingle('content-remove', reason=reason) - self.__append_content(jingle, content) - self.connection.connection.send(stanza) + if self.connection.connection and self.connection.connected > 1: + stanza, jingle = self.__make_jingle('content-remove', reason=reason) + self.__append_content(jingle, content) + self.connection.connection.send(stanza) # TODO: this will fail if content is not an RTP content gajim.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None, conn=self.connection, jingle_session=self, media=content.media,

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 December 2011