Changeset 7787 for branches/gajim_0.11/src/gajim.py

Timestamp:

01/06/07 12:00:50 (2 years ago)

Author:

asterix

Message:

merge changeset from trunk except pyopenssl stuff

Files:

• branches/gajim_0.11/src/gajim.py (modified) (7 diffs)

branches/gajim_0.11/src/gajim.py

@@ -45 +45 @@
 except RuntimeError, msg:
         if str(msg) == 'could not open display':
-                print >> sys.stderr, _('Gajim needs Xserver to run. Quiting...')
+                print >> sys.stderr, _('Gajim needs X server to run. Quiting...')
                 sys.exit()
 pritext = ''
@@ -538 +538 @@
                                 self.roster.draw_contact(ji, account)
                                 self.roster.draw_group(_('Transports'), account)
+                                if new_show > 1 and ji in gajim.transport_avatar[account]:
+                                        # transport just signed in. request avatars
+                                        for jid_ in gajim.transport_avatar[account][ji]:
+                                                gajim.connections[account].request_vcard(jid_)
                                 # transport just signed in/out, don't show popup notifications
                                 # for 30s
@@ -997 +1001 @@
                         ctrl.update_ui()
                         uf_show = helpers.get_uf_show(show)
-                        ctrl.print_conversation(_('%s is now %s (%s)') % (nick, uf_show, status),
-                                                'status')
+                        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)
                         if self.remote_ctrl:
@@ -1112 +1120 @@
                                 self.roster.remove_contact(c, account)
                                 gajim.contacts.remove_jid(account, jid)
+                                self.roster.draw_account(account)
                                 if gajim.events.get_events(account, c.jid):
                                         keyID = ''
@@ -1995 +2004 @@
                 if gajim.config.get('verbose'):
                         gajim.verbose = True
+
+                # Is Gajim default app?
+                if os.name != 'nt' and gajim.config.get('check_if_gajim_is_default'):
+                        gtkgui_helpers.possibly_set_gajim_as_xmpp_handler()
+
                 #add default status messages if there is not in the config file
                 if len(gajim.config.get_per('statusmsg')) == 0:
@@ -2072 +2086 @@
                         gajim.last_message_time[a] = {}
                         gajim.status_before_autoaway[a] = ''
+                        gajim.transport_avatar[a] = {}
 
                 self.roster = roster_window.RosterWindow()
@@ -2184 +2199 @@
                                         cli.set_restart_command(len(argv), argv)
                 
-                gtkgui_helpers.possibly_set_gajim_as_xmpp_handler()
-
         check_paths.check_and_possibly_create_paths()