From 648a862811e86ced17d19a4a6de1ae09ae38223d Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Tue, 22 Nov 2005 15:01:10 +0000 Subject: [PATCH] remove some deprecated log options --- src/common/config.py | 2 - src/config.py | 16 ------- src/gtkgui.glade | 102 +------------------------------------------ 3 files changed, 1 insertion(+), 119 deletions(-) diff --git a/src/common/config.py b/src/common/config.py index 7c1f9802c..b6bd99553 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -116,8 +116,6 @@ class Config: 'check_for_new_version': [ opt_bool, False ], 'usegpg': [ opt_bool, False ], 'use_gpg_agent': [ opt_bool, False ], - 'log_notif_in_user_file': [ opt_bool, True ], - 'log_notif_in_sep_file': [ opt_bool, True ], 'change_roster_title': [ opt_bool, True, _('Add * and [n] in roster title?')], 'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened.')], 'restore_timeout': [opt_int, 60, _('How many minutes should last lines from previous conversation last.')], diff --git a/src/config.py b/src/config.py index cf4e63c16..8b3f13e91 100644 --- a/src/config.py +++ b/src/config.py @@ -398,14 +398,6 @@ class PreferencesWindow: gajim.config.get('custommailapp')) self.xml.get_widget('custom_file_manager_entry').set_text( gajim.config.get('custom_file_manager')) - - #log presences in user file - st = gajim.config.get('log_notif_in_user_file') - self.xml.get_widget('log_in_contact_checkbutton').set_active(st) - - #log presences in external file - st = gajim.config.get('log_notif_in_sep_file') - self.xml.get_widget('log_in_extern_checkbutton').set_active(st) # send os info st = gajim.config.get('send_os_info') @@ -900,14 +892,6 @@ class PreferencesWindow: gajim.config.set('custom_file_manager', widget.get_text().decode('utf-8')) gajim.interface.save_config() - def on_log_in_contact_checkbutton_toggled(self, widget): - gajim.config.set('log_notif_in_user_file', widget.get_active()) - gajim.interface.save_config() - - def on_log_in_extern_checkbutton_toggled(self, widget): - gajim.config.set('log_notif_in_sep_file', widget.get_active()) - gajim.interface.save_config() - def on_send_os_info_checkbutton_toggled(self, widget): gajim.config.set('send_os_info', widget.get_active()) gajim.interface.save_config() diff --git a/src/gtkgui.glade b/src/gtkgui.glade index 6d84aa02d..5ae6074c8 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -5663,7 +5663,7 @@ Disabled 0 False - True + False @@ -6061,106 +6061,6 @@ Custom - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - - 6 - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 6 - - - - True - True - Log presences in _contact's log file - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - True - Log presences in an _external file - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - - - - - True - <b>Log</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - True