Changeset 7787 for branches/gajim_0.11/src/dialogs.py

Timestamp:

01/06/07 12:00:50 (23 months ago)

Author:

asterix

Message:

merge changeset from trunk except pyopenssl stuff

Files:

• branches/gajim_0.11/src/dialogs.py (modified) (4 diffs)

branches/gajim_0.11/src/dialogs.py

@@ -640 +640 @@
                         message= ''
                 group = self.group_comboboxentry.child.get_text().decode('utf-8')
+                groups = []
+                if group:
+                        groups = [group]
                 auto_auth = self.auto_authorize_checkbutton.get_active()
                 gajim.interface.roster.req_sub(self, jid, message, self.account,
-                        groups = [group], nickname = nickname, auto_auth = auto_auth)
+                        groups = groups, nickname = nickname, auto_auth = auto_auth)
                 self.window.destroy()
 
@@ -906 +909 @@
                 ErrorDialog(_('Unable to bind to port %s.') % port,
                         _('Maybe you have another running instance of Gajim. '
-                        'File Transfer will be canceled.'))
+                        'File Transfer will be cancelled.'))
 
 class ConfirmationDialog(HigDialog):
@@ -920 +923 @@
         '''HIG compliant non modal confirmation dialog.'''
         def __init__(self, pritext, sectext='', on_response_ok = None,
-                        on_response_cancel = None):
+        on_response_cancel = None):
                 HigDialog.__init__(self, None, 
                         gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, pritext, sectext,
@@ -1233 +1236 @@
                 gajim.config.set('recently_groupchat',
                         ' '.join(self.recently_groupchat))
+
+                if self.xml.get_widget('auto_join_checkbutton').get_active():
+                        # create the bookmark-dict
+                        # is it already bookmarked ?
+                        room_jid_bookmarked = False
+                        for bmdict in gajim.connections[self.account].bookmarks:
+                                if bmdict['jid'] == room_jid:
+                                        room_jid_bookmarked = True
+                                        break
+                        if not room_jid_bookmarked:
+                                name = gajim.get_nick_from_jid(room_jid)
+                                bmdict = { 'name': name, 'jid': room_jid, 'autojoin': u'1',
+                                        'password': password, 'nick': nickname,
+                                        'print_status': gajim.config.get('print_status_in_muc')}
+
+                                gajim.connections[self.account].bookmarks.append(bmdict)
+                                gajim.connections[self.account].store_bookmarks()
 
                 if self.automatic: