Changeset 9153

Timestamp:

12/15/07 21:41:46 (9 months ago)

Author:

nicfit

Message:

Use one_message_window_with_roster and some whitespace cleanup

Files:

• branches/one_window/src/roster_window.py (modified) (12 diffs)

branches/one_window/src/roster_window.py

@@ -4 +4 @@
 ## Copyright (C) 2003-2007 Yann Leboulanger <asterix@lagaule.org>
 ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem@gmail.com>
+##                         Travis Shirk <travis@pobox.com> 
 ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov@gmail.com>
 ## Copyright (C) 2007 Lukas Petrovicky <lukas@petrovicky.net>
@@ -3086 +3087 @@
                         execute_command_menuitem.connect('activate',
                                 self.on_execute_command, contact, account)
-                        
-                        start_chat_menuitem.connect('activate', 
+
+                        start_chat_menuitem.connect('activate',
                                 self.on_new_chat_menuitem_activate, account)
 
@@ -4151 +4152 @@
                 else:
                         gajim.interface.instances['file_transfers'].window.show_all()
-        
+
         def on_history_menuitem_activate(self, widget):
                 if gajim.interface.instances.has_key('logs'):
@@ -4398 +4399 @@
                         win.get_control(fjid, account).got_disconnected()
 
-                if gajim.config.get('one_message_window') == 'always':
+                # FIXME: This is probably not the right place for this code.
+                if (gajim.config.get('one_message_window') == 'always' and
+                                gajim.config.get('one_message_window_with_roster')):
                         win.window.hide()
                         hpaned = self.xml.get_widget('roster_hpaned')
-                        notebook = win.xml.get_widget('notebook') 
+                        notebook = win.xml.get_widget('notebook')
                         notebook.reparent(hpaned)
                         hpaned.pack2(notebook, resize=True, shrink=True)
@@ -4995 +4998 @@
                         for g in old_groups:
                                 self.draw_group(g, account_source)
-                        self.draw_account(account_source)       
+                        self.draw_account(account_source)
                         context.finish(True, True, etime)
 
@@ -5067 +5070 @@
                 if position == gtk.TREE_VIEW_DROP_BEFORE and len(path_dest) == 2:
                         # dropped before a group: we drop it in the previous group every time
-                        path_dest = (path_dest[0], path_dest[1]-1)      
+                        path_dest = (path_dest[0], path_dest[1]-1)
                 # destination: the row something got dropped on
                 iter_dest = model.get_iter(path_dest)
@@ -5121 +5124 @@
                         dialog.popup()
                         return
-                
+
                 # a roster entry was dragged and dropped somewhere in the roster
 
@@ -5129 +5132 @@
                 type_source = model[iter_source][C_TYPE]
                 account_source = model[iter_source][C_ACCOUNT].decode('utf-8')
-                
+
                 # Only normal contacts can be dragged   
-                if type_source != 'contact': 
+                if type_source != 'contact':
                         return
                 if gajim.config.get_per('accounts', account_source, 'is_zeroconf'):
@@ -5181 +5184 @@
                                 # Drop on self
                                 return
-                
+
                 # contact drop somewhere in or on a foreign account
                 if (type_dest == 'account' or not self.regroup) and \
@@ -5189 +5192 @@
                                 user_nick = c_source.name, group = grp_dest)
                         return
-                
+
                 # we may not add contacts from special_groups
                 if grp_source in helpers.special_groups :
@@ -5203 +5206 @@
                                 is_big_brother, context, etime, grp_source)
                         return
-                
+
                 # Contact drop on another contact, make meta contacts
                 if position == gtk.TREE_VIEW_DROP_INTO_OR_AFTER or \
@@ -5313 +5316 @@
                 self.xml.get_widget('roster_window').add_accel_group(accels)
                 prefs_item.add_accelerator('activate', accels, ord(','),
-                                                                   gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
+                                                gtk.gdk.CONTROL_MASK, gtk.ACCEL_VISIBLE)
                 app_menu.append(prefs_item)
                 app_menu.append(gtk.MenuItem('__SKIP__'))