diff options
| author | Ted Gould <ted@gould.cx> | 2010-02-06 11:58:19 -0800 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-02-06 11:58:19 -0800 |
| commit | 28b0ba50227548758db097d0c6097b1a394e413f (patch) | |
| tree | bd5f00d2bfab07f7918025ebd1ee3b2f1139effc | |
| parent | 035f56558cccf52c5c2052bb1f80a4b7519ed4c5 (diff) | |
| download | ayatana-indicator-application-28b0ba50227548758db097d0c6097b1a394e413f.tar.gz ayatana-indicator-application-28b0ba50227548758db097d0c6097b1a394e413f.tar.bz2 ayatana-indicator-application-28b0ba50227548758db097d0c6097b1a394e413f.zip | |
Ready to recieve the boxed type on the other side.
| -rw-r--r-- | src/application-service-appstore.c | 5 | ||||
| -rw-r--r-- | src/libappindicator/app-indicator.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 70fab18..5e0c601 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -222,7 +222,10 @@ 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); + 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_ICON_NAME)); } diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 2befb34..19b4fd9 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -544,9 +544,9 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa if (priv->menuservice != NULL) { GValue strval = {0}; g_value_init(&strval, G_TYPE_STRING); - g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, &strvalue); - g_value_set_boxed(value, g_value_get_string(&strvalue)); - g_value_unset(&strvalue); + g_object_get_property (G_OBJECT (priv->menuservice), DBUSMENU_SERVER_PROP_DBUS_OBJECT, &strval); + g_value_set_boxed(value, g_value_get_string(&strval)); + g_value_unset(&strval); } break; |