gajim: coding style

[Fomin Denis]

changeset 461f0acc251d in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=461f0acc251d
description: coding style

diffstat:

 src/roster_window.py |  31 +++
 1 files changed, 15 insertions(+), 16 deletions(-)

diffs (41 lines):

diff -r 7124ab1bab7c -r 461f0acc251d src/roster_window.py
--- a/src/roster_window.py  Sat Jan 07 15:41:53 2012 +0100
+++ b/src/roster_window.py  Mon Jan 09 14:57:21 2012 +0400
@@ -4765,22 +4765,21 @@
 
 Initialize opened and closed 'transport' iconset dict
 
-if gajim.config.get('use_transports_iconsets'):
-folder = os.path.join(helpers.get_transport_path(transport),
-'16x16')
-pixo, pixc = gtkgui_helpers.load_icons_meta()
-self.transports_state_images['opened'][transport] = \
-gtkgui_helpers.load_iconset(folder, pixo, transport=True)
-self.transports_state_images['closed'][transport] = \
-gtkgui_helpers.load_iconset(folder, pixc, transport=True)
-folder = os.path.join(helpers.get_transport_path(transport),
-'32x32')
-self.transports_state_images['32'][transport] = \
-gtkgui_helpers.load_iconset(folder, transport=True)
-folder = os.path.join(helpers.get_transport_path(transport),
-'16x16')
-self.transports_state_images['16'][transport] = \
-gtkgui_helpers.load_iconset(folder, transport=True)
+if not gajim.config.get('use_transports_iconsets'):
+return
+
+folder = os.path.join(helpers.get_transport_path(transport), '32x32')
+self.transports_state_images['32'][transport] = \
+gtkgui_helpers.load_iconset(folder, transport=True)
+folder = os.path.join(helpers.get_transport_path(transport), '16x16')
+self.transports_state_images['16'][transport] = \
+gtkgui_helpers.load_iconset(folder, transport=True)
+
+pixo, pixc = gtkgui_helpers.load_icons_meta()
+self.transports_state_images['opened'][transport] = \
+gtkgui_helpers.load_iconset(folder, pixo, transport=True)
+self.transports_state_images['closed'][transport] = \
+gtkgui_helpers.load_iconset(folder, pixc, transport=True)
 
 def update_jabber_state_images(self):
 # Update the roster
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits

gajim: fix OOB registration. Fixes #6957

[Yann Leboulanger]

changeset 68d0e4b51d39 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=68d0e4b51d39
description: fix OOB registration. Fixes #6957

diffstat:

 src/config.py |  11 ++-
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r 461f0acc251d -r 68d0e4b51d39 src/config.py
--- a/src/config.py Mon Jan 09 14:57:21 2012 +0400
+++ b/src/config.py Mon Jan 09 17:40:02 2012 +0100
@@ -3803,23 +3803,24 @@
 self.back_button.show()
 self.forward_button.show()
 self.is_form = obj.is_form
+empty_config = True
 if obj.is_form:
 dataform = dataforms.ExtendForm(node=obj.config)
 self.data_form_widget = dataforms_widget.DataFormWidget(dataform)
+empty_config = False
 else:
 self.data_form_widget = FakeDataForm(obj.config)
-empty_config = True
 for field in obj.config:
 if field in ('key', 'instructions', 'x', 'registered'):
 continue
 empty_config = False
 break
-if empty_config:
-self.forward_button.set_sensitive(False)
-self.notebook.set_current_page(4) # show form page
-return
 self.data_form_widget.show_all()
 self.xml.get_object('form_vbox').pack_start(self.data_form_widget)
+if empty_config:
+self.forward_button.set_sensitive(False)
+self.notebook.set_current_page(4) # show form page
+return
 self.ssl_fingerprint = obj.ssl_fingerprint
 self.ssl_cert = obj.ssl_cert
 if obj.ssl_msg:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits