From 0aaa6a25ab78a044e1b004a6943d2b6f07598c17 Mon Sep 17 00:00:00 2001 From: Aurelien Gateau Date: Thu, 7 Jan 2010 13:29:50 +0100 Subject: Use org.freedesktop namespace --- src/application-service-watcher.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/application-service-watcher.c') diff --git a/src/application-service-watcher.c b/src/application-service-watcher.c index 984b9d4..81fae36 100644 --- a/src/application-service-watcher.c +++ b/src/application-service-watcher.c @@ -29,8 +29,8 @@ with this program. If not, see . #include "application-service-watcher.h" #include "dbus-shared.h" -static gboolean _notification_watcher_server_register_service (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method); -static gboolean _notification_watcher_server_registered_services (ApplicationServiceWatcher * appwatcher, GArray ** apps); +static gboolean _notification_watcher_server_register_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method); +static gboolean _notification_watcher_server_registered_status_notifier_items (ApplicationServiceWatcher * appwatcher, GArray ** apps); static gboolean _notification_watcher_server_protocol_version (ApplicationServiceWatcher * appwatcher, char ** version); static gboolean _notification_watcher_server_register_notification_host (ApplicationServiceWatcher * appwatcher, const gchar * host); static gboolean _notification_watcher_server_is_notification_host_registered (ApplicationServiceWatcher * appwatcher, gboolean * haveHost); @@ -165,7 +165,7 @@ application_service_watcher_new (ApplicationServiceAppstore * appstore) } static gboolean -_notification_watcher_server_register_service (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method) +_notification_watcher_server_register_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method) { ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(appwatcher); @@ -176,7 +176,7 @@ _notification_watcher_server_register_service (ApplicationServiceWatcher * appwa } static gboolean -_notification_watcher_server_registered_services (ApplicationServiceWatcher * appwatcher, GArray ** apps) +_notification_watcher_server_registered_status_notifier_items (ApplicationServiceWatcher * appwatcher, GArray ** apps) { return FALSE; -- cgit v1.2.3 From 199f3d22a194b89241a2d29519aae587f5c4b5a8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jan 2010 12:29:33 -0600 Subject: Allowing for the default path if one is not given. --- src/application-service-watcher.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/application-service-watcher.c') diff --git a/src/application-service-watcher.c b/src/application-service-watcher.c index 81fae36..f2823dd 100644 --- a/src/application-service-watcher.c +++ b/src/application-service-watcher.c @@ -169,7 +169,13 @@ _notification_watcher_server_register_status_notifier_item (ApplicationServiceWa { ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(appwatcher); - application_service_appstore_application_add(priv->appstore, dbus_g_method_get_sender(method), service); + const gchar * finalservice = NOTIFICATION_ITEM_DEFAULT_OBJ; + + if (service[0] == '/') { + finalservice = service; + } + + application_service_appstore_application_add(priv->appstore, dbus_g_method_get_sender(method), finalservice); dbus_g_method_return(method, G_TYPE_NONE); return TRUE; -- cgit v1.2.3 From 0c8cf85f9e6aa2120a7616f0aacb8f3993894687 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 8 Jan 2010 09:25:17 -0600 Subject: Adjusting so that we use the parameter if it's not an object but a path. --- src/application-service-watcher.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/application-service-watcher.c') diff --git a/src/application-service-watcher.c b/src/application-service-watcher.c index f2823dd..1ad59d4 100644 --- a/src/application-service-watcher.c +++ b/src/application-service-watcher.c @@ -169,14 +169,16 @@ _notification_watcher_server_register_status_notifier_item (ApplicationServiceWa { ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(appwatcher); - const gchar * finalservice = NOTIFICATION_ITEM_DEFAULT_OBJ; - if (service[0] == '/') { - finalservice = service; + application_service_appstore_application_add(priv->appstore, + dbus_g_method_get_sender(method), + service); + } else { + application_service_appstore_application_add(priv->appstore, + service, + NOTIFICATION_ITEM_DEFAULT_OBJ); } - application_service_appstore_application_add(priv->appstore, dbus_g_method_get_sender(method), finalservice); - dbus_g_method_return(method, G_TYPE_NONE); return TRUE; } -- cgit v1.2.3