* Upstream Release 0.0.17

  * Support GTK's show menu items property (LP: #528527)
  * Fix status and category nicks in Python bindings (LP: #539858)
  * Switch domains to org.kde instead of org.freedesktop as spec
    was never officially approved by that body.

7 files changed, 26 insertions, 16 deletions

diff --git a/bindings/python/appindicator.defs b/bindings/python/appindicator.defs
index 0349b64..4498465 100644
--- a/bindings/python/appindicator.defs
+++ b/bindings/python/appindicator.defs
@@ -14,11 +14,11 @@
   (c-name "AppIndicatorCategory")
   (gtype-id "APP_INDICATOR_TYPE_INDICATOR_CATEGORY")
   (values
-    '("application-status" "APP_INDICATOR_CATEGORY_APPLICATION_STATUS")
-    '("communications" "APP_INDICATOR_CATEGORY_COMMUNICATIONS")
-    '("system-services" "APP_INDICATOR_CATEGORY_SYSTEM_SERVICES")
-    '("hardware" "APP_INDICATOR_CATEGORY_HARDWARE")
-    '("other" "APP_INDICATOR_CATEGORY_OTHER")
+    '("ApplicationStatus" "APP_INDICATOR_CATEGORY_APPLICATION_STATUS")
+    '("Communications" "APP_INDICATOR_CATEGORY_COMMUNICATIONS")
+    '("SystemServices" "APP_INDICATOR_CATEGORY_SYSTEM_SERVICES")
+    '("Hardware" "APP_INDICATOR_CATEGORY_HARDWARE")
+    '("Other" "APP_INDICATOR_CATEGORY_OTHER")
   )
 )
 
@@ -27,9 +27,9 @@
   (c-name "AppIndicatorStatus")
   (gtype-id "APP_INDICATOR_TYPE_INDICATOR_STATUS")
   (values
-    '("passive" "APP_INDICATOR_STATUS_PASSIVE")
-    '("active" "APP_INDICATOR_STATUS_ACTIVE")
-    '("attention" "APP_INDICATOR_STATUS_ATTENTION")
+    '("Passive" "APP_INDICATOR_STATUS_PASSIVE")
+    '("Active" "APP_INDICATOR_STATUS_ACTIVE")
+    '("NeedsAttention" "APP_INDICATOR_STATUS_ATTENTION")
   )
 )
 
diff --git a/configure.ac b/configure.ac
index f260512..8f099ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-application, 0.0.16, ted@canonical.com)
+AC_INIT(indicator-application, 0.0.17, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.0.16)
+AM_INIT_AUTOMAKE(indicator-application, 0.0.17)
 
 AM_MAINTAINER_MODE
 
diff --git a/debian/changelog b/debian/changelog
index 6b7a0fb..606cb6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+indicator-application (0.0.17-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+  * Upstream Release 0.0.17
+    * Support GTK's show menu items property (LP: #528527)
+    * Fix status and category nicks in Python bindings (LP: #539858)
+    * Switch domains to org.kde instead of org.freedesktop as spec
+      was never officially approved by that body.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 18 Mar 2010 13:06:23 -0500
+
 indicator-application (0.0.16-0ubuntu2) lucid; urgency=low
 
   * Backported upstream change to respect gtk "always-show-image" (lp: #528527)
diff --git a/src/dbus-shared.h b/src/dbus-shared.h
index b8dc016..f158b1c 100644
--- a/src/dbus-shared.h
+++ b/src/dbus-shared.h
@@ -24,10 +24,10 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define INDICATOR_APPLICATION_DBUS_OBJ         "/org/ayatana/indicator/application/service"
 #define INDICATOR_APPLICATION_DBUS_IFACE       "org.ayatana.indicator.application.service"
 
-#define NOTIFICATION_WATCHER_DBUS_ADDR    "org.freedesktop.StatusNotifierWatcher"
+#define NOTIFICATION_WATCHER_DBUS_ADDR    "org.kde.StatusNotifierWatcher"
 #define NOTIFICATION_WATCHER_DBUS_OBJ     "/StatusNotifierWatcher"
-#define NOTIFICATION_WATCHER_DBUS_IFACE   "org.freedesktop.StatusNotifierWatcher"
+#define NOTIFICATION_WATCHER_DBUS_IFACE   "org.kde.StatusNotifierWatcher"
 
-#define NOTIFICATION_ITEM_DBUS_IFACE      "org.freedesktop.StatusNotifierItem"
+#define NOTIFICATION_ITEM_DBUS_IFACE      "org.kde.StatusNotifierItem"
 #define NOTIFICATION_ITEM_DEFAULT_OBJ     "/StatusNotifierItem"
 
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 5689c11..1dce0a0 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -625,7 +625,7 @@ check_connect (AppIndicator *self)
 	}
 
 	g_signal_connect(G_OBJECT(priv->watcher_proxy), "destroy", G_CALLBACK(watcher_proxy_destroyed), self);
-	org_freedesktop_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, path, register_service_cb, self);
+	org_kde_StatusNotifierWatcher_register_status_notifier_item_async(priv->watcher_proxy, path, register_service_cb, self);
 	g_free(path);
 
 	/* Emit the AppIndicator::connection-changed signal*/
diff --git a/src/notification-item.xml b/src/notification-item.xml
index bcc3a4a..a0141c3 100644
--- a/src/notification-item.xml
+++ b/src/notification-item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/StatusNotifierItem">
-	<interface name="org.freedesktop.StatusNotifierItem">
+	<interface name="org.kde.StatusNotifierItem">
 
 <!-- Properties -->
 		<property name="Id" type="s" access="read" />
diff --git a/src/notification-watcher.xml b/src/notification-watcher.xml
index 22ada5f..c2324f1 100644
--- a/src/notification-watcher.xml
+++ b/src/notification-watcher.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/StatusNotifierWatcher">
-	<interface name="org.freedesktop.StatusNotifierWatcher">
+	<interface name="org.kde.StatusNotifierWatcher">
 
 <!-- Properties -->
 		<!-- None currently -->