Author: asterix Date: 2008-04-17 08:34:32 +0200 (Thu, 17 Apr 2008) New Revision: 9483
Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: don't hide roster on startup if no systray module is available
Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-04-16 21:39:58 UTC (rev 9482) +++ trunk/src/gajim.py 2008-04-17 06:34:32 UTC (rev 9483) @@ -2964,8 +2964,6 @@ gajim.status_before_autoaway[a] = '' gajim.transport_avatar[a] = {}
- self.roster = roster_window.RosterWindow() - if gajim.config.get('remote_control'): try: import remote_control @@ -3013,11 +3011,6 @@
self.show_vcard_when_connect = []
- path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png') - pix = gtk.gdk.pixbuf_new_from_file(path_to_file) - # set the icon to all newly opened windows - gtk.window_set_default_icon(pix) - self.roster.window.set_icon_from_file(path_to_file) # and to roster window self.sleeper = common.sleepy.Sleepy( gajim.config.get('autoawaytime') * 60, # make minutes to seconds gajim.config.get('autoxatime') * 60) @@ -3042,6 +3035,14 @@ if self.systray_capabilities and gajim.config.get('trayicon'): self.show_systray()
+ self.roster = roster_window.RosterWindow() + + path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png') + pix = gtk.gdk.pixbuf_new_from_file(path_to_file) + # set the icon to all newly opened windows + gtk.window_set_default_icon(pix) + self.roster.window.set_icon_from_file(path_to_file) # and to roster window + self.init_emoticons() self.make_regexps()
Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-04-16 21:39:58 UTC (rev 9482) +++ trunk/src/roster_window.py 2008-04-17 06:34:32 UTC (rev 9483) @@ -5564,7 +5564,7 @@ if gajim.config.get('show_roster_on_startup'): self.window.show_all() else: - if not gajim.config.get('trayicon'): + if not gajim.config.get('trayicon') or not gajim.interface.systray_capabilities: # cannot happen via GUI, but I put this incase user touches # config. without trayicon, he or she should see the roster! self.window.show_all()