diff --git a/src/groupchat_window.py b/src/groupchat_window.py
index e5529727d..053de2bfa 100644
--- a/src/groupchat_window.py
+++ b/src/groupchat_window.py
@@ -647,8 +647,7 @@ class GroupchatWindow(chat.Chat):
# set the fg colour of the label to white
self.name_labels[room_jid].modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse('white'))
- xm = gtk.glade.XML(GTKGUI_GLADE, 'gc_banner_eventbox', APP)
- gc_banner_eventbox = xm.get_widget('gc_banner_eventbox')
+ gc_banner_eventbox = self.xmls[room_jid].get_widget('gc_banner_eventbox')
# get the background color from the current theme
bgcolor = gajim.config.get('accountbgcolor')
gc_banner_eventbox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(bgcolor))
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index 889a5b559..cc01f6f6d 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -8167,16 +8167,16 @@ Custom
-
+
True
- True
- False
+ False
+ 0
-
+
True
- False
- 0
+ True
+ False
@@ -8193,152 +8193,237 @@ This is the subject.
0
6
-
- 3
- False
- True
-
+
+
+ 3
+ False
+ True
+
+
+
+
+
+ True
+ True
+ 495
-
+
+ 150
True
- True
- 495
+ False
+ 6
-
- 150
+
True
- False
- 6
+ True
-
+
+ 200
True
True
+ GTK_POLICY_AUTOMATIC
+ GTK_POLICY_AUTOMATIC
+ GTK_SHADOW_IN
+ GTK_CORNER_TOP_LEFT
-
- 200
+
+ 3
True
True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- 3
- True
- True
- False
- False
- True
- GTK_JUSTIFY_LEFT
- GTK_WRAP_WORD
- False
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
-
+ False
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ GTK_WRAP_WORD
+ False
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+
+
-
- False
- True
-
-
-
-
-
- 45
- True
- True
- GTK_POLICY_AUTOMATIC
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- 3
- True
- True
- True
- False
- True
- GTK_JUSTIFY_LEFT
- GTK_WRAP_WORD
- True
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- False
- False
-
- 0
- True
- True
+ False
+ True
+
+
+
+
+
+ 45
+ True
+ True
+ GTK_POLICY_AUTOMATIC
+ GTK_POLICY_AUTOMATIC
+ GTK_SHADOW_IN
+ GTK_CORNER_TOP_LEFT
+
+
+
+ 3
+ True
+ True
+ True
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ GTK_WRAP_WORD
+ True
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+
+
+
+ False
+ False
- False
- False
+ 0
+ True
+ True
+
+
+
+
+ False
+ False
+
+
+
+
+
+ 100
+ True
+ GTK_POLICY_NEVER
+ GTK_POLICY_AUTOMATIC
+ GTK_SHADOW_IN
+ GTK_CORNER_TOP_LEFT
+
+
+
+ 3
+ True
+ True
+ False
+ False
+ False
+ True
+
+
+
+
+
+
+
+
+
+ False
+ False
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+
+ 2
+ True
+ False
+ 0
+
+
+
+ True
+ GTK_ORIENTATION_HORIZONTAL
+ GTK_TOOLBAR_ICONS
+ True
+ True
+
+
+
+ True
+ True
+ True
+ True
+
+
+ False
+ False
-
- 100
+
True
- GTK_POLICY_NEVER
- GTK_POLICY_AUTOMATIC
- GTK_SHADOW_IN
- GTK_CORNER_TOP_LEFT
-
-
-
- 3
- True
- True
- False
- False
- False
- True
-
-
-
-
-
-
-
+ Bold
+ gtk-bold
+ True
+ True
+ False
+ False
- False
- False
+ False
+ True
+
+
+
+
+
+ True
+ Italics
+ gtk-italic
+ True
+ True
+ False
+ False
+
+
+ False
+ True
+
+
+
+
+
+ True
+ Underline
+ gtk-underline
+ True
+ True
+ False
+ False
+
+
+ False
+ True
@@ -8350,333 +8435,243 @@ This is the subject.
-
- 2
+
True
False
- 0
+ 2
-
+
True
- GTK_ORIENTATION_HORIZONTAL
- GTK_TOOLBAR_ICONS
- True
- True
+ True
+ GTK_RELIEF_NORMAL
+ True
-
+
True
- True
- True
- True
-
-
- False
- False
-
-
-
-
-
- True
- Bold
- gtk-bold
- True
- True
- False
- False
-
-
- False
- True
-
-
-
-
-
- True
- Italics
- gtk-italic
- True
- True
- False
- False
-
-
- False
- True
-
-
-
-
-
- True
- Underline
- gtk-underline
- True
- True
- False
- False
-
-
- False
- True
-
-
-
-
- 0
- True
- True
-
-
-
-
-
- True
- False
- 2
-
-
-
- True
- True
- GTK_RELIEF_NORMAL
- True
+ 0.5
+ 0.5
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
-
+
True
- 0.5
- 0.5
- 0
- 0
- 0
- 0
- 0
- 0
+ False
+ 2
-
+
True
- False
- 2
-
-
-
- True
- gtk-preferences
- 4
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- _Actions
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
+ gtk-preferences
+ 4
+ 0.5
+ 0.5
+ 0
+ 0
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ _Actions
+ True
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
-
- 0
- False
- False
-
-
-
-
-
- True
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
- True
- 0.5
- 0.5
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- True
- False
- 2
-
-
-
- True
- gtk-justify-fill
- 4
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- _History
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
-
-
-
- 0
- False
- False
-
-
-
-
-
- True
-
-
- 2
- False
- True
-
-
-
-
-
- True
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
- True
- 0.5
- 0.5
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- True
- False
- 2
-
-
-
- True
- gtk-jump-to
- 4
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
- True
- _Send
- True
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
-
-
- 0
- False
- False
-
-
-
-
-
-
-
-
- 0
- False
- False
-
0
False
+ False
+
+
+
+
+
+ True
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+
+ True
+ 0.5
+ 0.5
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+ True
+ False
+ 2
+
+
+
+ True
+ gtk-justify-fill
+ 4
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ _History
+ True
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+
+
+ 2
+ False
True
+
+
+
+ True
+ True
+ GTK_RELIEF_NORMAL
+ True
+
+
+
+ True
+ 0.5
+ 0.5
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+
+
+
+ True
+ False
+ 2
+
+
+
+ True
+ gtk-jump-to
+ 4
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+ True
+ _Send
+ True
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ 0
+ False
+ False
+
+
+
+
+
+
+
+
+ 0
+ False
+ False
+
+
0
@@ -8685,6 +8680,11 @@ This is the subject.
+
+ 0
+ False
+ True
+