diff --git a/common/thread.py b/common/thread.py
index fc91ffff8ed53d903879f5c41769aa4f2beedd53..1bc680e5410811751549f329754c8b9b29a73402 100644
--- a/common/thread.py
+++ b/common/thread.py
@@ -27,13 +27,14 @@ class GajimThread(threading.Thread):
def __init__(self, name = None, queueIn = None, queueOut = None):
self.queueIn = queueIn
self.queueOut = queueOut
- threading.Thread.__init__(self, target = self.run, name = name)
+ threading.Thread.__init__(self, target = self.run, name = name)
# END __init__
def run(self):
- mod = compile("import plugins.%s" % self.getName(), self.getName(), "exec")
+ mod = compile('import plugins.%s' % self.getName(), self.getName(), 'exec')
res = eval(mod)
- mod = compile("plugins.%s.%s.plugin(self.queueIn, self.queueOut)" % (self.getName(), self.getName()), self.getName(), "exec")
+ mod = compile('plugins.%s.%s.plugin(self.queueIn, self.queueOut)'
+ % (self.getName(), self.getName()), self.getName(), 'exec')
res = eval(mod)
# END run
# END GajimThread
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index 85df53e0cca8ae94411a6008b5b64fff07c9fd3c..a39be112de99c4d7d2f49594833ee4b441fa1b88 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -666,7 +666,7 @@
</child>
</widget>
-<widget class="GtkWindow" id="accounts_window">
+<widget class="GtkWindow" id="configure_accounts_window">
<property name="visible">True</property>
<property name="title" translatable="yes">Accounts</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -680,7 +680,7 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- <signal name="destroy" handler="on_accounts_window_destroy" last_modification_time="Tue, 01 Mar 2005 18:13:20 GMT"/>
+ <signal name="destroy" handler="on_configure_accounts_window_destroy" last_modification_time="Wed, 02 Mar 2005 12:06:09 GMT"/>
<child>
<widget class="GtkVBox" id="vbox5">
@@ -1159,27 +1159,6 @@ Nikos Kouremenos (nkour@jabber.org)</property>
</packing>
</child>
- <child>
- <widget class="GtkEntry" id="password_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">False</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">False</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
<child>
<widget class="GtkEntry" id="jid_entry">
<property name="visible">True</property>
@@ -1271,17 +1250,73 @@ Nikos Kouremenos (nkour@jabber.org)</property>
</child>
<child>
- <widget class="GtkCheckButton" id="save_password_checkbutton">
+ <widget class="GtkHBox" id="hbox2920">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Save password</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_save_password_checkbutton_toggled" last_modification_time="Mon, 28 Feb 2005 20:25:48 GMT"/>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkEntry" id="password_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">False</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCheckButton" id="save_password_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Save password</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_save_password_checkbutton_toggled" last_modification_time="Mon, 28 Feb 2005 20:25:48 GMT"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label202">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Password:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -7810,7 +7845,7 @@ Custom</property>
<widget class="GtkCheckButton" id="save_passphrase_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Save password ?</property>
+ <property name="label" translatable="yes">Save passphrase</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>