From d075aeec9ff17ffa5847d06246854689236d3876 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Apr 2009 22:02:05 -0500 Subject: Oops, cut and paste error, pulling up the wrong symbols --- src/applet-main.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/applet-main.c b/src/applet-main.c index f979beb..1f538ae 100644 --- a/src/applet-main.c +++ b/src/applet-main.c @@ -80,31 +80,32 @@ load_module (const gchar * name, GtkWidget * menu) g_free(fullpath); g_return_val_if_fail(module != NULL, FALSE); - get_version_t lget_version; + get_version_t lget_version = NULL; g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version)), FALSE); if (!INDICATOR_VERSION_CHECK(lget_version())) { g_warning("Indicator using API version '%s' we're expecting '%s'", lget_version(), INDICATOR_VERSION); return FALSE; } - get_label_t lget_label; + get_label_t lget_label = NULL; g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_LABEL_S, (gpointer *)(&lget_label)), FALSE); g_return_val_if_fail(lget_label != NULL, FALSE); GtkLabel * label = lget_label(); - get_icon_t lget_icon; - g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_LABEL_S, (gpointer *)(&lget_icon)), FALSE); + get_icon_t lget_icon = NULL; + g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_ICON_S, (gpointer *)(&lget_icon)), FALSE); g_return_val_if_fail(lget_icon != NULL, FALSE); GtkImage * icon = lget_icon(); - get_menu_t lget_menu; - g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_LABEL_S, (gpointer *)(&lget_menu)), FALSE); + get_menu_t lget_menu = NULL; + g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_MENU_S, (gpointer *)(&lget_menu)), FALSE); g_return_val_if_fail(lget_menu != NULL, FALSE); GtkMenu * lmenu = lget_menu(); if (label == NULL && icon == NULL) { /* This is the case where there is nothing to display, kinda odd that we'd have a module with nothing. */ + g_warning("No label or icon. Odd."); return FALSE; } -- cgit v1.2.3 From 2f6ccdfe4ee4d5c30123edcea9fcd4c4d54d8ea7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Apr 2009 22:06:00 -0500 Subject: Slipping in the hbox --- src/applet-main.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/applet-main.c b/src/applet-main.c index 1f538ae..7f3a210 100644 --- a/src/applet-main.c +++ b/src/applet-main.c @@ -117,12 +117,15 @@ load_module (const gchar * name, GtkWidget * menu) if (label != NULL) { gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label), FALSE, FALSE, 0); } + gtk_container_add(GTK_CONTAINER(menuitem), hbox); + gtk_widget_show(hbox); if (menu != NULL) { gtk_menu_shell_append(GTK_MENU_SHELL(menuitem), GTK_WIDGET(lmenu)); } gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + gtk_widget_show(menuitem); return TRUE; } -- cgit v1.2.3 From c292100a3d95aac71c7cb943cbd3df9a204c0a70 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Apr 2009 23:44:06 -0500 Subject: Get the submenu set right. --- src/applet-main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/applet-main.c b/src/applet-main.c index 7f3a210..7c39d6d 100644 --- a/src/applet-main.c +++ b/src/applet-main.c @@ -120,8 +120,8 @@ load_module (const gchar * name, GtkWidget * menu) gtk_container_add(GTK_CONTAINER(menuitem), hbox); gtk_widget_show(hbox); - if (menu != NULL) { - gtk_menu_shell_append(GTK_MENU_SHELL(menuitem), GTK_WIDGET(lmenu)); + if (lmenu != NULL) { + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(lmenu)); } gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); -- cgit v1.2.3