Changeset 8955

Timestamp:

11/09/07 20:30:15 (11 months ago)

Author:

asterix

Message:

merge some fixes from trunk: [8864] [8866] [8881] [8884] [8887] [8894] [8895] [8902] [8903] [8904] [8905] [8906] [8910] [8918] [8919] [8921] [8923] [8924] [8938] [8942] [8952] [8953] [8954]

Location:

branches/gajim_0.11.2/src

Files:

• adhoc_commands.py (modified) (1 diff)
• cell_renderer_image.py (modified) (1 diff)
• chat_control.py (modified) (1 diff)
• common/commands.py (modified) (1 diff)
• common/connection_handlers.py (modified) (3 diffs)
• common/xmpp/roster.py (modified) (1 diff)
• common/zeroconf/client_zeroconf.py (modified) (1 diff)
• common/zeroconf/connection_handlers_zeroconf.py (modified) (1 diff)
• dialogs.py (modified) (1 diff)
• disco.py (modified) (4 diffs)
• gajim.py (modified) (3 diffs)
• groupchat_control.py (modified) (5 diffs)
• message_window.py (modified) (2 diffs)
• profile_window.py (modified) (4 diffs)
• roster_window.py (modified) (1 diff)
• systray.py (modified) (1 diff)
• tooltips.py (modified) (1 diff)

branches/gajim_0.11.2/src/adhoc_commands.py

@@ -446 +446 @@
                         # commands => command selection stage
                         query = response.getTag('query')
-                        if query:
+                        if query and query.getAttr('node') == xmpp.NS_COMMANDS:
                                 items = query.getTags('item')
                         else:

branches/gajim_0.11.2/src/cell_renderer_image.py

@@ -90 +90 @@
                 if self.image.get_storage_type() == gtk.IMAGE_ANIMATION:
                         if self.image not in self.iters:
+                                if not isinstance(widget, gtk.TreeView):
+                                        return
                                 animation = self.image.get_animation()
                                 iter =  animation.get_iter()

branches/gajim_0.11.2/src/chat_control.py

@@ -1798 +1798 @@
                 window.set_events(gtk.gdk.POINTER_MOTION_MASK)
                 window.set_app_paintable(True)
+                if gtk.gtk_version >= (2, 10, 0) and gtk.pygtk_version >= (2, 10, 0):
+                        window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_TOOLTIP)
                 
                 window.realize()

branches/gajim_0.11.2/src/common/commands.py

@@ -259 +259 @@
                 jid = helpers.get_full_jid_from_iq(iq_obj)
                 q = iq.getTag('query')
+                # buildReply don't copy the node attribute. Re-add it
+                q.setAttr('node', xmpp.NS_COMMANDS)
 
                 for node, cmd in self.__commands.iteritems():

branches/gajim_0.11.2/src/common/connection_handlers.py

@@ -449 +449 @@
 
                 if real_id[:3] == 'au_':
-                        gajim.socks5queue.send_file(file_props, self.name)
+                        if file.has_key('stopped') and file_props['stopped']:
+                                self.remove_transfer(file_props)
+                        else:
+                                gajim.socks5queue.send_file(file_props, self.name)
                         raise common.xmpp.NodeProcessed
 
@@ -471 +474 @@
 
                 else:
-                        gajim.socks5queue.send_file(file_props, self.name)
+                        if file_props.has_key('stopped') and file_props['stopped']:
+                                self.remove_transfer(file_props)
+                        else:
+                                gajim.socks5queue.send_file(file_props, self.name)
                         if file_props.has_key('fast'):
                                 fasts = file_props['fast']
@@ -1044 +1050 @@
                                 self.dispatch('METACONTACTS', meta_list)
                         else:
-                                self.private_storage_supported = False
+                                if iq_obj.getErrorCode() not in ('403', '406', '404'):
+                                        self.private_storage_supported = False
                         # We can now continue connection by requesting the roster
                         self.connection.initRoster()

branches/gajim_0.11.2/src/common/xmpp/roster.py

@@ -65 +65 @@
         """ Subscription tracker. Used internally for setting items state in
             internal roster representation. """
+        sender = stanza.getAttr('from')
+        if not sender == None: and not sender.bareMatch(
+        self._owner.User + '@' + self._owner.Server):
+            return
         for item in stanza.getTag('query').getTags('item'):
             jid=item.getAttr('jid')

branches/gajim_0.11.2/src/common/zeroconf/client_zeroconf.py

@@ -213 +213 @@
         def on_disconnect(self):
                 if self.conn_holder:
-                        if self.conn_holder.number_of_awaiting_messages.has_key(self.conn_holder.fd):
-                                if self.conn_holder.number_of_awaiting_messages[self.conn_holder.fd] > 0:
+                        if self.conn_holder.number_of_awaiting_messages.has_key(self.fd):
+                                if self.conn_holder.number_of_awaiting_messages[self.fd] > 0:
                                         self._caller.dispatch('MSGERROR',[unicode(self.to), -1, \
                                         _('Connection to host could not be established'), None, None])
-                                del self.conn_holder.number_of_awaiting_messages[self.conn_holder.fd]
+                                del self.conn_holder.number_of_awaiting_messages[self.fd]
                         self.conn_holder.remove_connection(self.sock_hash) 
                 if self.__dict__.has_key('Dispatcher'):

branches/gajim_0.11.2/src/common/zeroconf/connection_handlers_zeroconf.py

@@ -582 +582 @@
                 file_props['request-id'] = unicode(iq_obj.getAttr('id'))
                 file_props['sid'] = unicode(si.getAttr('id'))
+                file_props['transfered_size'] = []
                 gajim.socks5queue.add_file_props(self.name, file_props)
                 self.dispatch('FILE_REQUEST', (jid, file_props))

branches/gajim_0.11.2/src/dialogs.py

@@ -2392 +2392 @@
                         on_response_cancel = on_response_cancel)
 
+                if on_response_cancel:
+                        self.connect('destroy', on_response_cancel)
+
                 filter = gtk.FileFilter()
                 filter.set_name(_('All files'))

branches/gajim_0.11.2/src/disco.py

@@ -66 +66 @@
                 ('server', 'im'):                               (ToplevelAgentBrowser, 'jabber.png'),
                 ('services', 'jabber'):         (ToplevelAgentBrowser, 'jabber.png'),
+                ('hierarchy', 'branch'):        (AgentBrowser, 'jabber.png'),
 
                 # Services
@@ -78 +79 @@
                 ('pubsub', 'service'):          (PubSubBrowser, 'pubsub.png'),
                 ('proxy', 'bytestreams'):       (None, 'bytestreams.png'), # Socks5 FT proxy
+                ('headline', 'newmail'):        (ToplevelAgentBrowser, 'mail.png'),
 
                 # Transports
@@ -960 +962 @@
                 self.model.append((jid, node, item.get('name', ''),
                         get_agent_address(jid, node)))
+                self.cache.get_info(jid, node, self._agent_info, force = force)
 
         def _update_item(self, iter, jid, node, item):
@@ -970 +973 @@
                 '''Called when an item should be updated in the model with further info.
                 The result of a disco#info query.'''
-                self.model[iter][2] = identities[0].get('name', '')
+                name = identities[0].get('name', '')
+                if name:
+                        self.model[iter][2] = name
 
         def _update_error(self, iter, jid, node):

branches/gajim_0.11.2/src/gajim.py

@@ -24 +24 @@
 from common import i18n
 
+# PyGTK2.10+ only throws a warning
+import warnings
+warnings.filterwarnings('error', module='gtk')
+try:
+        import gtk
+except Warning, msg:
+        if str(msg) == 'could not open display':
+                print >> sys.stderr, _('Gajim needs X server to run. Quiting...')
+                sys.exit()
+warnings.resetwarnings()
+
 import message_control
 
@@ -41 +52 @@
                 pass
 
-try:
-        import gtk
-except RuntimeError, msg:
-        if str(msg) == 'could not open display':
-                print >> sys.stderr, _('Gajim needs X server to run. Quiting...')
-                sys.exit()
 pritext = ''
 if gtk.pygtk_version < (2, 6, 0):
@@ -1021 +1026 @@
                 if self.msg_win_mgr.has_window(fjid, account):
                         ctrl = self.msg_win_mgr.get_control(fjid, account)
-                        contact = ctrl.contact
-                        contact.show = show
-                        contact.status = status
-                        ctrl.update_ui()
-                        uf_show = helpers.get_uf_show(show)
-                        if status:
-                                ctrl.print_conversation(_('%s is now %s (%s)') % (nick, uf_show,
-                                        status), 'status')
+                        statusCode = array[9]
+                        if '303' in statusCode:
+                                new_nick = array[10]
+                                ctrl.print_conversation(_('%s is now known as %s') % (nick,
+                                        new_nick), 'status')
+                                gc_c = gajim.contacts.get_gc_contact(account, room_jid, new_nick)
+                                c = gajim.contacts.contact_from_gc_contact(gc_c)
+                                ctrl.gc_contact = gc_c
+                                ctrl.contact = c
+                                ctrl.draw_banner()
+                                old_jid = room_jid + '/' + nick
+                                new_jid = room_jid + '/' + new_nick
+                                self.msg_win_mgr.change_key(old_jid, new_jid, account)
                         else:
-                                ctrl.print_conversation(_('%s is now %s') % (nick, uf_show),
-                                        'status')
-                        ctrl.parent_win.redraw_tab(ctrl)
+                                contact = ctrl.contact
+                                contact.show = show
+                                contact.status = status
+                                uf_show = helpers.get_uf_show(show)
+                                if status:
+                                        ctrl.print_conversation(_('%s is now %s (%s)') % (nick, uf_show,
+                                                status), 'status')
+                                else:
+                                        ctrl.print_conversation(_('%s is now %s') % (nick, uf_show),
+                                                'status')
+                                ctrl.parent_win.redraw_tab(ctrl)
+                                ctrl.update_ui()
                         if self.remote_ctrl:
                                 self.remote_ctrl.raise_signal('GCPresence', (account, array))

branches/gajim_0.11.2/src/groupchat_control.py

@@ -187 +187 @@
 
                 self.room_jid = self.contact.jid
-                self.nick = contact.name
+                self.nick = contact.name.decode('utf-8')
+                self.new_nick = ''
                 self.name = self.room_jid.split('@')[0]
 
@@ -868 +869 @@
                                 self.print_conversation(s, 'info')
                         elif '303' in statusCode: # Someone changed his or her nick
-                                if nick == self.nick: # We changed our nick
-                                        self.nick = new_nick
+                                if nick == self.new_nick: # We changed our nick
+                                        self.nick = self.new_nick
+                                        self.new_nick = ''
                                         s = _('You are now known as %s') % new_nick
                                 else:
@@ -896 +898 @@
                                                 os.path.join(path, puny_new_nick + ext)
                                 for old_file in files:
-                                        if os.path.exists(old_file):
+                                        if os.path.exists(old_file) and old_file != files[old_file]:
                                                 if os.path.exists(files[old_file]):
                                                         # Windows require this
@@ -1107 +1109 @@
                                         return True
                                 gajim.connections[self.account].join_gc(nick, self.room_jid, None)
+                                self.new_nick = nick
                                 self.clear(self.msg_textview)
                         else:
@@ -1389 +1392 @@
                         gajim.connections[self.account].join_gc(nick, self.room_jid, None)
                         self.nick = nick
+
                 instance = dialogs.InputDialog(title, prompt, proposed_nick,
                         is_modal = False, ok_handler = on_ok)

branches/gajim_0.11.2/src/message_window.py

@@ -439 +439 @@
                         nth_child = notebook.get_nth_page(page_num)
                         return self._widget_to_control(nth_child)
+
+        def change_key(self, old_jid, new_jid, acct):
+                '''Change the key of a control'''
+                try:
+                        # Check if control exists
+                        ctrl = self._controls[acct][old_jid]
+                except:
+                        return
+                self._controls[acct][new_jid] = self._controls[acct][old_jid]
+                del self._controls[acct][old_jid]
 
         def controls(self):
@@ -767 +777 @@
                 return win
 
+        def change_key(self, old_jid, new_jid, acct):
+                win = self.get_window(old_jid, acct)
+                if self.mode == self.ONE_MSG_WINDOW_NEVER:
+                        old_key = acct + old_jid
+                        if old_jid not in self._windows:
+                                return
+                        new_key = acct + new_jid
+                        self._windows[new_key] = self._windows[old_key]
+                        del self._windows[old_key]
+                win.change_key(old_jid, new_jid, acct)
+
         def _on_window_delete(self, win, event):
                 self.save_state(self._gtk_win_to_msg_win(win))

branches/gajim_0.11.2/src/profile_window.py

@@ -67 +67 @@
                 self.jid = gajim.get_jid_from_account(account)
 
+                self.dialog = None
                 self.avatar_mime_type = None
                 self.avatar_encoded = None
@@ -99 +100 @@
                         gobject.source_remove(self.remove_statusbar_timeout_id)
                 del gajim.interface.instances[self.account]['profile']
+                if self.dialog: # Image chooser dialog
+                        self.dialog.destroy()
 
         def on_profile_window_key_press_event(self, widget, event):
@@ -156 +159 @@
                         # rescale it
                         pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'vcard')
+                        self.dialog = None
                         button = self.xml.get_widget('PHOTO_button')
                         image = button.get_image()
@@ -173 +177 @@
                 def on_clear(widget):
                         self.dialog.destroy()
+                        self.dialog = None
                         self.on_clear_button_clicked(widget)
 
-                self.dialog = dialogs.AvatarChooserDialog(on_response_ok = on_ok,
-                        on_response_clear = on_clear)
+                def on_cancel(widget):
+                        self.dialog.destroy()
+                        self.dialog = None
+
+                if self.dialog:
+                        self.dialog.present()
+                else:
+                        self.dialog = dialogs.AvatarChooserDialog(on_response_ok = on_ok,
+                                on_response_cancel = on_cancel, on_response_clear = on_clear)
 
         def on_PHOTO_button_press_event(self, widget, event):

branches/gajim_0.11.2/src/roster_window.py

@@ -2717 +2717 @@
                                 jids
                         self.dialog = dialogs.ConfirmationDialog(pritext, sectext,
-                                on_response_ok = (on_ok, list_))
+                                on_response_ok = (on_ok2, list_))
 
 

branches/gajim_0.11.2/src/systray.py

@@ -317 +317 @@
                         'CHANGE_STATUS_MSG_MENUITEM', 'SEPARATOR', 'offline']
                 index = l.index(show)
-                gajim.interface.roster.status_combobox.set_active(index)
+                current = gajim.interface.roster.status_combobox.get_active()
+                if index != current:
+                        gajim.interface.roster.status_combobox.set_active(index)
+                else:
+                        # We maybe need to emit the changed signal if all globaly sync'ed
+                        # account don't have the global status
+                        need_to_change = False
+                        accounts = gajim.connections.keys()
+                        for acct in accounts:
+                                if not gajim.config.get_per('accounts', acct,
+                                'sync_with_global_status'):
+                                        continue
+                                acct_show = gajim.SHOW_LIST[gajim.connections[acct].connected]
+                                if acct_show != show:
+                                        need_to_change = True
+                                        break
+                        if need_to_change:
+                                gajim.interface.roster.status_combobox.emit('changed')
 
         def on_change_status_message_activate(self, widget):

branches/gajim_0.11.2/src/tooltips.py

@@ -64 +64 @@
                 self.win.set_resizable(False)
                 self.win.set_name('gtk-tooltips')
+                if gtk.gtk_version >= (2, 10, 0) and gtk.pygtk_version >= (2, 10, 0):
+                        self.win.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_TOOLTIP)
                 
                 self.win.set_events(gtk.gdk.POINTER_MOTION_MASK)