From 8d4ca51e188f83fac7c4c6c941b15e217ae8c336 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 20 Dec 2009 16:56:09 -0600 Subject: Adding of a new property, icon path, to store the path to the icons. --- src/notification-item.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/notification-item.xml') diff --git a/src/notification-item.xml b/src/notification-item.xml index c28cc54..b671e38 100644 --- a/src/notification-item.xml +++ b/src/notification-item.xml @@ -8,6 +8,7 @@ + -- cgit v1.2.3 From 95b5ea90de66f465398fbdf9779e342395ea327a Mon Sep 17 00:00:00 2001 From: Aurelien Gateau Date: Wed, 23 Dec 2009 16:48:54 +0100 Subject: Make it work on KDE --- src/application-service-watcher.c | 8 ++++---- src/dbus-shared.h | 8 ++++---- src/libappindicator/app-indicator.c | 6 ++++-- src/notification-item.xml | 4 ++-- src/notification-watcher.xml | 8 ++++---- 5 files changed, 18 insertions(+), 16 deletions(-) (limited to 'src/notification-item.xml') 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; diff --git a/src/dbus-shared.h b/src/dbus-shared.h index f888e02..cac88d8 100644 --- a/src/dbus-shared.h +++ b/src/dbus-shared.h @@ -20,12 +20,12 @@ with this program. If not, see . */ -#define INDICATOR_APPLICATION_DBUS_ADDR "org.ayatana.indicator.application" +#define INDICATOR_APPLICATION_DBUS_ADDR "org.kde.StatusNotifierWatcher" #define INDICATOR_APPLICATION_DBUS_OBJ "/org/ayatana/indicator/application/service" #define INDICATOR_APPLICATION_DBUS_IFACE "org.ayatana.indicator.application.service" -#define NOTIFICATION_WATCHER_DBUS_OBJ "/org/ayatana/indicator/application/NotificationWatcher" -#define NOTIFICATION_WATCHER_DBUS_IFACE "org.ayatana.indicator.application.NotificationWatcher" +#define NOTIFICATION_WATCHER_DBUS_OBJ "/StatusNotifierWatcher" +#define NOTIFICATION_WATCHER_DBUS_IFACE "org.kde.StatusNotifierWatcher" -#define NOTIFICATION_ITEM_DBUS_IFACE "org.ayatana.indicator.application.NotificationItem" +#define NOTIFICATION_ITEM_DBUS_IFACE "org.kde.StatusNotifierItem" diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index bb68cb2..4baf4ef 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -32,6 +32,7 @@ License version 3 and version 2.1 along with this program. If not, see #endif #include +#include #include #include @@ -293,7 +294,7 @@ app_indicator_init (AppIndicator *self) } dbus_g_connection_register_g_object(priv->connection, - "/need/a/path", + "/StatusNotifierItem", G_OBJECT(self)); self->priv = priv; @@ -513,7 +514,8 @@ check_connect (AppIndicator *self) return; } - org_ayatana_indicator_application_NotificationWatcher_register_service_async(priv->watcher_proxy, "/need/a/path", register_service_cb, self); + const char * name = dbus_bus_get_unique_name(dbus_g_connection_get_connection(priv->connection)); + org_kde_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, name, register_service_cb, self); return; } diff --git a/src/notification-item.xml b/src/notification-item.xml index c28cc54..8515519 100644 --- a/src/notification-item.xml +++ b/src/notification-item.xml @@ -1,6 +1,6 @@ - - + + diff --git a/src/notification-watcher.xml b/src/notification-watcher.xml index 2ef54a0..c2324f1 100644 --- a/src/notification-watcher.xml +++ b/src/notification-watcher.xml @@ -1,16 +1,16 @@ - - + + - + - + -- cgit v1.2.3 From dd2ed951b8aeb16671bebd2ea104953252ab54a5 Mon Sep 17 00:00:00 2001 From: Aurelien Gateau Date: Wed, 23 Dec 2009 17:00:30 +0100 Subject: Previous commit was not meant to be pushed to trunk Revert my mess --- src/application-service-watcher.c | 8 ++++---- src/dbus-shared.h | 8 ++++---- src/libappindicator/app-indicator.c | 6 ++---- src/notification-item.xml | 4 ++-- src/notification-watcher.xml | 8 ++++---- 5 files changed, 16 insertions(+), 18 deletions(-) (limited to 'src/notification-item.xml') diff --git a/src/application-service-watcher.c b/src/application-service-watcher.c index 81fae36..984b9d4 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_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_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_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_status_notifier_item (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method) +_notification_watcher_server_register_service (ApplicationServiceWatcher * appwatcher, const gchar * service, DBusGMethodInvocation * method) { ApplicationServiceWatcherPrivate * priv = APPLICATION_SERVICE_WATCHER_GET_PRIVATE(appwatcher); @@ -176,7 +176,7 @@ _notification_watcher_server_register_status_notifier_item (ApplicationServiceWa } static gboolean -_notification_watcher_server_registered_status_notifier_items (ApplicationServiceWatcher * appwatcher, GArray ** apps) +_notification_watcher_server_registered_services (ApplicationServiceWatcher * appwatcher, GArray ** apps) { return FALSE; diff --git a/src/dbus-shared.h b/src/dbus-shared.h index cac88d8..f888e02 100644 --- a/src/dbus-shared.h +++ b/src/dbus-shared.h @@ -20,12 +20,12 @@ with this program. If not, see . */ -#define INDICATOR_APPLICATION_DBUS_ADDR "org.kde.StatusNotifierWatcher" +#define INDICATOR_APPLICATION_DBUS_ADDR "org.ayatana.indicator.application" #define INDICATOR_APPLICATION_DBUS_OBJ "/org/ayatana/indicator/application/service" #define INDICATOR_APPLICATION_DBUS_IFACE "org.ayatana.indicator.application.service" -#define NOTIFICATION_WATCHER_DBUS_OBJ "/StatusNotifierWatcher" -#define NOTIFICATION_WATCHER_DBUS_IFACE "org.kde.StatusNotifierWatcher" +#define NOTIFICATION_WATCHER_DBUS_OBJ "/org/ayatana/indicator/application/NotificationWatcher" +#define NOTIFICATION_WATCHER_DBUS_IFACE "org.ayatana.indicator.application.NotificationWatcher" -#define NOTIFICATION_ITEM_DBUS_IFACE "org.kde.StatusNotifierItem" +#define NOTIFICATION_ITEM_DBUS_IFACE "org.ayatana.indicator.application.NotificationItem" diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index 4baf4ef..bb68cb2 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -32,7 +32,6 @@ License version 3 and version 2.1 along with this program. If not, see #endif #include -#include #include #include @@ -294,7 +293,7 @@ app_indicator_init (AppIndicator *self) } dbus_g_connection_register_g_object(priv->connection, - "/StatusNotifierItem", + "/need/a/path", G_OBJECT(self)); self->priv = priv; @@ -514,8 +513,7 @@ check_connect (AppIndicator *self) return; } - const char * name = dbus_bus_get_unique_name(dbus_g_connection_get_connection(priv->connection)); - org_kde_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, name, register_service_cb, self); + org_ayatana_indicator_application_NotificationWatcher_register_service_async(priv->watcher_proxy, "/need/a/path", register_service_cb, self); return; } diff --git a/src/notification-item.xml b/src/notification-item.xml index 8515519..c28cc54 100644 --- a/src/notification-item.xml +++ b/src/notification-item.xml @@ -1,6 +1,6 @@ - - + + diff --git a/src/notification-watcher.xml b/src/notification-watcher.xml index c2324f1..2ef54a0 100644 --- a/src/notification-watcher.xml +++ b/src/notification-watcher.xml @@ -1,16 +1,16 @@ - - + + - + - + -- cgit v1.2.3 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 ++++---- src/dbus-shared.h | 8 ++++---- src/libappindicator/app-indicator.c | 6 ++++-- src/notification-item.xml | 4 ++-- src/notification-watcher.xml | 8 ++++---- 5 files changed, 18 insertions(+), 16 deletions(-) (limited to 'src/notification-item.xml') 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; diff --git a/src/dbus-shared.h b/src/dbus-shared.h index f888e02..da9dfef 100644 --- a/src/dbus-shared.h +++ b/src/dbus-shared.h @@ -20,12 +20,12 @@ with this program. If not, see . */ -#define INDICATOR_APPLICATION_DBUS_ADDR "org.ayatana.indicator.application" +#define INDICATOR_APPLICATION_DBUS_ADDR "org.freedesktop.StatusNotifierWatcher" #define INDICATOR_APPLICATION_DBUS_OBJ "/org/ayatana/indicator/application/service" #define INDICATOR_APPLICATION_DBUS_IFACE "org.ayatana.indicator.application.service" -#define NOTIFICATION_WATCHER_DBUS_OBJ "/org/ayatana/indicator/application/NotificationWatcher" -#define NOTIFICATION_WATCHER_DBUS_IFACE "org.ayatana.indicator.application.NotificationWatcher" +#define NOTIFICATION_WATCHER_DBUS_OBJ "/StatusNotifierWatcher" +#define NOTIFICATION_WATCHER_DBUS_IFACE "org.freedesktop.StatusNotifierWatcher" -#define NOTIFICATION_ITEM_DBUS_IFACE "org.ayatana.indicator.application.NotificationItem" +#define NOTIFICATION_ITEM_DBUS_IFACE "org.freedesktop.StatusNotifierItem" diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index bb68cb2..b4a4ed6 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -32,6 +32,7 @@ License version 3 and version 2.1 along with this program. If not, see #endif #include +#include #include #include @@ -293,7 +294,7 @@ app_indicator_init (AppIndicator *self) } dbus_g_connection_register_g_object(priv->connection, - "/need/a/path", + "/StatusNotifierItem", G_OBJECT(self)); self->priv = priv; @@ -513,7 +514,8 @@ check_connect (AppIndicator *self) return; } - org_ayatana_indicator_application_NotificationWatcher_register_service_async(priv->watcher_proxy, "/need/a/path", register_service_cb, self); + const char * name = dbus_bus_get_unique_name(dbus_g_connection_get_connection(priv->connection)); + org_freedesktop_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, name, register_service_cb, self); return; } diff --git a/src/notification-item.xml b/src/notification-item.xml index c28cc54..93ff903 100644 --- a/src/notification-item.xml +++ b/src/notification-item.xml @@ -1,6 +1,6 @@ - - + + diff --git a/src/notification-watcher.xml b/src/notification-watcher.xml index 2ef54a0..22ada5f 100644 --- a/src/notification-watcher.xml +++ b/src/notification-watcher.xml @@ -1,16 +1,16 @@ - - + + - + - + -- cgit v1.2.3 From 83b4f68c5a188d3826beefbe2adddecc0f0a4668 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 8 Jan 2010 08:04:07 -0600 Subject: Changing the property to 'IconThemePath' to make it more clear about what it adjusts. --- docs/reference/tmpl/libappindicator-unused.sgml | 6 ++++++ src/application-service-appstore.c | 2 +- src/libappindicator/app-indicator.c | 16 ++++++++-------- src/notification-item.xml | 4 +++- 4 files changed, 18 insertions(+), 10 deletions(-) (limited to 'src/notification-item.xml') diff --git a/docs/reference/tmpl/libappindicator-unused.sgml b/docs/reference/tmpl/libappindicator-unused.sgml index e69de29..1428b51 100644 --- a/docs/reference/tmpl/libappindicator-unused.sgml +++ b/docs/reference/tmpl/libappindicator-unused.sgml @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 1ac309a..f76bbe2 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -40,7 +40,7 @@ static gboolean _application_service_server_get_applications (ApplicationService #define NOTIFICATION_ITEM_PROP_STATUS "Status" #define NOTIFICATION_ITEM_PROP_ICON_NAME "IconName" #define NOTIFICATION_ITEM_PROP_AICON_NAME "AttentionIconName" -#define NOTIFICATION_ITEM_PROP_ICON_PATH "IconPath" +#define NOTIFICATION_ITEM_PROP_ICON_PATH "IconThemePath" #define NOTIFICATION_ITEM_PROP_MENU "Menu" /* Private Stuff */ diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c index d22161c..f9a7c88 100644 --- a/src/libappindicator/app-indicator.c +++ b/src/libappindicator/app-indicator.c @@ -92,7 +92,7 @@ enum { PROP_STATUS, PROP_ICON_NAME, PROP_ATTENTION_ICON_NAME, - PROP_ICON_PATH, + PROP_ICON_THEME_PATH, PROP_MENU, PROP_CONNECTED }; @@ -103,7 +103,7 @@ enum { #define PROP_STATUS_S "status" #define PROP_ICON_NAME_S "icon-name" #define PROP_ATTENTION_ICON_NAME_S "attention-icon-name" -#define PROP_ICON_PATH_S "icon-path" +#define PROP_ICON_THEME_PATH_S "icon-theme-path" #define PROP_MENU_S "menu" #define PROP_CONNECTED_S "connected" @@ -183,8 +183,8 @@ app_indicator_class_init (AppIndicatorClass *klass) G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property(object_class, - PROP_ICON_PATH, - g_param_spec_string (PROP_ICON_PATH_S, + PROP_ICON_THEME_PATH, + g_param_spec_string (PROP_ICON_THEME_PATH_S, "An additional path for custom icons.", "An additional place to look for icon names that may be installed by the application.", NULL, @@ -440,7 +440,7 @@ app_indicator_set_property (GObject * object, guint prop_id, const GValue * valu g_value_get_string (value)); break; - case PROP_ICON_PATH: + case PROP_ICON_THEME_PATH: if (priv->icon_path != NULL) { g_free(priv->icon_path); } @@ -486,7 +486,7 @@ app_indicator_get_property (GObject * object, guint prop_id, GValue * value, GPa g_value_set_string (value, priv->attention_icon_name); break; - case PROP_ICON_PATH: + case PROP_ICON_THEME_PATH: g_value_set_string (value, priv->icon_path); break; @@ -610,7 +610,7 @@ app_indicator_new (const gchar *id, Creates a new #AppIndicator setting the properties: #AppIndicator::id with @id, #AppIndicator::category with @category, #AppIndicator::icon-name with - @icon_name and #AppIndicator::icon-path with @icon_path. + @icon_name and #AppIndicator::icon-theme-path with @icon_path. Return value: A pointer to a new #AppIndicator object. */ @@ -624,7 +624,7 @@ app_indicator_new_with_path (const gchar *id, "id", id, "category", category_from_enum (category), "icon-name", icon_name, - "icon-path", icon_path, + "icon-theme-path", icon_path, NULL); return indicator; diff --git a/src/notification-item.xml b/src/notification-item.xml index b671e38..f95db31 100644 --- a/src/notification-item.xml +++ b/src/notification-item.xml @@ -8,7 +8,9 @@ - + + -- cgit v1.2.3