Changeset 8552

Timestamp:

08/22/07 19:20:44 (16 months ago)

Author:

steve-e

Message:

Transform Chat2MUC via DND. Fixes #1408. See #2095

Location:

trunk/src

Files:

• chat_control.py (modified) (2 diffs)
• dialogs.py (modified) (3 diffs)

trunk/src/chat_control.py

@@ -1774 +1774 @@
         def _on_drag_data_received(self, widget, context, x, y, selection,
                 target_type, timestamp):
-                # If no resource is known, we can't send a file
+                if not selection.data:
+                        return
                 if self.TYPE_ID == message_control.TYPE_PM:
                         c = self.gc_contact
                 else:
                         c = self.contact
-                if not c.resource:
-                        return
                 if target_type == self.TARGET_TYPE_URI_LIST:
-                        if not selection.data:
+                        if not c.resource: # If no resource is known, we can't send a file
                                 return
                         uri = selection.data.strip()
@@ -1791 +1790 @@
                                         ft = gajim.interface.instances['file_transfers']
                                         ft.send_file(self.account, c, path)
+                        return
+
+                # chat2muc
+                treeview = gajim.interface.roster.tree
+                model = treeview.get_model()
+                data = selection.data
+                path = treeview.get_selection().get_selected_rows()[1][0]
+                iter = model.get_iter(path)
+                type = model[iter][2]
+                account = model[iter][4].decode('utf-8')
+                if type != 'contact': # source is not a contact
+                        return
+                dropped_jid = data.decode('utf-8')
+
+                dropped_transport = gajim.get_transport_name_from_jid(dropped_jid)
+                c_transport = gajim.get_transport_name_from_jid(c.jid)
+                if dropped_transport or c_transport:
+                        return # transport contacts cannot be invited
+
+                dialogs.TransformChatToMUC(self.account, [c.jid], [dropped_jid])
 
         def _on_message_tv_buffer_changed(self, textbuffer):

trunk/src/dialogs.py

@@ -3200 +3200 @@
 
 class TransformChatToMUC:
-        def __init__(self, account, jids):
+        def __init__(self, account, jids, preselected = None):
                 '''This window is used to trasform a one-to-one chat to a MUC.
                 We do 2 things: first select the server and then make a guests list.'''
@@ -3206 +3206 @@
                 self.account = account
                 self.auto_jids = jids
+                self.preselected_jids = preselected
 
                 self.xml = gtkgui_helpers.get_glade('chat_to_muc_window.glade')
@@ -3272 +3273 @@
                                                 if name == '':
                                                         name = jid.split('@')[0]
-                                                self.store.append([img.get_pixbuf(), name, jid])
+                                                iter = self.store.append([img.get_pixbuf(), name, jid])
+                                                # preselect treeview rows
+                                                if self.preselected_jids and jid in self.preselected_jids:
+                                                        path = self.store.get_path(iter)
+                                                        self.guests_treeview.get_selection().\
+                                                                select_path(path)
 
                 # show all