summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafal Mielniczuk <rafal.mielniczuk2@gmail.com>2012-06-09 20:33:29 +0200
committerKristian Høgsberg <krh@bitplanet.net>2012-06-11 09:37:46 -0400
commitb9e513c6780fc07e80f6627cf8087afdef02f56a (patch)
tree713f480e3162169e84b8ade95597662a9f351ebb
parent6e0a7d82b7bd99407aef87a0a266150ec3124336 (diff)
desktop-shell: move panel_add_clock call to panel_create function
Putting panel_add_clock in launcher_section_done handler will cause clock to be created multiple times with every launcher. Fix is to move the call to panel_create function.
-rw-r--r--clients/desktop-shell.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/clients/desktop-shell.c b/clients/desktop-shell.c
index ae8e5f0..75fb83f 100644
--- a/clients/desktop-shell.c
+++ b/clients/desktop-shell.c
@@ -485,6 +485,8 @@ panel_create(struct display *display)
widget_set_redraw_handler(panel->widget, panel_redraw_handler);
widget_set_resize_handler(panel->widget, panel_resize_handler);
widget_set_button_handler(panel->widget, panel_button_handler);
+
+ panel_add_clock(panel);
return panel;
}
@@ -895,7 +897,6 @@ launcher_section_done(void *data)
wl_list_for_each(output, &desktop->outputs, link) {
panel_add_launcher(output->panel,
key_launcher_icon, key_launcher_path);
- panel_add_clock(output->panel);
}
free(key_launcher_icon);