DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Pierre Pronchery 2013-11-21 02:55:33 +01:00
parent d472e34d97
commit a7c7444003
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/applets/main.c
View File

@ -217,7 +217,7 @@ static GtkWidget * _main_applications(Main * main)
&& config_get(config, section, "Exec") == NULL) && config_get(config, section, "Exec") == NULL)
gtk_widget_set_sensitive(menuitem, FALSE); gtk_widget_set_sensitive(menuitem, FALSE);
else else
g_signal_connect_swapped(G_OBJECT(menuitem), "activate", g_signal_connect_swapped(menuitem, "activate",
G_CALLBACK(_applications_on_activate), G_CALLBACK(_applications_on_activate),
config); config);
if((q = config_get(config, section, "Categories")) == NULL) if((q = config_get(config, section, "Categories")) == NULL)
@ -437,49 +437,49 @@ static void _on_clicked(gpointer data)
menuitem = gtk_separator_menu_item_new(); menuitem = gtk_separator_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
menuitem = _main_menuitem(_("Run..."), GTK_STOCK_EXECUTE); menuitem = _main_menuitem(_("Run..."), GTK_STOCK_EXECUTE);
g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK( g_signal_connect_swapped(menuitem, "activate", G_CALLBACK(_on_run),
_on_run), main); main);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
menuitem = gtk_separator_menu_item_new(); menuitem = gtk_separator_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL); menuitem = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL);
g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK( g_signal_connect_swapped(menuitem, "activate", G_CALLBACK(_on_about),
_on_about), main); main);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
/* lock screen */ /* lock screen */
menuitem = gtk_separator_menu_item_new(); menuitem = gtk_separator_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
menuitem = _main_menuitem(_("Lock screen"), "gnome-lockscreen"); menuitem = _main_menuitem(_("Lock screen"), "gnome-lockscreen");
g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK( g_signal_connect_swapped(menuitem, "activate", G_CALLBACK(_on_lock),
_on_lock), main); main);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
#ifdef EMBEDDED #ifdef EMBEDDED
/* rotate screen */ /* rotate screen */
menuitem = _main_menuitem(_("Rotate"), GTK_STOCK_REFRESH); /* XXX */ menuitem = _main_menuitem(_("Rotate"), GTK_STOCK_REFRESH); /* XXX */
g_signal_connect_swapped(G_OBJECT(menuitem), "activate", g_signal_connect_swapped(menuitem, "activate", G_CALLBACK(_on_rotate),
G_CALLBACK(_on_rotate), data); data);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
#endif #endif
/* logout */ /* logout */
if(main->helper->logout_dialog != NULL) if(main->helper->logout_dialog != NULL)
{ {
menuitem = _main_menuitem(_("Logout..."), "gnome-logout"); menuitem = _main_menuitem(_("Logout..."), "gnome-logout");
g_signal_connect_swapped(G_OBJECT(menuitem), "activate", g_signal_connect_swapped(menuitem, "activate", G_CALLBACK(
G_CALLBACK(_on_logout), data); _on_logout), data);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
} }
/* suspend */ /* suspend */
if(main->helper->suspend != NULL) if(main->helper->suspend != NULL)
{ {
menuitem = _main_menuitem(_("Suspend"), "gtk-media-pause"); menuitem = _main_menuitem(_("Suspend"), "gtk-media-pause");
g_signal_connect_swapped(G_OBJECT(menuitem), "activate", g_signal_connect_swapped(menuitem, "activate", G_CALLBACK(
G_CALLBACK(_on_suspend), data); _on_suspend), data);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
} }
/* shutdown */ /* shutdown */
menuitem = _main_menuitem(_("Shutdown..."), "gnome-shutdown"); menuitem = _main_menuitem(_("Shutdown..."), "gnome-shutdown");
g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK( g_signal_connect_swapped(menuitem, "activate", G_CALLBACK(_on_shutdown),
_on_shutdown), data); data);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
gtk_widget_show_all(menu); gtk_widget_show_all(menu);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, _clicked_position_menu, gtk_menu_popup(GTK_MENU(menu), NULL, NULL, _clicked_position_menu,