From 351e666f9747bab004fac12ee29dd85b3d140f81 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Wed, 20 Sep 2006 10:37:24 +0000
Subject: [PATCH] show MUC icon in actions -> join_gc menuitem. Fixes #2430
---
data/glade/roster_window.glade | 4 ++++
src/roster_window.py | 7 +++++++
2 files changed, 11 insertions(+)
diff --git a/data/glade/roster_window.glade b/data/glade/roster_window.glade
index fb37f4a297..d1c9cf1941 100644
--- a/data/glade/roster_window.glade
+++ b/data/glade/roster_window.glade
@@ -21,6 +21,7 @@
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<signal name="delete_event" handler="on_roster_window_delete_event" last_modification_time="Mon, 21 Mar 2005 12:34:59 GMT"/>
<signal name="focus_in_event" handler="on_roster_window_focus_in_event" last_modification_time="Sun, 04 Sep 2005 16:33:35 GMT"/>
<signal name="key_press_event" handler="on_roster_window_key_press_event" last_modification_time="Tue, 20 Sep 2005 19:26:27 GMT"/>
@@ -35,6 +36,8 @@
<child>
<widget class="GtkMenuBar" id="menubar">
<property name="visible">True</property>
+ <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+ <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
<child>
<widget class="GtkMenuItem" id="actions_menu">
@@ -406,4 +409,5 @@
</widget>
</child>
</widget>
+
</glade-interface>
diff --git a/src/roster_window.py b/src/roster_window.py
index 96dc6bc494..d6cedec11d 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -717,6 +717,13 @@ class RosterWindow:
return
new_chat_menuitem = self.xml.get_widget('new_chat_menuitem')
join_gc_menuitem = self.xml.get_widget('join_gc_menuitem')
+ iconset = gajim.config.get('iconset')
+ if not iconset:
+ iconset = DEFAULT_ICONSET
+ path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
+ state_images = self.load_iconset(path)
+ if state_images.has_key('muc_active'):
+ join_gc_menuitem.set_image(state_images['muc_active'])
add_new_contact_menuitem = self.xml.get_widget('add_new_contact_menuitem')
service_disco_menuitem = self.xml.get_widget('service_disco_menuitem')
advanced_menuitem = self.xml.get_widget('advanced_menuitem')
--
GitLab