Ticket #1823: gajim.fix1823.diff

src/roster_window.py

@@ -1419 +1419 @@
         contact = None):
                 if contact is None:
                         dialogs.SingleMessageWindow(account, action = 'send')
+                elif type(contact) == type([]):
+                        dialogs.SingleMessageWindow(account, contact, 'send')
                 else:
                         jid = contact.jid
                         if contact.jid == gajim.get_jid_from_account(account):
@@ -1850 +1852 @@
                 edit_groups_item = gtk.MenuItem(_('Edit _Groups'))
                 menu.append(edit_groups_item)
                 edit_groups_item.connect('activate', self.on_edit_groups, list_)
+                
+                account = None
+                for (contact, current_account) in list_:
+                        # check that we use the same account for every sender
+                        if account is not None and account != current_account:
+                                account = None
+                                break
+                        account = current_account
+                if account is not None:
+                        send_group_message_item = gtk.MenuItem(_('Send Group M_essage'))
+                        menu.append(send_group_message_item)
+                        send_group_message_item.connect('activate',
+                                self.on_send_single_message_menuitem_activate, account, list_)
 
                 # unsensitive if one account is not connected
                 if one_account_offline:

src/dialogs.py

@@ -1463 +1463 @@
                 self.cancel_button = self.xml.get_widget('cancel_button')
                 self.close_button = self.xml.get_widget('close_button')
                 self.message_tv_buffer.connect('changed', self.update_char_counter)
+                if type(to) == type([]):
+                        jid = ', '.join( [i[0].jid + '/' + i[0].resource for i in to])
+                        self.to_entry.set_text(jid)
+                        self.to_entry.set_sensitive(False)
+                else:
+                        self.to_entry.set_text(to)
                 
-                self.to_entry.set_text(to)
-                
                 if gajim.config.get('use_speller') and HAS_GTK_SPELL and action == 'send':
                         try:
                                 spell1 = gtkspell.Spell(self.conversation_textview.tv)
@@ -1497 +1501 @@
                         self.subject = ''
                 self.subject_entry.set_text(self.subject)
 
-
                 if to == '':
                         liststore = gtkgui_helpers.get_completion_liststore(self.to_entry)
                         self.completion_dict = helpers.get_contact_dict_for_account(account)
@@ -1616 +1619 @@
                         ErrorDialog(_('Connection not available'),
                 _('Please make sure you are connected with "%s".') % self.account)
                         return
-                to_whom_jid = self.to_entry.get_text().decode('utf-8')
-                if self.completion_dict.has_key(to_whom_jid):
-                        to_whom_jid = self.completion_dict[to_whom_jid].jid
-                subject = self.subject_entry.get_text().decode('utf-8')
-                begin, end = self.message_tv_buffer.get_bounds()
-                message = self.message_tv_buffer.get_text(begin, end).decode('utf-8')
+                if type(self.to) == type([]):
+                        sender_list = [i[0].jid + '/' + i[0].resource for i in self.to]
+                else:
+                        sender_list = [self.to_entry.get_text().decode('utf-8')]
+ 
+                for to_whom_jid in sender_list:
+                        if self.completion_dict.has_key(to_whom_jid):
+                                to_whom_jid = self.completion_dict[to_whom_jid].jid
+                        subject = self.subject_entry.get_text().decode('utf-8')
+                        begin, end = self.message_tv_buffer.get_bounds()
+                        message = self.message_tv_buffer.get_text(begin, end).decode('utf-8')
 
-                if to_whom_jid.find('/announce/') != -1:
-                        gajim.connections[self.account].send_motd(to_whom_jid, subject,
-                                message)
-                        return
+                        if to_whom_jid.find('/announce/') != -1:
+                                gajim.connections[self.account].send_motd(to_whom_jid, subject,
+                                        message)
+                                return
 
-                # FIXME: allow GPG message some day
-                gajim.connections[self.account].send_message(to_whom_jid, message,
-                        keyID = None, type = 'normal', subject=subject)
-                
+                        # FIXME: allow GPG message some day
+                        gajim.connections[self.account].send_message(to_whom_jid, message,
+                                keyID = None, type = 'normal', subject=subject)
+                        
                 self.subject_entry.set_text('') # we sent ok, clear the subject
                 self.message_tv_buffer.set_text('') # we sent ok, clear the textview