diff options
| author | Ted Gould <ted@canonical.com> | 2009-04-22 17:09:03 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-04-22 17:09:03 -0500 |
| commit | 836e265935805953cd21748c4ba78fa98978e853 (patch) | |
| tree | 0febdc5f2614a760d4acb9f91e587745dca92863 /src | |
| parent | f5044ea680421a572394ea8286b538857d491973 (diff) | |
| parent | 18397c82725b7cee22bf82b0539a4fb36dd49fe9 (diff) | |
| download | libayatana-indicator-836e265935805953cd21748c4ba78fa98978e853.tar.gz libayatana-indicator-836e265935805953cd21748c4ba78fa98978e853.tar.bz2 libayatana-indicator-836e265935805953cd21748c4ba78fa98978e853.zip | |
Upstream snapshot, turning version getting feature into a
function and adding a name symbol outline.
Diffstat (limited to 'src')
| -rw-r--r-- | src/applet-main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/applet-main.c b/src/applet-main.c index b055be7..d661824 100644 --- a/src/applet-main.c +++ b/src/applet-main.c @@ -80,9 +80,12 @@ load_module (const gchar * name, GtkWidget * menu) g_free(fullpath); g_return_val_if_fail(module != NULL, FALSE); - gchar * version; - g_return_val_if_fail(g_module_symbol(module, INDICATOR_VERSION_S, (gpointer *)(&version)), FALSE); - g_return_val_if_fail(INDICATOR_VERSION_CHECK(version), FALSE); + get_version_t lget_version; + 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; g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_LABEL_S, (gpointer *)(&lget_label)), FALSE); |