desktop-shell: move panel_add_clock call to panel_create function
authorRafal Mielniczuk <rafal.mielniczuk2@gmail.com>
Sat, 9 Jun 2012 18:33:29 +0000 (20:33 +0200)
committerKristian Høgsberg <krh@bitplanet.net>
Mon, 11 Jun 2012 13:37:46 +0000 (09:37 -0400)
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.

clients/desktop-shell.c

index ae8e5f0..75fb83f 100644 (file)
@@ -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);