diff --git a/src/config.py b/src/config.py index aa6b92152..55ae78fee 100644 --- a/src/config.py +++ b/src/config.py @@ -325,14 +325,14 @@ class Preferences_window: def on_reset_colors_button_clicked(self, widget): for i in ['inmsgcolor', 'outmsgcolor', 'statusmsgcolor']: - gajim.config.set(i, gajim.config.get_default(i)) + gajim.config.set(i, self.plugin.default_values[i]) self.xml.get_widget('incoming_msg_colorbutton').set_color(\ - gtk.gdk.color_parse(gajim.config.get_default('inmsgcolor'))) + gtk.gdk.color_parse(gajim.config.get('inmsgcolor'))) self.xml.get_widget('outgoing_msg_colorbutton').set_color(\ - gtk.gdk.color_parse(gajim.config.get_default('outmsgcolor'))) + gtk.gdk.color_parse(gajim.config.get('outmsgcolor'))) self.xml.get_widget('status_msg_colorbutton').set_color(\ - gtk.gdk.color_parse(gajim.config.get_default('statusmsgcolor'))) + gtk.gdk.color_parse(gajim.config.get('statusmsgcolor'))) self.update_text_tags() self.plugin.save_config() diff --git a/src/gajim.py b/src/gajim.py index 27ac4c435..6daf320d8 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -638,6 +638,16 @@ class Interface: parser.write() def __init__(self): + self.default_values = { + 'inmsgcolor': gajim.config.get('inmsgcolor'), + 'outmsgcolor': gajim.config.get('outmsgcolor'), + 'statusmsgcolor': gajim.config.get('statusmsgcolor'), + } + parser.read() + + for account in gajim.config.get_per('accounts'): + gajim.connections[account] = common.connection.Connection(account) + if gtk.pygtk_version >= (2, 6, 0): gtk.about_dialog_set_email_hook(self.on_launch_browser_mailer, 'mail') gtk.about_dialog_set_url_hook(self.on_launch_browser_mailer, 'url') @@ -712,10 +722,5 @@ if __name__ == '__main__': except ImportError: pass - parser.read() - - for account in gajim.config.get_per('accounts'): - gajim.connections[account] = common.connection.Connection(account) - Interface() gtk.main()