Changeset 88

Timestamp:

08/22/07 00:31:33 (3 years ago)

Author:

asterix

Message:

get muc server list from our server and recently joined groupchats

Files:

• gajim/branches/chat2muc/src/dialogs.py (modified) (8 diffs)

gajim/branches/chat2muc/src/dialogs.py

@@ -403 +403 @@
                 self.countdown_enabled = False
                 if event.keyval == gtk.keysyms.Return or \
-                event.keyval == gtk.keysyms.KP_Enter:  # catch CTRL+ENTER
+                event.keyval == gtk.keysyms.KP_Enter: # catch CTRL+ENTER
                         if (event.state & gtk.gdk.CONTROL_MASK):
                                 self.window.response(gtk.RESPONSE_OK)
@@ -1506 +1506 @@
                 for jid in keys:
                         contact = self.completion_dict[jid]
-                        img =  gajim.interface.roster.jabber_state_images['16'][contact.show]
+                        img = gajim.interface.roster.jabber_state_images['16'][contact.show]
                         liststore.append((img.get_pixbuf(), jid))
 
@@ -2101 +2101 @@
                 jid_entry_completion.set_model(jids_list_store)
                 jid_entry_completion.set_popup_completion(True)
-                self.edit_type_jabberid_entry.set_completion(jid_entry_completion)                      
+                self.edit_type_jabberid_entry.set_completion(jid_entry_completion)
 
                 if action == 'EDIT':
@@ -3282 +3282 @@
 
                 for widget_to_add in ('invite_button', 'cancel_button',
-                        'server_list_comboboxentry', 'guests_treeview',
-                        'server_and_guests_hseparator', 'server_select_label'):
+                'server_list_comboboxentry', 'guests_treeview',
+                'server_and_guests_hseparator', 'server_select_label'):
                         self.__dict__[widget_to_add] = self.xml.get_widget(widget_to_add)
-                        self.__dict__[widget_to_add].connect('key_press_event',
-                                self._on_keypress_event)
+                self.window.connect('key_press_event', self._on_keypress_event)
 
                 # set a list of servers which support it
@@ -3294 +3293 @@
                 renderer_servers = gtk.CellRendererText()
 
+                server_list = []
                 self.servers = gtk.ListStore(str)
                 self.server_list_comboboxentry.set_model(self.servers)
@@ -3299 +3299 @@
                 self.server_list_comboboxentry.set_text_column(0)
 
-                # TODO: make a list based on service discovery
-                self.servers.append(['chat.jabberfr.org'])
-                self.servers.append(['conference.gajim.org'])
+                # get the muc server of our server
+                if 'jabber' in gajim.connections[account].muc_jid:
+                        server_list.append(gajim.connections[account].muc_jid['jabber'])
+                # add servers or recently joined groupchats
+                recently_groupchat = gajim.config.get('recently_groupchat').split()
+                for g in recently_groupchat:
+                        server = gajim.get_server_from_jid(g)
+                        if server not in server_list:
+                                server_list.append(gajim.get_server_from_jid(g))
+                # add a default server
+                if not server_list:
+                        server_list.append('conference.jabber.org')
+
+                for s in server_list:
+                        self.servers.append([s])
 
                 self.server_list_comboboxentry.set_active(0)
 
                 # set treeview
-
+                # name, jid
                 self.store = gtk.ListStore(str, str)
                 self.guests_treeview.set_model(self.store)
@@ -3352 +3364 @@
                 or event.keyval == gtk.keysyms.C):
                                 self.toggle_server_selection_visible()
+                                return True
 
         def on_invite_button_clicked(self, widget):
@@ -3373 +3386 @@
                 for guest in self.auto_jids:
                         guest_list.append(guest)
-                room_jid =  room_id + '@' + server
+                room_jid = room_id + '@' + server
                 gajim.automatic_rooms[self.account][room_jid] = {}
                 gajim.automatic_rooms[self.account][room_jid]['invities'] = guest_list