Changeset 8698 for branches/gajim_0.11.1/src/dialogs.py

Timestamp:

09/03/07 11:04:21 (15 months ago)

Author:

asterix

Message:

automaticaly fill password entry in groupchat invitation dialog if we get it. fixes #3271

Files:

• branches/gajim_0.11.1/src/dialogs.py (modified) (5 diffs)

branches/gajim_0.11.1/src/dialogs.py

@@ -1128 +1128 @@
 
 class JoinGroupchatWindow:
-        def __init__(self, account, room_jid = '', nick = '', automatic = False):
+        def __init__(self, account, room_jid = '', nick = '', password = '',
+        automatic = False):
                 '''automatic is a dict like {'invities': []}
                 If automatic is not empty, this means room must be automaticaly configured
@@ -1152 +1153 @@
                 self._room_jid_entry = self.xml.get_widget('room_jid_entry')
                 self._nickname_entry = self.xml.get_widget('nickname_entry')
+                self._password_entry = self.xml.get_widget('password_entry')
 
                 self._room_jid_entry.set_text(room_jid)
                 self._nickname_entry.set_text(nick)
+                if password:
+                        self._password_entry.set_text(password)
                 self.xml.signal_autoconnect(self)
                 gajim.interface.instances[account]['join_gc'] = self #now add us to open windows
@@ -1222 +1226 @@
                 nickname = self._nickname_entry.get_text().decode('utf-8')
                 room_jid = self._room_jid_entry.get_text().decode('utf-8')
-                password = self.xml.get_widget('password_entry').get_text().decode(
-                        'utf-8')
+                password = self._password_entry.get_text().decode('utf-8')
                 user, server, resource = helpers.decompose_jid(room_jid)
                 if not user or not server or resource:
@@ -2251 +2254 @@
                 self.room_jid = room_jid
                 self.account = account
+                self.password = password
                 xml = gtkgui_helpers.get_glade('invitation_received_dialog.glade')
                 self.dialog = xml.get_widget('invitation_received_dialog')
@@ -2284 +2288 @@
                 self.dialog.destroy()
                 try:
-                        JoinGroupchatWindow(self.account, self.room_jid)
+                        JoinGroupchatWindow(self.account, self.room_jid,
+                                password=self.password)
                 except GajimGeneralException:
                         pass