Let the applications menu be optional

This commit is contained in:
Pierre Pronchery 2014-06-26 03:04:09 +02:00
parent 6997c7ce36
commit 3040bd11c9

View File

@ -546,18 +546,24 @@ static void _clicked_position_menu(GtkMenu * menu, gint * x, gint * y,
static void _on_clicked(gpointer data) static void _on_clicked(gpointer data)
{ {
Main * main = data; Main * main = data;
PanelAppletHelper * helper = main->helper;
GtkWidget * menu; GtkWidget * menu;
GtkWidget * menuitem; GtkWidget * menuitem;
GtkWidget * widget; GtkWidget * widget;
char const * p;
menu = gtk_menu_new(); menu = gtk_menu_new();
menuitem = _main_menuitem_stock(_("Applications"), if((p = helper->config_get(helper->panel, "main", "applications"))
"gnome-applications"); == NULL || strtol(p, NULL, 0) != 0)
widget = _main_applications(main); {
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), widget); menuitem = _main_menuitem_stock(_("Applications"),
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); "gnome-applications");
menuitem = gtk_separator_menu_item_new(); widget = _main_applications(main);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), widget);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
menuitem = gtk_separator_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
}
menuitem = _main_menuitem_stock(_("Run..."), GTK_STOCK_EXECUTE); menuitem = _main_menuitem_stock(_("Run..."), GTK_STOCK_EXECUTE);
g_signal_connect_swapped(menuitem, "activate", G_CALLBACK(_on_run), g_signal_connect_swapped(menuitem, "activate", G_CALLBACK(_on_run),
main); main);