Changeset 7888 for branches/gajim_0.11/src/config.py

Timestamp:

01/23/07 21:32:43 (23 months ago)

Author:

asterix

Message:

merge fixes from trunk

Files:

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

branches/gajim_0.11/src/config.py

@@ -234 +234 @@
                 if gajim.config.get('print_time') == 'never':
                         self.xml.get_widget('time_never_radiobutton').set_active(True)
-                        self._set_sensitivity_for_before_after_time_widgets(False)
                 elif gajim.config.get('print_time') == 'sometimes':
                         self.xml.get_widget('time_sometimes_radiobutton').set_active(True)
-                        self._set_sensitivity_for_before_after_time_widgets(False)
                 else:
                         self.xml.get_widget('time_always_radiobutton').set_active(True)
@@ -697 +695 @@
                 self.on_checkbutton_toggled(widget, 'ignore_incoming_xhtml')
                 
-        def _set_sensitivity_for_before_after_time_widgets(self, sensitive):
-                self.xml.get_widget('time_stamp_label').set_sensitive(sensitive)
-                self.xml.get_widget('time_stamp_textview').set_sensitive(sensitive)
-        
         def on_time_never_radiobutton_toggled(self, widget):
                 if widget.get_active():
                         gajim.config.set('print_time', 'never')
-                self._set_sensitivity_for_before_after_time_widgets(False)
                 gajim.interface.save_config()
 
@@ -710 +703 @@
                 if widget.get_active():
                         gajim.config.set('print_time', 'sometimes')
-                self._set_sensitivity_for_before_after_time_widgets(False)
                 gajim.interface.save_config()
 
@@ -716 +708 @@
                 if widget.get_active():
                         gajim.config.set('print_time', 'always')
-                self._set_sensitivity_for_before_after_time_widgets(True)
                 gajim.interface.save_config()
 
@@ -2279 +2270 @@
                         if self.infos.has_key('registered'):
                                 del self.infos['registered']
-                        else:
-                                gajim.interface.roster.add_transport_to_roster(self.account,
-                                        self.service)
                         gajim.connections[self.account].register_agent(self.service,
                                 self.infos, True) # True is for is_form
@@ -2293 +2281 @@
                         if self.infos.has_key('registered'):
                                 del self.infos['registered']
-                        else:
-                                gajim.interface.roster.add_transport_to_roster(self.account,
-                                        self.service)
                         gajim.connections[self.account].register_agent(self.service,
                                 self.infos)
@@ -2991 +2976 @@
                                 dialogs.ErrorDialog(pritext, sectext)
                                 return
-                        server = widgets['server_comboboxentry'].child.get_text()
+                        server = widgets['server_comboboxentry'].child.get_text().decode('utf-8')
                         savepass = widgets['save_password_checkbutton'].get_active()
-                        password = widgets['pass1_entry'].get_text()
+                        password = widgets['pass1_entry'].get_text().decode('utf-8')
 
                         if not self.modify: