aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Gateau <aurelien.gateau@canonical.com>2010-10-08 18:04:27 +0200
committerAurelien Gateau <aurelien.gateau@canonical.com>2010-10-08 18:04:27 +0200
commitea206ef1316942b005fd538dc8a251bd239291cd (patch)
tree4bf937c24fe06ab89f5577f4dd42444877200fd3
parent6f032f50c8bec41cd56e36ec09af118a9684af5b (diff)
downloadlibayatana-appindicator-ea206ef1316942b005fd538dc8a251bd239291cd.tar.gz
libayatana-appindicator-ea206ef1316942b005fd538dc8a251bd239291cd.tar.bz2
libayatana-appindicator-ea206ef1316942b005fd538dc8a251bd239291cd.zip
NotificationHost => StatusNotifierHost, Service => StatusNotifierItem
-rw-r--r--src/application-service-watcher.c30
-rw-r--r--src/application-service-watcher.h7
-rw-r--r--src/notification-watcher.xml10
3 files changed, 18 insertions, 29 deletions
diff --git a/src/application-service-watcher.c b/src/application-service-watcher.c
index 946b2a9..50b0be9 100644
--- a/src/application-service-watcher.c
+++ b/src/application-service-watcher.c
@@ -47,7 +47,7 @@ enum {
#define CURRENT_PROTOCOL_VERSION 0
static gboolean _notification_watcher_server_register_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method);
-static gboolean _notification_watcher_server_register_notification_host (ApplicationServiceWatcher * appwatcher, const gchar * host);
+static gboolean _notification_watcher_server_register_status_notifier_host (ApplicationServiceWatcher * appwatcher, const gchar * host);
static gboolean _notification_watcher_server_x_ayatana_register_notification_approver (ApplicationServiceWatcher * appwatcher, const gchar * path, const GArray * categories, DBusGMethodInvocation * method);
static void get_name_cb (DBusGProxy * proxy, guint status, GError * error, gpointer data);
@@ -65,10 +65,9 @@ struct _ApplicationServiceWatcherPrivate {
/* Signals Stuff */
enum {
- SERVICE_REGISTERED,
- SERVICE_UNREGISTERED,
- NOTIFICATION_HOST_REGISTERED,
- NOTIFICATION_HOST_UNREGISTERED,
+ STATUS_NOTIFIER_ITEM_REGISTERED,
+ STATUS_NOTIFIER_ITEM_UNREGISTERED,
+ STATUS_NOTIFIER_HOST_REGISTERED,
LAST_SIGNAL
};
@@ -122,31 +121,24 @@ application_service_watcher_class_init (ApplicationServiceWatcherClass *klass)
G_TYPE_STRV,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/* Signals */
- signals[SERVICE_REGISTERED] = g_signal_new ("service-registered",
+ signals[STATUS_NOTIFIER_ITEM_REGISTERED] = g_signal_new ("status-notifier-item-registered",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ApplicationServiceWatcherClass, service_registered),
+ G_STRUCT_OFFSET (ApplicationServiceWatcherClass, status_notifier_item_registered),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING, G_TYPE_NONE);
- signals[SERVICE_UNREGISTERED] = g_signal_new ("service-unregistered",
+ signals[STATUS_NOTIFIER_ITEM_UNREGISTERED] = g_signal_new ("status-notifier-item-unregistered",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ApplicationServiceWatcherClass, service_unregistered),
+ G_STRUCT_OFFSET (ApplicationServiceWatcherClass, status_notifier_item_unregistered),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING, G_TYPE_NONE);
- signals[NOTIFICATION_HOST_REGISTERED] = g_signal_new ("notification-host-registered",
+ signals[STATUS_NOTIFIER_HOST_REGISTERED] = g_signal_new ("status-notifier-host-registered",
G_TYPE_FROM_CLASS(klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ApplicationServiceWatcherClass, notification_host_registered),
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0, G_TYPE_NONE);
- signals[NOTIFICATION_HOST_UNREGISTERED] = g_signal_new ("notification-host-unregistered",
- G_TYPE_FROM_CLASS(klass),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ApplicationServiceWatcherClass, notification_host_unregistered),
+ G_STRUCT_OFFSET (ApplicationServiceWatcherClass, status_notifier_host_registered),
NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0, G_TYPE_NONE);
@@ -271,7 +263,7 @@ _notification_watcher_server_register_status_notifier_item (ApplicationServiceWa
}
static gboolean
-_notification_watcher_server_register_notification_host (ApplicationServiceWatcher * appwatcher, const gchar * host)
+_notification_watcher_server_register_status_notifier_host (ApplicationServiceWatcher * appwatcher, const gchar * host)
{
return FALSE;
diff --git a/src/application-service-watcher.h b/src/application-service-watcher.h
index ee6a723..6c430db 100644
--- a/src/application-service-watcher.h
+++ b/src/application-service-watcher.h
@@ -44,10 +44,9 @@ struct _ApplicationServiceWatcherClass {
GObjectClass parent_class;
/* Signals */
- void (*service_registered) (ApplicationServiceWatcher * watcher, gchar * object, gpointer data);
- void (*service_unregistered) (ApplicationServiceWatcher * watcher, gchar * object, gpointer data);
- void (*notification_host_registered) (ApplicationServiceWatcher * watcher, gpointer data);
- void (*notification_host_unregistered) (ApplicationServiceWatcher * watcher, gpointer data);
+ void (*status_notifier_item_registered) (ApplicationServiceWatcher * watcher, gchar * object, gpointer data);
+ void (*status_notifier_item_unregistered) (ApplicationServiceWatcher * watcher, gchar * object, gpointer data);
+ void (*status_notifier_host_registered) (ApplicationServiceWatcher * watcher, gpointer data);
};
struct _ApplicationServiceWatcher {
diff --git a/src/notification-watcher.xml b/src/notification-watcher.xml
index 1a99af3..b03c5e3 100644
--- a/src/notification-watcher.xml
+++ b/src/notification-watcher.xml
@@ -12,7 +12,7 @@
<annotation name="org.freedesktop.DBus.GLib.Async" value="true" />
<arg type="s" name="service" direction="in" />
</method>
- <method name="RegisterNotificationHost">
+ <method name="RegisterStatusNotifierHost">
<arg type="s" name="service" direction="in" />
</method>
<method name="XAyatanaRegisterNotificationApprover">
@@ -24,15 +24,13 @@
</method>
<!-- Signals -->
- <signal name="ServiceRegistered">
+ <signal name="StatusNotifierItemRegistered">
<arg type="s" name="service" direction="out" />
</signal>
- <signal name="ServiceUnregistered">
+ <signal name="StatusNotifierItemUnregistered">
<arg type="s" name="service" direction="out" />
</signal>
- <signal name="NotificationHostRegistered">
- </signal>
- <signal name="NotificationHostUnregistered">
+ <signal name="StatusNotifierHostRegistered">
</signal>
</interface>