Changeset 6407 for branches/gajim_0.10/src/config.py

Timestamp:

05/31/06 21:31:41 (3 years ago)

Author:

dkirov

Message:

r6265, r6266, r6267, r6269, r6350, r6366

Files:

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

branches/gajim_0.10/src/config.py

@@ -46 +46 @@
 gtk.glade.textdomain (APP)
 
-GTKGUI_GLADE = 'gtkgui.glade'
-
 #---------- PreferencesWindow class -------------#
 class PreferencesWindow:
@@ -61 +59 @@
         def __init__(self):
                 '''Initialize Preferences window'''
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'preferences_window', APP)
+                self.xml = gtkgui_helpers.get_glade('preferences_window.glade')
                 self.window = self.xml.get_widget('preferences_window')
                 self.iconset_combobox = self.xml.get_widget('iconset_combobox')
@@ -985 +983 @@
 
         def __init__(self, account):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'account_modification_window', APP)
+                self.xml = gtkgui_helpers.get_glade('account_modification_window.glade')
                 self.window = self.xml.get_widget('account_modification_window')
                 self.account = account
@@ -1476 +1474 @@
 class ManageProxiesWindow:
         def __init__(self):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'manage_proxies_window', APP)
+                self.xml = gtkgui_helpers.get_glade('manage_proxies_window.glade')
                 self.window = self.xml.get_widget('manage_proxies_window')
                 self.proxies_treeview = self.xml.get_widget('proxies_treeview')
@@ -1640 +1638 @@
 
         def __init__(self):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'accounts_window', APP)
+                self.xml = gtkgui_helpers.get_glade('accounts_window.glade')
                 self.window = self.xml.get_widget('accounts_window')
                 self.accounts_treeview = self.xml.get_widget('accounts_treeview')
@@ -1742 +1740 @@
                 self.account = account
                 self.config = config
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'data_form_window', APP)
+                self.xml = gtkgui_helpers.get_glade('data_form_window.glade')
                 self.window = self.xml.get_widget('data_form_window')
                 self.config_vbox = self.xml.get_widget('config_vbox')
@@ -1891 +1889 @@
                         DataFormWindow.__init__(self, account, infos)
                 else:
-                        self.xml = gtk.glade.XML(GTKGUI_GLADE,  'service_registration_window', APP)
+                        self.xml = gtkgui_helpers.get_glade('service_registration_window.glade')
                         self.window = self.xml.get_widget('service_registration_window')
                         if infos.has_key('registered'):
@@ -2145 +2143 @@
         def __init__(self, account):
                 self.account = account
-                xml = gtk.glade.XML(GTKGUI_GLADE, 'remove_account_window', APP)
+                xml = gtkgui_helpers.get_glade('remove_account_window.glade')
                 self.window = xml.get_widget('remove_account_window')
                 self.remove_and_unregister_radiobutton = xml.get_widget(
@@ -2224 +2222 @@
 class ManageBookmarksWindow:
         def __init__(self):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'manage_bookmarks_window', APP)
+                self.xml = gtkgui_helpers.get_glade('manage_bookmarks_window.glade')
                 self.window = self.xml.get_widget('manage_bookmarks_window')
 
@@ -2486 +2484 @@
 class AccountCreationWizardWindow:
         def __init__(self):
-                self.xml = gtk.glade.XML(GTKGUI_GLADE, 'account_creation_wizard_window',
-                        APP)
+                self.xml = gtkgui_helpers.get_glade('account_creation_wizard_window.glade')
                 self.window = self.xml.get_widget('account_creation_wizard_window')