copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove trailing whitespaces and fix coding styles etc and add a FIXME

This commit is contained in:
Nikos Kouremenos 2005-12-06 17:43:21 +00:00
parent 5868901824
commit eb94b9632a
5 changed files with 187 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/config.py
View File

@ -369,7 +369,8 @@ class PreferencesWindow:
self.applications_frame.set_no_show_all(True) self.applications_frame.set_no_show_all(True)
self.applications_frame.hide() self.applications_frame.hide()
else: else:
self.applications_combobox = self.xml.get_widget('applications_combobox') self.applications_combobox = self.xml.get_widget(
'applications_combobox')
if gajim.config.get('autodetect_browser_mailer'): if gajim.config.get('autodetect_browser_mailer'):
self.applications_combobox.set_active(0) self.applications_combobox.set_active(0)
gtkgui_helpers.autodetect_browser_mailer() gtkgui_helpers.autodetect_browser_mailer()

11
src/disco.py
View File

@ -428,7 +428,8 @@ _('Without a connection, you can not browse available services')).get_response()
self.services_treeview = self.xml.get_widget('services_treeview') self.services_treeview = self.xml.get_widget('services_treeview')
# This is more reliable than the cursor-changed signal. # This is more reliable than the cursor-changed signal.
selection = self.services_treeview.get_selection() selection = self.services_treeview.get_selection()
selection.connect_after('changed', self.on_services_treeview_selection_changed) selection.connect_after('changed',
self.on_services_treeview_selection_changed)
self.services_scrollwin = self.xml.get_widget('services_scrollwin') self.services_scrollwin = self.xml.get_widget('services_scrollwin')
self.progressbar = self.xml.get_widget('services_progressbar') self.progressbar = self.xml.get_widget('services_progressbar')
self.progressbar.set_no_show_all(True) self.progressbar.set_no_show_all(True)
@ -446,14 +447,16 @@ _('Without a connection, you can not browse available services')).get_response()
self.address_comboboxentry = None self.address_comboboxentry = None
address_hbox = self.xml.get_widget('address_hbox') address_hbox = self.xml.get_widget('address_hbox')
if address_entry: if address_entry:
self.address_comboboxentry = self.xml.get_widget('address_comboboxentry') self.address_comboboxentry = self.xml.get_widget(
'address_comboboxentry')
self.address_comboboxentry_entry = self.address_comboboxentry.child self.address_comboboxentry_entry = self.address_comboboxentry.child
self.address_comboboxentry_entry.set_activates_default(True) self.address_comboboxentry_entry.set_activates_default(True)
liststore = gtk.ListStore(str) liststore = gtk.ListStore(str)
self.address_comboboxentry.set_model(liststore) self.address_comboboxentry.set_model(liststore)
self.address_comboboxentry.set_text_column(0) self.address_comboboxentry.set_text_column(0)
self.latest_addresses = gajim.config.get('latest_disco_addresses').split() self.latest_addresses = gajim.config.get(
'latest_disco_addresses').split()
jid = gajim.get_hostname_from_account(self.account, use_srv = True) jid = gajim.get_hostname_from_account(self.account, use_srv = True)
if jid in self.latest_addresses: if jid in self.latest_addresses:
self.latest_addresses.remove(jid) self.latest_addresses.remove(jid)
@ -1439,7 +1442,7 @@ class MucBrowser(AgentBrowser):
AgentBrowser._clean_treemodel(self) AgentBrowser._clean_treemodel(self)
def _add_actions(self): def _add_actions(self):
self.join_button = gtk.Button(label=_("_Join"), use_underline=True) self.join_button = gtk.Button(label=_('_Join'), use_underline=True)
self.join_button.connect('clicked', self.on_join_button_clicked) self.join_button.connect('clicked', self.on_join_button_clicked)
self.window.action_buttonbox.add(self.join_button) self.window.action_buttonbox.add(self.join_button)
self.join_button.show_all() self.join_button.show_all()

4
src/roster_window.py
View File

@ -567,7 +567,6 @@ class RosterWindow:
elif len(gajim.connections) == 0: # user has no accounts elif len(gajim.connections) == 0: # user has no accounts
advanced_menuitem.set_sensitive(False) advanced_menuitem.set_sensitive(False)
#FIXME: Gajim 0.9 should have this visible #FIXME: Gajim 0.9 should have this visible
profile_avatar_menuitem.set_no_show_all(True) profile_avatar_menuitem.set_no_show_all(True)
profile_avatar_menuitem.hide() profile_avatar_menuitem.hide()
@ -2185,7 +2184,8 @@ _('If "%s" accepts this request you will know his or her status.') %jid)
# Update opened chat windows # Update opened chat windows
for jid in gajim.interface.instances[account]['chats']: for jid in gajim.interface.instances[account]['chats']:
if jid != 'tabbed': if jid != 'tabbed':
gajim.interface.instances[account]['chats'][jid].set_state_image(jid) gajim.interface.instances[account]['chats'][jid].set_state_image(
jid)
# Update opened groupchat windows # Update opened groupchat windows
gcs = gajim.interface.instances[account]['gc'] gcs = gajim.interface.instances[account]['gc']
if gcs.has_key('tabbed'): if gcs.has_key('tabbed'):

3
src/systraywin32.py
View File

@ -296,7 +296,8 @@ class SystrayWin32(systray.Systray):
self.systray_winapi.notify_icon.set_tooltip(text) self.systray_winapi.notify_icon.set_tooltip(text)
def set_img(self): def set_img(self):
self.tray_ico_imgs = self.load_icos() self.tray_ico_imgs = self.load_icos() #FIXME: do not do this here
# see gajim.interface.roster.reload_jabber_state_images() to merge
self.systray_winapi.remove_notify_icon() self.systray_winapi.remove_notify_icon()
if len(self.jids) > 0: if len(self.jids) > 0:
state = 'message' state = 'message'