aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-01-11 23:48:20 -0600
committerTed Gould <ted@gould.cx>2010-01-11 23:48:20 -0600
commit356a1cedb017cd4c5b4dfc32183c277e2e486b31 (patch)
tree55d671436cea91397d314c42372c742996d9e4f1
parent807982e2a158d62c429fa7facc3e24334439bb60 (diff)
parentd104014dddb2cfcde197b6c70ca3765a624ba23f (diff)
downloadlibayatana-appindicator-356a1cedb017cd4c5b4dfc32183c277e2e486b31.tar.gz
libayatana-appindicator-356a1cedb017cd4c5b4dfc32183c277e2e486b31.tar.bz2
libayatana-appindicator-356a1cedb017cd4c5b4dfc32183c277e2e486b31.zip
* Upstream update
* Better default object names.
-rw-r--r--debian/changelog7
-rw-r--r--src/libappindicator/app-indicator.c10
2 files changed, 14 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 3efdddf..3438ea1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-application (0.0.7-0ubuntu1~ppa4) UNRELEASED; urgency=low
+
+ * Upstream update
+ * Better default object names.
+
+ -- Ted Gould <ted@ubuntu.com> Mon, 11 Jan 2010 23:48:03 -0600
+
indicator-application (0.0.7-0ubuntu1~ppa3) karmic; urgency=low
* Upstream update
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index f115068..0767734 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -111,6 +111,10 @@ enum {
#define APP_INDICATOR_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), APP_INDICATOR_TYPE, AppIndicatorPrivate))
+/* Default Paths */
+#define DEFAULT_ITEM_PATH "/org/ayatana/NotificationItem"
+#define DEFAULT_MENU_PATH "/org/ayatana/NotificationItem/Menu"
+
/* Boiler plate */
static void app_indicator_class_init (AppIndicatorClass *klass);
static void app_indicator_init (AppIndicator *self);
@@ -305,7 +309,7 @@ app_indicator_init (AppIndicator *self)
}
dbus_g_connection_register_g_object(priv->connection,
- "/need/a/path",
+ DEFAULT_ITEM_PATH,
G_OBJECT(self));
self->priv = priv;
@@ -541,7 +545,7 @@ check_connect (AppIndicator *self)
return;
}
- org_freedesktop_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, "/need/a/path", register_service_cb, self);
+ org_freedesktop_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, DEFAULT_ITEM_PATH, register_service_cb, self);
return;
}
@@ -870,7 +874,7 @@ setup_dbusmenu (AppIndicator *self)
root);
if (priv->menuservice == NULL) {
- priv->menuservice = dbusmenu_server_new ("/need/a/menu/path");
+ priv->menuservice = dbusmenu_server_new (DEFAULT_MENU_PATH);
}
dbusmenu_server_set_root (priv->menuservice, root);