From 2fc6cd51e1c0505ff346f9ccaa6567d4adfa4a54 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Sat, 18 Jun 2005 13:48:43 +0000 Subject: [PATCH] gobject.TYPE_STRING/BOOLEAN becomes str/bool --- src/config.py | 24 ++++++++++++------------ src/dialogs.py | 4 ++-- src/roster_window.py | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/config.py b/src/config.py index a64fbd8b1..3b538faf6 100644 --- a/src/config.py +++ b/src/config.py @@ -152,7 +152,7 @@ class PreferencesWindow: cell = gtk.CellRendererText() theme_combobox.pack_start(cell, True) theme_combobox.add_attribute(cell, 'text', 0) - model = gtk.ListStore(gobject.TYPE_STRING) + model = gtk.ListStore(str) theme_combobox.set_model(model) i = 0 for t in gajim.config.get_per('themes'): @@ -259,9 +259,9 @@ class PreferencesWindow: #sounds treeview self.sound_tree = self.xml.get_widget('sounds_treeview') - model = gtk.ListStore(gobject.TYPE_STRING, - gobject.TYPE_BOOLEAN, - gobject.TYPE_STRING) + model = gtk.ListStore(str, + bool, + str) self.sound_tree.set_model(model) col = gtk.TreeViewColumn(_('Active')) @@ -313,7 +313,7 @@ class PreferencesWindow: #Status messages self.msg_tree = self.xml.get_widget('msg_treeview') - model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING) + model = gtk.ListStore(str, str) self.msg_tree.set_model(model) col = gtk.TreeViewColumn('name') self.msg_tree.append_column(col) @@ -972,7 +972,7 @@ class AccountModificationWindow: if not our_proxy: our_proxy = 'None' self.proxy_combobox = self.xml.get_widget('proxies_combobox') - model = gtk.ListStore(gobject.TYPE_STRING) + model = gtk.ListStore(str) self.proxy_combobox.set_model(model) l = gajim.config.get_per('proxies') l.insert(0, 'None') @@ -1337,7 +1337,7 @@ class ManageProxiesWindow: self.xml.get_widget('remove_proxy_button').set_sensitive(False) self.xml.get_widget('proxytype_combobox').set_sensitive(False) self.xml.get_widget('proxy_table').set_sensitive(False) - model = gtk.ListStore(gobject.TYPE_STRING) + model = gtk.ListStore(str) self.proxies_treeview.set_model(model) col = gtk.TreeViewColumn('Proxies') self.proxies_treeview.append_column(col) @@ -1485,8 +1485,8 @@ class AccountsWindow: self.accounts_treeview = self.xml.get_widget('accounts_treeview') self.modify_button = self.xml.get_widget('modify_button') self.remove_button = self.xml.get_widget('remove_button') - model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, - gobject.TYPE_BOOLEAN) + model = gtk.ListStore(str, str, + bool) self.accounts_treeview.set_model(model) #columns renderer = gtk.CellRendererText() @@ -1632,7 +1632,7 @@ class ManageEmoticonsWindow: #emoticons self.emot_tree = self.xml.get_widget('emoticons_treeview') - model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gtk.Image) + model = gtk.ListStore(str, str, gtk.Image) self.emot_tree.set_model(model) col = gtk.TreeViewColumn(_('Text')) self.emot_tree.append_column(col) @@ -1822,8 +1822,8 @@ _('Without a connection, you can not browse available services')).get_response() self.address_comboboxentry_entry = self.address_comboboxentry.child self.address_comboboxentry_entry.set_activates_default(True) - model = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING, - gobject.TYPE_STRING) + model = gtk.TreeStore(str, str, + str) model.set_sort_column_id(0, gtk.SORT_ASCENDING) self.services_treeview.set_model(model) #columns diff --git a/src/dialogs.py b/src/dialogs.py index b3d82bbe8..b4b04d469 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -99,7 +99,7 @@ class EditGroupsDialog: self.update_user() def init_list(self): - store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_BOOLEAN) + store = gtk.ListStore(str, bool) self.list.set_model(store) for g in self.plugin.roster.groups[self.account].keys(): if g in ['Transports', 'not in the roster']: @@ -179,7 +179,7 @@ class ChooseGPGKeyDialog: self.keys_treeview = xml.get_widget('keys_treeview') prompt_label = xml.get_widget('prompt_label') prompt_label.set_text(prompt_text) - model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING) + model = gtk.ListStore(str, str) self.keys_treeview.set_model(model) #columns renderer = gtk.CellRendererText() diff --git a/src/roster_window.py b/src/roster_window.py index ce53996a6..cfbc10316 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -1624,7 +1624,7 @@ _('If "%s" accepts this request you will know his status.') %jid).get_response() self.newly_added[a] = [] self.to_be_removed[a] = [] #(icon, name, type, jid, account, editable) - model = gtk.TreeStore(gtk.Image, str, str, str, str, gobject.TYPE_BOOLEAN) + model = gtk.TreeStore(gtk.Image, str, str, str, str, bool) model.set_sort_func(1, self.compareIters) model.set_sort_column_id(1, gtk.SORT_ASCENDING) self.tree.set_model(model) @@ -1640,8 +1640,8 @@ _('If "%s" accepts this request you will know his status.') %jid).get_response() self.transports_state_images[transport] = self.load_iconset(folder + \ '/16x16/') - liststore = gtk.ListStore(gobject.TYPE_STRING, gtk.Image, - gobject.TYPE_STRING) + liststore = gtk.ListStore(str, gtk.Image, + str) self.status_combobox = gtk.ComboBox() roster_vbox = self.xml.get_widget('roster_vbox') roster_vbox.pack_end(self.status_combobox, False)