diff options
| author | Ted Gould <ted@canonical.com> | 2009-04-22 22:02:05 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-04-22 22:02:05 -0500 |
| commit | d075aeec9ff17ffa5847d06246854689236d3876 (patch) | |
| tree | 05c6121fd230022f691d025dc5bbd4387f69c8ac | |
| parent | 18397c82725b7cee22bf82b0539a4fb36dd49fe9 (diff) | |
| download | libayatana-indicator-d075aeec9ff17ffa5847d06246854689236d3876.tar.gz libayatana-indicator-d075aeec9ff17ffa5847d06246854689236d3876.tar.bz2 libayatana-indicator-d075aeec9ff17ffa5847d06246854689236d3876.zip | |
Oops, cut and paste error, pulling up the wrong symbols
| -rw-r--r-- | src/applet-main.c | 13 |
1 files changed, 7 insertions, 6 deletions
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; } |