Changeset 9832

Timestamp:

06/23/08 18:21:21 (5 months ago)

Author:

asterix

Message:

ability to ignore a transport contact. see #3984

Location:

trunk

Files:

• data/glade/roster_contact_context_menu.glade (modified) (2 diffs)
• src/roster_window.py (modified) (2 diffs)

trunk/data/glade/roster_contact_context_menu.glade

@@ -243 +243 @@
                 <property name="label" translatable="yes">_Unblock</property>
                 <property name="use_underline">True</property>
-                <signal name="activate" handler="on_unblock_menuitem_activate"/>
                 <child internal-child="image">
                   <widget class="GtkImage" id="image1715">
@@ -258 +257 @@
                 <property name="label" translatable="yes">_Block</property>
                 <property name="use_underline">True</property>
-                <signal name="activate" handler="on_block_menuitem_activate"/>
                 <child internal-child="image">
                   <widget class="GtkImage" id="image1714">
+                    <property name="visible">True</property>
+                    <property name="stock">gtk-stop</property>
+                    <property name="icon_size">1</property>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkImageMenuItem" id="unignore_menuitem">
+                <property name="no_show_all">True</property>
+                <property name="label" translatable="yes">_Unignore</property>
+                <property name="use_underline">True</property>
+                <child internal-child="image">
+                  <widget class="GtkImage" id="menu-item-image22">
+                    <property name="visible">True</property>
+                    <property name="stock">gtk-stop</property>
+                    <property name="icon_size">1</property>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkImageMenuItem" id="ignore_menuitem">
+                <property name="no_show_all">True</property>
+                <property name="label" translatable="yes">_Ignore</property>
+                <property name="use_underline">True</property>
+                <child internal-child="image">
+                  <widget class="GtkImage" id="menu-item-image23">
                     <property name="visible">True</property>
                     <property name="stock">gtk-stop</property>

trunk/src/roster_window.py

@@ -4966 +4966 @@
                 block_menuitem = xml.get_widget('block_menuitem')
                 unblock_menuitem = xml.get_widget('unblock_menuitem')
+                ignore_menuitem = xml.get_widget('ignore_menuitem')
+                unignore_menuitem = xml.get_widget('unignore_menuitem')
                 rename_menuitem = xml.get_widget('rename_menuitem')
                 edit_groups_menuitem = xml.get_widget('edit_groups_menuitem')
@@ -5142 +5144 @@
                                 block_menuitem.set_no_show_all(True)
                                 block_menuitem.hide()
-                                unblock_menuitem.connect('activate', self.on_unblock, titer, None)
+                                if gajim.get_transport_name_from_jid(jid, use_config_setting=False):
+                                        unblock_menuitem.set_no_show_all(True)
+                                        unblock_menuitem.hide()
+                                        unignore_menuitem.set_no_show_all(False)
+                                        unignore_menuitem.connect('activate', self.on_unblock, titer,
+                                                None)
+                                else:
+                                        unblock_menuitem.connect('activate', self.on_unblock, titer,
+                                                None)
                         else:
                                 unblock_menuitem.set_no_show_all(True)
                                 unblock_menuitem.hide()
                                 if gajim.get_transport_name_from_jid(jid, use_config_setting=False):
-                                        block_menuitem.set_sensitive(False)
+                                        block_menuitem.set_no_show_all(True)
+                                        block_menuitem.hide()
+                                        ignore_menuitem.set_no_show_all(False)
+                                        ignore_menuitem.connect('activate', self.on_block, titer, None)
                                 else:
                                         block_menuitem.connect('activate', self.on_block, titer, None)