*fix* issue 316

diff --git a/src/config.c b/src/config.c
index ae6fe31ecd3947c1fe145653732fa77f139cd9a6..2224a1d3e30449e34becb982835c50ec1be15eb5 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -257,7 +257,7 @@ void add_entry (char *key, char *value)
                                if (snapshot_path == 0)
                                        systray_enabled = 1;
                        }
-                       if (panel_items_order[j] == 'C')                        
+                       if (panel_items_order[j] == 'C')
                                clock_enabled = 1;
                }
        }

diff --git a/src/panel.c b/src/panel.c
index b99ffa56e576cb078c9cbfd440646615f8addc5e..cea2923ff834ab8e8b4f3619156ff7672d98364e 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -182,8 +182,9 @@ void init_panel()
                        if (panel_items_order[k] == 'B')
                                init_battery_panel(p);
 #endif
-                       if (panel_items_order[k] == 'S') {
+                       if (panel_items_order[k] == 'S' && i==0) {
                                // TODO : check systray is only on 1 panel
+                               // at the moment only on panel1[0] allowed
                                init_systray_panel(p);
                                refresh_systray = 1;
                        }
@@ -397,8 +398,9 @@ void set_panel_items_order(Panel *p)
                if (panel_items_order[k] == 'B') 
                        p->area.list = g_slist_append(p->area.list, &p->battery);
 #endif
-               if (panel_items_order[k] == 'S') {
+               if (panel_items_order[k] == 'S' && p == panel1) {
                        // TODO : check systray is only on 1 panel
+                       // at the moment only on panel1[0] allowed
                        p->area.list = g_slist_append(p->area.list, &systray);
                }
                if (panel_items_order[k] == 'C')