diff options
| author | Ted Gould <ted@gould.cx> | 2010-01-15 10:07:09 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-01-15 10:07:09 -0600 |
| commit | e709d9b4479ebeed3918e5f2e760490cf0fa0b5a (patch) | |
| tree | 40772ee8e4cb661ced806556a1a4f6fcbb0be489 | |
| parent | 36e7fd1e45ad3f3eb89c6a7ea0b9b92b754b3971 (diff) | |
| parent | 93f32fd90d78997bf9661ddeaa8bfbb2f3020ced (diff) | |
| download | ayatana-indicator-application-e709d9b4479ebeed3918e5f2e760490cf0fa0b5a.tar.gz ayatana-indicator-application-e709d9b4479ebeed3918e5f2e760490cf0fa0b5a.tar.bz2 ayatana-indicator-application-e709d9b4479ebeed3918e5f2e760490cf0fa0b5a.zip | |
* Upstream update
* Simplify and correct the structure handling.
* Pass the correct object path over the bus. We want the menu.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | src/application-service-appstore.c | 2 | ||||
| -rw-r--r-- | src/indicator-application.c | 26 |
3 files changed, 20 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog index 8b0e033..7c3526a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-application (0.0.9-0ubuntu1~ppa2~applist2) UNRELEASED; urgency=low + + * Upstream update + * Simplify and correct the structure handling. + * Pass the correct object path over the bus. We want the menu. + + -- Ted Gould <ted@ubuntu.com> Fri, 15 Jan 2010 10:06:28 -0600 + indicator-application (0.0.9-0ubuntu1~ppa2~applist1) karmic; urgency=low * Upstream update diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index df4213a..bc99855 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -657,7 +657,7 @@ _application_service_server_get_applications (ApplicationServiceAppstore * appst /* DBus Object */ g_value_init(&value, DBUS_TYPE_G_OBJECT_PATH); - g_value_set_static_boxed(&value, ((Application *)listpntr->data)->dbus_object); + g_value_set_static_boxed(&value, ((Application *)listpntr->data)->menu); g_value_array_append(values, &value); g_value_unset(&value); diff --git a/src/indicator-application.c b/src/indicator-application.c index c6b962a..fc7f56d 100644 --- a/src/indicator-application.c +++ b/src/indicator-application.c @@ -373,7 +373,7 @@ get_applications (DBusGProxy *proxy, GPtrArray *OUT_applications, GError *error, g_warning("Unable to get application list: %s", error->message); return; } - g_ptr_array_foreach(OUT_applications, get_applications_helper, proxy); + g_ptr_array_foreach(OUT_applications, get_applications_helper, userdata); return; } @@ -383,6 +383,7 @@ get_applications (DBusGProxy *proxy, GPtrArray *OUT_applications, GError *error, static void get_applications_helper (gpointer data, gpointer user_data) { +#if 0 GType structype = dbus_g_type_get_struct("GValueArray", G_TYPE_STRING, G_TYPE_INT, @@ -390,21 +391,16 @@ get_applications_helper (gpointer data, gpointer user_data) DBUS_TYPE_G_OBJECT_PATH, G_TYPE_STRING, G_TYPE_INVALID); - g_return_if_fail(G_VALUE_HOLDS(data, structype)); +#endif + GValueArray * array = (GValueArray *)data; - gchar * icon_name; - gint position; - gchar * dbus_address; - gchar * dbus_object; - gchar * icon_path; + g_debug("Size: %d", array->n_values); - dbus_g_type_struct_get(data, - 0, &icon_name, - 1, &position, - 2, &dbus_address, - 3, &dbus_object, - 4, &icon_path, - G_MAXUINT); + const gchar * icon_name = g_value_get_string(g_value_array_get_nth(array, 0)); + gint position = g_value_get_int(g_value_array_get_nth(array, 1)); + const gchar * dbus_address = g_value_get_string(g_value_array_get_nth(array, 2)); + const gchar * dbus_object = g_value_get_boxed(g_value_array_get_nth(array, 3)); + const gchar * icon_path = g_value_get_string(g_value_array_get_nth(array, 4)); - return application_added(user_data, icon_name, position, dbus_address, dbus_object, icon_path, NULL); + return application_added(NULL, icon_name, position, dbus_address, dbus_object, icon_path, user_data); } |