Changeset 9154 for branches/one_window/src/config.py

Timestamp:

12/15/07 22:04:49 (11 months ago)

Author:

nicfit

Message:

Scratch the chckbox for with roster mode, use one_message_window opt and combo

Files:

• branches/one_window/src/config.py (modified) (3 diffs)

branches/one_window/src/config.py

@@ -151 +151 @@
                         self.one_window_type_combobox.set_active(0)
 
-                # Set sensitive of combined roster/msgs checkbox iff one_message_window is 'always'
-                if type == 'always':
-                        self.xml.get_widget('one_window_with_roster_checkbutton').set_sensitive(True)
-                else:
-                        self.xml.get_widget('one_window_with_roster_checkbutton').set_sensitive(False)
-
                 # Compact View
                 st = gajim.config.get('compact_view')
@@ -182 +176 @@
                 iconsets_list = os.listdir(os.path.join(gajim.DATA_DIR, 'iconsets'))
                 if os.path.isdir(gajim.MY_ICONSETS_PATH):
-                        iconsets_list += os.listdir(gajim.MY_ICONSETS_PATH) 
+                        iconsets_list += os.listdir(gajim.MY_ICONSETS_PATH)
                 # new model, image in 0, string in 1
                 model = gtk.ListStore(gtk.Image, str)
@@ -653 +647 @@
                 active = widget.get_active()
                 config_type = common.config.opt_one_window_types[active]
-                if config_type == 'always':
-                        self.xml.get_widget('one_window_with_roster_checkbutton').set_sensitive(True)
-                else:
-                        self.xml.get_widget('one_window_with_roster_checkbutton').set_sensitive(False)
                 gajim.config.set('one_message_window', config_type)
                 gajim.interface.save_config()
                 gajim.interface.msg_win_mgr.reconfig()
-
-        def on_one_window_with_roster_checkbutton_toggled(self, widget):
-                active = widget.get_active()
-                gajim.config.set('one_message_window_with_roster', active)
-                gajim.interface.save_config()
-                # FIXME
-                #gajim.interface.msg_win_mgr.reconfig()
 
         def on_compact_view_checkbutton_toggled(self, widget):