diff options
| author | Ted Gould <ted@gould.cx> | 2010-02-11 10:36:56 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-02-11 10:36:56 -0600 |
| commit | bbebb7a3907a59a1ef475dc9d5c8e65c1e1595d6 (patch) | |
| tree | 696dbbeaeb19a90f291c4b5a0fa464cbbf39a591 /src/application-service-appstore.c | |
| parent | a94ef5f210aad3624463e8edf40cc2f0499033fa (diff) | |
| parent | 14abe9ad1ff1b09526b6f0f6410c2783e6dbd501 (diff) | |
| download | libayatana-appindicator-bbebb7a3907a59a1ef475dc9d5c8e65c1e1595d6.tar.gz libayatana-appindicator-bbebb7a3907a59a1ef475dc9d5c8e65c1e1595d6.tar.bz2 libayatana-appindicator-bbebb7a3907a59a1ef475dc9d5c8e65c1e1595d6.zip | |
* Upstream release 0.0.13
* Changing the menu property to be a proper DBus object path
* Make object paths unique by including application IDs in them
Diffstat (limited to 'src/application-service-appstore.c')
| -rw-r--r-- | src/application-service-appstore.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index c784495..ec6da50 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -222,7 +222,16 @@ get_all_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * err app_lru_file_touch(priv->lrufile, app->id, app->category); app->icon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME)); - app->menu = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU)); + + GValue * menuval = (GValue *)g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU); + if (G_VALUE_TYPE(menuval) == G_TYPE_STRING) { + /* This is here to support an older version where we + were using strings instea of object paths. */ + app->menu = g_value_dup_string(menuval); + } else { + app->menu = g_strdup((gchar *)g_value_get_boxed(menuval)); + } + if (g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME) != NULL) { app->aicon = g_value_dup_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_AICON_NAME)); } |