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 2018-01-28 08:05:53 +01:00
parent 6e85c9cc5e
commit a20cc674fa
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/applets/menu.c
View File

@ -61,16 +61,16 @@ typedef struct _PanelApplet
GtkWidget * widget; GtkWidget * widget;
} Menu; } Menu;
typedef struct _MenuMenu typedef struct _MenuCategory
{ {
char const * category; char const * category;
char const * label; char const * label;
char const * stock; char const * stock;
} MenuMenu; } MenuCategory;
/* constants */ /* constants */
static const MenuMenu _menu_menus[] = static const MenuCategory _menu_categories[] =
{ {
{ "Audio", N_("Audio"), "gnome-mime-audio", }, { "Audio", N_("Audio"), "gnome-mime-audio", },
{ "Development",N_("Development"),"applications-development", }, { "Development",N_("Development"),"applications-development", },
@ -85,7 +85,7 @@ static const MenuMenu _menu_menus[] =
{ "Utility", N_("Utilities"),"applications-utilities", }, { "Utility", N_("Utilities"),"applications-utilities", },
{ "Video", N_("Video"), "video", } { "Video", N_("Video"), "video", }
}; };
#define MENU_MENUS_COUNT (sizeof(_menu_menus) / sizeof(*_menu_menus)) #define MENU_MENUS_COUNT (sizeof(_menu_categories) / sizeof(*_menu_categories))
/* prototypes */ /* prototypes */
@ -276,7 +276,7 @@ static GtkWidget * _menu_applications(Menu * menu)
for(i = 0; i < MENU_MENUS_COUNT; i++) for(i = 0; i < MENU_MENUS_COUNT; i++)
{ {
for(j = 0; categories[j] != NULL; j++) for(j = 0; categories[j] != NULL; j++)
if(string_compare(_menu_menus[i].category, if(string_compare(_menu_categories[i].category,
categories[j]) == 0) categories[j]) == 0)
break; break;
if(categories[j] != NULL) if(categories[j] != NULL)
@ -309,7 +309,7 @@ static void _applications_on_activate(gpointer data)
static void _applications_categories(GtkWidget * menu, GtkWidget ** menus) static void _applications_categories(GtkWidget * menu, GtkWidget ** menus)
{ {
size_t i; size_t i;
MenuMenu const * m; MenuCategory const * m;
GtkWidget * menuitem; GtkWidget * menuitem;
size_t pos = 0; size_t pos = 0;
@ -317,7 +317,7 @@ static void _applications_categories(GtkWidget * menu, GtkWidget ** menus)
{ {
if(menus[i] == NULL) if(menus[i] == NULL)
continue; continue;
m = &_menu_menus[i]; m = &_menu_categories[i];
menuitem = _menu_menuitem_stock(m->stock, _(m->label), FALSE); menuitem = _menu_menuitem_stock(m->stock, _(m->label), FALSE);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menus[i]); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menus[i]);
gtk_menu_shell_insert(GTK_MENU_SHELL(menu), menuitem, pos++); gtk_menu_shell_insert(GTK_MENU_SHELL(menu), menuitem, pos++);