diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index c04687025..9b1809233 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -3653,204 +3653,6 @@ on the server.
True
-
-
- 200
- 200
- True
- 0
- 0.5
- GTK_SHADOW_ETCHED_IN
-
-
-
- True
- 3
- 2
- False
- 10
- 3
-
-
-
- 100
- True
- Outgoing Messages
- False
- False
- GTK_JUSTIFY_CENTER
- True
- False
- 0
- 0.5
- 0
- 0
-
-
- 0
- 1
- 1
- 2
- fill
-
-
-
-
-
-
- 100
- True
- Status Messages
- False
- False
- GTK_JUSTIFY_CENTER
- True
- False
- 0
- 0.5
- 0
- 0
-
-
- 0
- 1
- 2
- 3
- fill
-
-
-
-
-
-
- 100
- True
- Incoming Messages
- False
- False
- GTK_JUSTIFY_CENTER
- True
- False
- 0
- 0.5
- 0
- 0
-
-
- 0
- 1
- 0
- 1
- fill
-
-
-
-
-
-
- True
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
- 40
- 20
- True
-
-
-
-
- 1
- 2
- 1
- 2
- fill
-
-
-
-
-
-
- True
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
- 40
- 20
- True
-
-
-
-
- 1
- 2
- 2
- 3
- fill
-
-
-
-
-
-
- True
- True
- GTK_RELIEF_NORMAL
- True
-
-
-
-
- 40
- 20
- True
-
-
-
-
- 1
- 2
- 0
- 1
- fill
-
-
-
-
-
-
-
-
- True
- Color
- False
- False
- GTK_JUSTIFY_LEFT
- False
- False
- 0.5
- 0.5
- 0
- 0
-
-
- label_item
-
-
-
-
- 0
- 0
-
-
-
144
@@ -3981,6 +3783,177 @@ on the server.
0
+
+
+
+ 200
+ 200
+ True
+ 0
+ 0.5
+ GTK_SHADOW_ETCHED_IN
+
+
+
+ True
+ 3
+ 2
+ False
+ 10
+ 3
+
+
+
+ 100
+ True
+ Outgoing Messages
+ False
+ False
+ GTK_JUSTIFY_CENTER
+ True
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+
+ 0
+ 1
+ 1
+ 2
+ fill
+
+
+
+
+
+
+ 100
+ True
+ Status Messages
+ False
+ False
+ GTK_JUSTIFY_CENTER
+ True
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+
+ 0
+ 1
+ 2
+ 3
+ fill
+
+
+
+
+
+
+ 100
+ True
+ Incoming Messages
+ False
+ False
+ GTK_JUSTIFY_CENTER
+ True
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+
+ 0
+ 1
+ 0
+ 1
+ fill
+
+
+
+
+
+
+ True
+ True
+ False
+ True
+
+
+ 1
+ 2
+ 0
+ 1
+ fill
+
+
+
+
+
+
+ True
+ True
+ False
+ True
+
+
+ 1
+ 2
+ 1
+ 2
+ fill
+
+
+
+
+
+
+ True
+ True
+ False
+ True
+
+
+ 1
+ 2
+ 2
+ 3
+ fill
+
+
+
+
+
+
+
+
+ True
+ Color
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+ label_item
+
+
+
+
+ 0
+ 0
+
+
False
diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py
index 56637bd94..74473ff51 100644
--- a/plugins/gtkgui/gtkgui.py
+++ b/plugins/gtkgui/gtkgui.py
@@ -2343,8 +2343,6 @@ class plugin:
def __init__(self, quIN, quOUT):
gtk.gdk.threads_init()
- #in pygtk2.4
- #gtk.window_set_default_icon(??pixbuf??)
# gtk.gdk.threads_enter()
self.queueIN = quIN
self.queueOUT = quOUT
@@ -2384,6 +2382,17 @@ class plugin:
#2:autoaway and use sleeper
#3:autoxa and use sleeper
self.send('ASK_ROSTER', a, self.queueIN)
+ #in pygtk2.4
+ iconstyle = self.config['iconstyle']
+ if not iconstyle:
+ iconstyle = 'sun'
+ path = 'plugins/gtkgui/icons/' + iconstyle + '/'
+ files = [path + 'online.gif', path + 'online.png', path + 'online.xpm']
+ for file in files:
+ if os.path.exists(file):
+ pix = gtk.gdk.pixbuf_new_from_file(file)
+ break
+ gtk.window_set_default_icon(pix)
self.roster = roster_Window(self)
gtk.timeout_add(100, self.read_queue)
gtk.timeout_add(1000, self.read_sleepy)