aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-01-07 00:56:18 -0600
committerTed Gould <ted@gould.cx>2010-01-07 00:56:18 -0600
commit11984c8ac43cdf661ea8de0ae2bee380a04a00a3 (patch)
tree376f15b8269b5e7e90049f987da211cba9481c43
parent06b735fd5bd4212ec126831ca041615e9d433418 (diff)
parente16d383c5a0fb85742dde81f1f7191fceefa8667 (diff)
downloadlibayatana-appindicator-11984c8ac43cdf661ea8de0ae2bee380a04a00a3.tar.gz
libayatana-appindicator-11984c8ac43cdf661ea8de0ae2bee380a04a00a3.tar.bz2
libayatana-appindicator-11984c8ac43cdf661ea8de0ae2bee380a04a00a3.zip
Fixing the signals.
-rw-r--r--.bzrignore43
-rw-r--r--debian/changelog6
-rw-r--r--src/application-service-appstore.c12
3 files changed, 59 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore
index 4856033..977611c 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -44,3 +44,46 @@ src/libapplication_la-application-service-marshal.lo
src/libapplication_la-indicator-application.lo
src/libappindicator/app-indicator-enum-types.c
src/libappindicator/app-indicator-enum-types.h
+gtk-doc.make
+py-compile
+bindings/mono/appindicator-sharp-0.1.pc
+bindings/mono/appindicator-sharp.dll
+bindings/mono/appindicator-sharp.dll.config
+bindings/mono/generated
+bindings/mono/generated-stamp
+bindings/mono/libappindicator-api.raw
+bindings/mono/libappindicator-api.xml
+bindings/mono/examples/indicator-example
+bindings/python/.deps
+bindings/python/.libs
+bindings/python/_appindicator.la
+bindings/python/appindicator.c
+bindings/python/appindicator.lo
+bindings/python/appindicatormodule.lo
+docs/reference/.libs
+docs/reference/gtkdoc-in-srcdir
+docs/reference/html
+docs/reference/html-build.stamp
+docs/reference/html.stamp
+docs/reference/libappindicator-decl-list.txt
+docs/reference/libappindicator-decl.txt
+docs/reference/libappindicator-docs.sgml
+docs/reference/libappindicator-overrides.txt
+docs/reference/libappindicator-undeclared.txt
+docs/reference/libappindicator-undocumented.txt
+docs/reference/libappindicator-unused.txt
+docs/reference/libappindicator.args
+docs/reference/libappindicator.hierarchy
+docs/reference/libappindicator.interfaces
+docs/reference/libappindicator.prerequisites
+docs/reference/libappindicator.signals
+docs/reference/scan-build.stamp
+docs/reference/sgml-build.stamp
+docs/reference/sgml.stamp
+docs/reference/tmpl-build.stamp
+docs/reference/tmpl.stamp
+docs/reference/version.xml
+docs/reference/xml
+docs/reference/tmpl/app-indicator.sgml
+docs/reference/tmpl/app-indicator.sgml.bak
+src/libappindicator/appindicator-0.1.pc
diff --git a/debian/changelog b/debian/changelog
index 5a6b5c5..6b5944c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+indicator-application (0.0.6-0ubuntu1~ppa2~icon2) UNRELEASED; urgency=low
+
+ * Fixing the signals.
+
+ -- Ted Gould <ted@ubuntu.com> Thu, 07 Jan 2010 00:56:01 -0600
+
indicator-application (0.0.6-0ubuntu1~ppa2~icon1) karmic; urgency=low
* Adding in icon path support.
diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c
index 92e5668..1ac309a 100644
--- a/src/application-service-appstore.c
+++ b/src/application-service-appstore.c
@@ -95,7 +95,7 @@ application_service_appstore_class_init (ApplicationServiceAppstoreClass *klass)
G_STRUCT_OFFSET (ApplicationServiceAppstore, application_added),
NULL, NULL,
_application_service_marshal_VOID__STRING_INT_STRING_STRING_STRING,
- G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_NONE);
+ G_TYPE_NONE, 5, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_NONE);
signals[APPLICATION_REMOVED] = g_signal_new ("application-removed",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST,
@@ -180,13 +180,21 @@ get_all_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * err
would involve looking at the name and category and sorting
it with the other entries. */
+ const gchar * icon_path = NULL;
+ gpointer icon_path_data = g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_PATH);
+ if (icon_path_data != NULL) {
+ icon_path = g_value_get_string((GValue *)icon_path_data);
+ } else {
+ icon_path = "";
+ }
+
g_signal_emit(G_OBJECT(app->appstore),
signals[APPLICATION_ADDED], 0,
g_value_get_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_NAME)),
0, /* Position */
app->dbus_name,
g_value_get_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_MENU)),
- g_value_get_string(g_hash_table_lookup(properties, NOTIFICATION_ITEM_PROP_ICON_PATH)),
+ icon_path,
TRUE);
return;