Skip to content
Snippets Groups Projects
Commit f5b9ed57 authored by Eric Koegel's avatar Eric Koegel
Browse files

Only show menu separator when there's items to separate

In the battery plugin, there's a chance that we've filtered out
any devices to display and thus there's no need for the menu
separator.
parent 47d4ba88
No related branches found
No related tags found
No related merge requests found
...@@ -648,6 +648,7 @@ battery_button_show_menu (BatteryButton *button) ...@@ -648,6 +648,7 @@ battery_button_show_menu (BatteryButton *button)
GtkWidget *menu, *mi; GtkWidget *menu, *mi;
GdkScreen *gscreen; GdkScreen *gscreen;
GList *item; GList *item;
gboolean show_separator_flag = FALSE;
if(gtk_widget_has_screen(GTK_WIDGET(button))) if(gtk_widget_has_screen(GTK_WIDGET(button)))
gscreen = gtk_widget_get_screen(GTK_WIDGET(button)); gscreen = gtk_widget_get_screen(GTK_WIDGET(button));
...@@ -665,12 +666,17 @@ battery_button_show_menu (BatteryButton *button) ...@@ -665,12 +666,17 @@ battery_button_show_menu (BatteryButton *button)
BatteryDevice *battery_device = item->data; BatteryDevice *battery_device = item->data;
battery_button_menu_add_device (button, battery_device, TRUE); battery_button_menu_add_device (button, battery_device, TRUE);
/* If we add an item to the menu, show the separator */
show_separator_flag = TRUE;
} }
/* separator */ if (show_separator_flag)
mi = gtk_separator_menu_item_new(); {
gtk_widget_show(mi); /* separator */
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); mi = gtk_separator_menu_item_new();
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
}
/* Presentation mode checkbox */ /* Presentation mode checkbox */
mi = gtk_check_menu_item_new_with_mnemonic (_("Presentation _mode")); mi = gtk_check_menu_item_new_with_mnemonic (_("Presentation _mode"));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment