Updates from Ubuntu Desktop

21 files changed, 758 insertions, 114 deletions

diff --git a/ChangeLog b/ChangeLog
index 0e4d23a..5ac200b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,43 @@
 # Generated by Makefile. Do not edit.
 
+2011-01-13  Ken VanDine  <ken.vandine@canonical.com>
+
+	com.canonical rename
+
+2011-01-13  Ken VanDine  <ken.vandine@canonical.com>
+
+	Canonical.com conversion
+
+2011-01-13  Ken VanDine  <ken.vandine@canonical.com>
+
+	Merged
+
+2011-01-13  Ken VanDine  <ken.vandine@canonical.com>
+
+	merged
+	* avoid nulls when crafting variants
+	* use notdir in case make gives us full paths
+
+2011-01-13  Michael Terry  <mike@mterry.name>
+
+	aw shucks, do the required properties too, defensively
+
+2011-01-13  Michael Terry  <mike@mterry.name>
+
+	avoid nulls when crafting variants
+
+2011-01-13  Michael Terry  <mike@mterry.name>
+
+	use notdir in case make gives us full paths
+
+2011-01-13  Ken VanDine  <ken.vandine@canonical.com>
+
+	Fix the pkgconfig name for dbusmenu-glib-0.4
+
+2011-01-12  Ken VanDine  <ken.vandine@canonical.com>
+
+	Fix the pkgconfig name for dbusmenu-glib-0.4
+
 2010-12-08  Ted Gould  <ted@gould.cx>
 
 	0.2.91
diff --git a/configure b/configure
index 6503b7b..09e74ca 100755
--- a/configure
+++ b/configure
@@ -2829,7 +2829,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=libappindicator
- VERSION=0.2.91
+ VERSION=0.2.91.1
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 1623531..08035ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libappindicator, 0.2.91)
+AM_INIT_AUTOMAKE(libappindicator, 0.2.91.1)
 
 AM_MAINTAINER_MODE
 
diff --git a/debian/changelog b/debian/changelog
index aa2f1a3..641e75a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,627 @@
-libappindicator (0.2.91-0ubuntu1~ppa1) UNRELEASED; urgency=low
+libappindicator (0.2.91.1-0ubuntu1) natty; urgency=low
 
+  * New upstream release.
+    - rename dbus interface names com.canonical
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 13 Jan 2011 20:43:27 -0600
+
+libappindicator (0.2.91-0ubuntu1) natty; urgency=low
+  
+  * debian/control: 
+    - clean unrequired build-depends
+  * debian/compat: updated the version
+  * debian/copyright: 
+    - updated
+  * debian/libappindicator1.symbols: 
+    - use a .symbols for api tracking
+  * debian/watch: 
+    - updated product name
+
+  [ Ted Gould ]
   * Intial release.
 
- -- Ted Gould <ted@ubuntu.com>  Wed, 08 Dec 2010 16:28:55 -0600
+  [ Ken VanDine ]
+  * debian/rules
+    - Changes to build targets to get it building multipass for 
+      python 2.6 and 2.7 
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 13 Jan 2011 19:27:54 -0600
+
+indicator-application (0.2.90-0ubuntu4) natty; urgency=low
+
+  * Updated for the gir abi transition
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 16 Dec 2010 10:05:55 -0500
+
+indicator-application (0.2.90-0ubuntu3) natty; urgency=low
+
+  * debian/control
+    - build depend on dbusmenu >= 0.3.90
+    - Fixes FTBFS (LP: #684949)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 08 Dec 2010 13:32:07 -0500
+
+indicator-application (0.2.90-0ubuntu2) natty; urgency=low
+
+  * debian/rules
+    - Convert to dh_python2
+  * debian/control
+    - Dropped build depends for python-central 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 08 Dec 2010 12:03:47 -0500
+
+indicator-application (0.2.90-0ubuntu1) natty; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * A race fix on the dbus name (LP: #526499)
+    * Fixing the Watcher Interface
+    * Fixes to build with GTK 2/3
+    * Fixes to build with valac-0.12
+
+  [ Ken VanDine ]
+  * debian/control
+    - Changed the valac build depends to valac-0.12 
+  * debian/python-appindicator.install
+    - Make sure python2.6 and python2.7 files get included
+  * debian/rules
+    - Fix builds for multiple python versions
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 08 Dec 2010 00:42:58 -0500
+
+indicator-application (0.2.9-0ubuntu1) maverick; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * Fix Mono binding versioning and build (LP: #636132)
+    * Fix submenus with Glade applications (LP: #608219)
+    * Add new functions to Mono and Python bindings
+  * debian/libappindicator0.1-cil.installcligac: Add the 0.1
+    policy file.
+
+  [ Didier Roche ]
+  * debian/control:
+    - build with latest libindicator-dev for ABI breakage (LP: #637692)
+
+ -- Didier Roche <didrocks@ubuntu.com>  Wed, 22 Sep 2010 20:01:04 +0200
+
+indicator-application (0.2.8-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Update the icon if the item is visible (LP: #639643)
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 15 Sep 2010 15:05:15 -0500
+
+indicator-application (0.2.7-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Handle double registration of indicators (LP: #621838)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 09 Sep 2010 13:00:37 -0500
+
+indicator-application (0.2.6-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Fixing the position of new indicators (LP: #623205)
+    * Position the ibus and keyboard layout indicators correctly.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 26 Aug 2010 14:56:27 -0500
+
+indicator-application (0.2.5-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Making it so the approver actually approves indicators
+    * Fixing a small memory leak
+    * Allowing approvers to change thier mind
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 19 Aug 2010 14:00:03 -0500
+
+indicator-application (0.2.4-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Add in ordering IDs
+    * Adding label support into the library
+    * Adding label support into the indicator
+    * Breaking the ABI in order to get more space in the class
+      structure.
+    * Allow the icon theme path to be changed dynamically (LP: #607831)
+  * debian/control: Moving libappindicator0 to libappindicator1
+  * debian/rules: Moving libappindicator0 to libappindicator1
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 12 Aug 2010 13:57:17 -0500
+
+indicator-application (0.2.3-0ubuntu2) maverick; urgency=low
+
+  * Rebuild with the new gobject introspection
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 11 Aug 2010 11:07:51 +0200
+
+indicator-application (0.2.3-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Fixing test for slower machines
+    * Adding an Approver API to remove things from the AppIndicators.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 15 Jul 2010 10:22:33 -0500
+
+indicator-application (0.2.2-0ubuntu1) maverick; urgency=low
+
+  * debian/control, debian/rules:
+    - use dh_girepository and gir:Depends to get the gir depends, 
+      clean the build-depends on gir-repository-dev not required
+
+  [ Ted Gould ]
+  * New upstream release.
+    ∘ Work with updated container signal names (lp: #558841)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 08 Jul 2010 18:12:00 +0200
+
+indicator-application (0.2.1-0ubuntu1) maverick; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * Fix icon updating (LP: #594199)
+    * Change Mono bindings to only parse particular files (LP: #592706)
+    * Make a policy for migrating the mono bindings
+    * Test fixes to make them more reliable
+  * debian/control: Fixing version numbers
+  * debian/control: Making the 0.1-cil replace and provide the 0.0-cil 
+  * debian/libappindicator0.1-cil.installcligac: Add the policy.dll
+    file to the install.
+
+  [Ken VanDine]
+  * renamed cil binary to libappindicator0.1 to match the assembly 
+    version (LP: #592706)
+
+ -- Didier Roche <didrocks@ubuntu.com>  Tue, 22 Jun 2010 09:31:43 +0200
+
+indicator-application (0.2.0-0ubuntu2) maverick; urgency=low
+
+  * Renamed the gir binary to gir1.0-appindicator-0.1 to match the typelib
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 08 Jun 2010 11:01:04 +0200
+
+indicator-application (0.2.0-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Unref the child that was created
+    * Build GIR and VAPI files (LP: #510610)
+    * Fixes to documentation and enum construction
+    * Fix distcheck
+    * Merging patch to add assembly information to Mono
+      binding (LP: #547195)
+  * debian/control: Add GObject Introspection and Vala build
+    dependencies.
+  * Added debian/gir1.0-libappindicator-0.1.install and modified
+    debian/control and debian/libappindicator-dev.install to handle
+    the VAPI and GI files.
+  * debian/libappindicator0.0-cil.install: Fixing directory of cli files 
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 03 Jun 2010 14:49:48 -0500
+
+indicator-application (0.0.19-0ubuntu5) lucid-proposed; urgency=low
+
+  * debian/patches/child-leakage.patch
+    - Fixes a memory leak (LP: #569273)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 20 May 2010 07:35:33 -0400
+
+indicator-application (0.0.19-0ubuntu4) lucid; urgency=low
+
+  * bindings/mono/appindicator-sharp-0.1.pc.in:
+    + Fix pcfile to point to library install location (LP: #564506)
+  * debian/control,
+    debian/libappindicator0-cil.install,
+    debian/libappindicator0-cil.installcligac,
+    debian/libappindicator-cil-dev.install,
+    debian/libappindicator0.0-cil.install,
+    debian/libappindicator0.0-cil.installcligac,
+    debian/libappindicator0.1-cil-dev.install:
+    + Rename packages to comply with Debian CLI policy
+  * debian/libappindicator0.0-cil.install,
+    debian/libappindicator0.0-cil.installcligac:
+    + Fix library install location to comply with Debian CLI policy
+  * debian/control,
+    debian/rules:
+    + Pass CSC variable to use mono-csc default compiler from mono-devel
+      2.4.3, rather than the default 2.0-only compiler
+  * debian/rules:
+    + Fix processing of rules to track dependency information on Mono
+      binding, by running rules in correct order
+
+ -- Jo Shields <directhex@apebox.org>  Fri, 16 Apr 2010 10:42:48 +0100
+
+indicator-application (0.0.19-0ubuntu3) lucid; urgency=low
+
+  * Merging patch to add assembly information to Mono binding (LP: #547195)
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 14 Apr 2010 11:48:49 -0500
+
+indicator-application (0.0.19-0ubuntu2) lucid; urgency=low
+
+  * debian/control:
+    + Set libappindicator0-cil and libappindicator-cil-dev to Arch: all
+    + Make libappindicator0-cil depend on libappindicator0 >= ${source:Version}
+      instead
+  * debian/rules:
+    + Fix ordering of dh_*cli* (LP: #560095)
+  * debian/libappindicator0-cil.install,
+    debian/libappindicator0-cil.installcligac:
+    + Fix CLI policy breakage:
+      - Wrong installation paths for GAC'd CLI libraries
+      - Direct installation of GAC'd libraries
+
+ -- Chow Loong Jin <hyperair@ubuntu.com>  Wed, 14 Apr 2010 18:44:22 +0800
+
+indicator-application (0.0.19-0ubuntu1) lucid; urgency=low
+
+  * New upstream release.
+    * Setup the icons to use the -panel variants even when falling
+      back to status icons.  (LP: #547072)
+    * Change python bindings to use _with_path so that they can set
+      the icon path.  (LP: #527061)
+    * Don't set the fallback timer if we're already in a fallback
+      mode to avoid unfalling back excessively. (LP: #529052)
+    * Fix distcheck of documentation
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 01 Apr 2010 15:56:02 -0500
+
+indicator-application (0.0.18-0ubuntu1) lucid; urgency=low
+
+  * Upstream Release 0.0.18
+    * Change when there are updates to Check and Radio buttons via
+      their actions.  (LP: #542221)
+    * Fixing icon updating with themes and naming fallbacks with
+      the status icon fallback.  (LP: #532858)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 25 Mar 2010 12:14:23 -0500
+
+indicator-application (0.0.17-0ubuntu1) lucid; 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:11:00 -0500
+
+indicator-application (0.0.16-0ubuntu2) lucid; urgency=low
+
+  * Backported upstream change to respect gtk "always-show-image" (lp: #528527)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 15 Mar 2010 16:39:09 +0100
+
+indicator-application (0.0.16-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.0.16
+    * Use libindicator icon loading helper
+    * Workaround for label changes on GtkActions
+    * Testing fix for using xvfb
+  * debian/control: Increasing the libindicator-dev dependency to
+    0.3.5 to match upstream.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 11 Mar 2010 16:22:06 -0600
+
+indicator-application (0.0.15-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.0.15
+    * Icon size fix to 22 px
+    * Status icon correctly removed in fallback
+    * Fixed test suite to run better on slow machines.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Mar 2010 11:42:40 -0600
+
+indicator-application (0.0.14-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.0.14
+    ∘ Fix mono bindings to include proper metadata (LP: #526620)
+    ∘ Send connection changed signal when the proxy is created
+      and destroyed (LP: #527082)
+    ∘ Hide the fallback status icon before unrefing it. (LP: #526041)
+    ∘ Increase dbus-glib version check to 0.82
+    ∘ Handle menu layout changes and visibility changes better.
+    ∘ Improve testing stability
+    ∘ Read menu sensitivity on startup.
+    ∘ Handle null strings when evaluating whether we have an
+      attention icon.
+    ∘ Remove dbus objects when we fallback
+    ∘ Disconnect client_menu_changed signal handlers on cleanup.
+    ∘ Handle cases where the menu gets unset on updates.
+    ∘ Fix custom labels on stock items.
+    ∘ Adds support for submenus
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 25 Feb 2010 15:22:28 -0600
+
+indicator-application (0.0.13-0ubuntu8) lucid; urgency=low
+
+  * Upstream Merge
+    * Checking for dbus-glib version 0.82
+  * debian/control: Checking for dbus-glib >= 0.82
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 23 Feb 2010 10:30:27 -0600
+
+indicator-application (0.0.13-0ubuntu7) lucid; urgency=low
+
+  * Backported upstream change to fix menu item sensitivity update,
+    thanks to Jan Arne Petersen (lp: #522151)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 22 Feb 2010 17:49:23 +0100
+
+indicator-application (0.0.13-0ubuntu6) lucid; urgency=low
+
+  * Cherrypick fix to check for a null string as the attention icon 
+  * Cherrypick fix to remove the registration of dbus objects (LP: #497870)
+    - lets us drop debian/patches/unregister.patch
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 19 Feb 2010 18:52:40 +0100
+
+indicator-application (0.0.13-0ubuntu5) lucid; urgency=low
+
+  * debian/patches/unregister.patch
+    - Fix to remove the registration of dbus objects (LP: #497870) 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 19 Feb 2010 17:55:11 +0100
+
+indicator-application (0.0.13-0ubuntu4) lucid; urgency=low
+
+  * Backport Cody Russell's change to fix rhythmbox crashing on closing
+    (lp: #522942)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 17 Feb 2010 23:13:10 +0100
+
+indicator-application (0.0.13-0ubuntu3) lucid; urgency=low
+
+  * Backport trunk change to fix stock items labels (lp: #520048)
+  * Backport trunk change to fix menus update issues (lp: #521181)
+  * debian/control: updated standards-version
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 16 Feb 2010 16:22:31 +0100
+
+indicator-application (0.0.13-0ubuntu2) lucid; urgency=low
+
+  * Backported lp:~bratsche/indicator-application/submenus to make the submenus
+    working in the application indicators (lp: #519625)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 12 Feb 2010 17:12:58 +0100
+
+indicator-application (0.0.13-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.0.13
+    * Changing the menu property to be a proper DBus object path
+    * Make object paths unique by including application IDs in them
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 11 Feb 2010 10:41:53 -0600
+
+indicator-application (0.0.12-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.0.12
+    * Handling the service restarting better by removing the icons
+      after a small delay to ensure they don't return.
+    * Fixing a crash where a proxy was created while the previous
+      one was being destroyed.
+    * Fixing copying of the attention icon
+    * Adding status changing to the example application
+    * Adding a test for status changing getting sent over DBus.
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 08 Feb 2010 10:01:42 -0600
+
+indicator-application (0.0.11-0ubuntu1) lucid; urgency=low
+
+  * debian/control:
+    - updated libunit-cil build-depends
+
+  [ Ted Gould ]
+  * Upstream release 0.0.11
+    * Interoperability Fixes
+    * Adding in XVFB support for tests
+    * Adding support for icons with the '-panel' suffix
+  * debian/control: Increasing dbusmenu* deps to 0.2.2
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 04 Feb 2010 17:35:19 -0800
+
+indicator-application (0.0.10-0ubuntu2) lucid; urgency=low
+
+  * debian/control
+    - bumped build depends version for libindicator-dev to 0.3.1 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 21 Jan 2010 16:38:18 -0500
+
+indicator-application (0.0.10-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.0.10
+    * Adding in a file to position the indicators
+    * Ref counting theme directories as they get added and removed
+    * Use the right callback function for fallback (LP: #507975)
+    * Support getting the app list from a running service.
+  * debian/control: Adding dependency for json-glib to build.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 21 Jan 2010 14:21:00 -0600
+
+indicator-application (0.0.9-0ubuntu3) lucid; urgency=low
+
+  * debian/control:
+    - updated the build-depends for the gtk binding changes.
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 19 Jan 2010 22:57:02 +0100
+
+indicator-application (0.0.9-0ubuntu2) lucid; urgency=low
+
+  * Backport an upstream change to a fallback situation crasher 
+    (lp: #507975)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 19 Jan 2010 20:52:41 +0100
+
+indicator-application (0.0.9-0ubuntu1) lucid; urgency=low
+
+  * Upstream Release 0.0.9
+    * Add fallback support for situations where the NotificationWatcher
+      isn't available.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 14 Jan 2010 10:39:43 -0600
+
+indicator-application (0.0.8-0ubuntu1) lucid; urgency=low
+
+  * Upstream Release 0.0.8
+    - Mono bindings fixes (LP: #505923)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 12 Jan 2010 01:35:44 -0500
+
+indicator-application (0.0.7-0ubuntu1) lucid; urgency=low
+
+  * Upstream Release 0.0.7
+    * Making the Notification Watcher register for it's own DBus
+      name to keep the service one unique.
+    * Adding support for icons changing through the service and
+      in the indicator.
+    * Fixing the generated headers for DBus Properties calls
+    * Fixing libappindicator set_icon to set the right icon.
+    * Adding in icon path support.
+    * Switching DBus interface to org.freedesktop
+    * Adding check/radio support to menu parsing
+    * Adding ChangeLog to dist
+    * Adding check item support to menu parsing
+
+  [Ken VanDine]
+  * debian/control
+    - bump build depends version of libdbusmenu to 0.2.0
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 08 Jan 2010 16:05:39 -0600
+
+indicator-application (0.0.6-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.0.6
+    * Include Python binding
+    * Include Mono binding
+    * Minor bug fixes
+    * Fixing when menus are set twice.  (LP: #497812)
+    * Keeping a constant signature for the library instead of
+      building it each time.
+  * debian/control, debian/python-appindicator.install: Building
+    a binary package for the python bindings.
+  * debian/control: Adding python building build deps
+  * debian/control, debian/libappindicator0-cil.install: Building
+    a binary package for the Mono bindings.
+  * debian/control: Adding Mono building build deps
+
+  [Ken VanDine]
+  * Added mono bindings 
+    - debian/libappindicator0-cil.install
+    - debian/libappindicator0-cil-dev.install
+    - debian/control
+  * debian/rules
+    - don't use gnome.mk, specify all the targets to build python
+      bindings for each supported python version
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 17 Dec 2009 14:45:50 -0600
+
+indicator-application (0.0.4-0ubuntu2) lucid; urgency=low
+
+  * debian/control
+    - make libappindicator0 recommend indicator-application
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 15 Dec 2009 10:40:07 -0500
+
+indicator-application (0.0.4-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.0.4
+  * debian/rules:
+    - removed the disable-scrollkeeper configure arg
+    - don't include .la and .a files
+  * debian/patches/clean_up_docs.patch
+    - removed, merged upstream
+  * debian/control:
+    - removed Build-Depend for scrollkeeper
+    - libappindicator-dev needs to depend on libdbusmenu-glib-dev
+    - bump standards version to 3.8.3
+    - libappindicator-doc doesn't need to depend on libappindicator0
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 11 Dec 2009 09:18:58 -0500
+
+indicator-application (0.0.3-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.0.3
+    * Adding in documentation
+    * Adding a pkg-config .pc file for libappindicator
+    * More GtkMenu support in libappindicator
+  * debian/libappindicator-dev.install: Adding pkgconfig files. 
+  * debian/control: Adding a build dep on gtk-doc-tools 
+  * debian/control: Increasing libdbusmenu requirements to 0.1.8
+
+  [Ken VanDine]
+  * debian/control
+    - set Vcs-Bzr to ~ubuntu-desktop
+    - set libappindicator-doc arch all
+    - make libappindicator-dev depend on libappindicator0
+  * debian/libappindicator-doc.install
+    - install the developer docs
+  * debian/rules
+    - enable-gtk-doc
+    - added simple-patchsys.mk
+  * debian/patches/clean_up_docs.patch
+    - Remove template values and set a proper title
+  * debian/copyright
+    - Include the proper licenses (LGPL-2.1 and LGPL-3)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Dec 2009 13:34:40 -0600
+
+indicator-application (0.0.2-0ubuntu1~ppa1) karmic; urgency=low
+
+  * Upstream release 0.0.2
+    * Updates API to use GTK instead of dbusmenu to make it
+      easier for upstream developers to use.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 04 Dec 2009 14:50:45 -0600
+
+indicator-application (0.0.2-0~ppa3) karmic; urgency=low
+
+  * debian/watch:
+    - Updated url to point to the LP project 
+  * debian/control
+    - Updated Vcs-Bzr, project urls and description
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 10 Dec 2009 09:00:06 -0500
+
+indicator-application (0.0.1-0ubuntu3~ppa4) karmic; urgency=low
+
+  * Adding in copyright headers and licenses
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 02 Dec 2009 12:17:00 -0600
+
+indicator-application (0.0.1-0ubuntu3~ppa3) karmic; urgency=low
+
+  * Massive name change.
+  * debian/* changing packaging to not be "custom" anymore and now
+    everything is "application"
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 02 Dec 2009 12:06:25 -0600
+
+indicator-application (0.0.1-0ubuntu3~ppa2) karmic; urgency=low
+
+  * Implementing the service and having the indicator and app
+    library start using it.
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 02 Dec 2009 11:58:08 -0600
+
+indicator-application (0.0.1-0ubuntu3~ppa1) karmic; urgency=low
+
+  * Flesh out the library to have stuff working.
+  * Updating test suite to run under dbus-test-runner.
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 01 Dec 2009 09:17:24 -0600
+
+indicator-application (0.0.1-0ubuntu2) karmic; urgency=low
+
+  * debian/control: Splitting out libappindicator
+  * Adding debian/libappindicator0.install,
+    debian/libappindicator-dev.install,
+    debian/indicator-application.install
+    to make all the different packages.
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 02 Nov 2009 21:41:20 -0600
+
+indicator-application (0.0.1-0ubuntu1) karmic; urgency=low
+
+  * Development packaging edition.
+
+ -- Robert Collins <robert@canonical.com>  Thu, 29 Oct 2009 15:44:14 +1100
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index f87b2aa..01133f5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,10 @@ Section: gnome
 Priority: optional
 XS-Python-Version: all
 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
-Build-Depends: debhelper (>= 5.0),
+Build-Depends: debhelper (>= 7.0),
                cdbs (>= 0.4.41),
                libgtk2.0-dev (>= 2.12.0),
                libdbus-glib-1-dev (>= 0.82),
-               libjson-glib-dev,
                gnome-doc-utils,
                gtk-doc-tools,
                intltool,
@@ -16,8 +15,8 @@ Build-Depends: debhelper (>= 5.0),
                libindicate-dev (>= 0.2.0),
                libindicate-gtk-dev (>= 0.2.0),
                libindicator-dev (>= 0.3.14),
-               libdbusmenu-gtk-dev (>= 0.3.90),
-               libdbusmenu-glib-dev (>= 0.3.90),
+               libdbusmenu-gtk-dev (>= 0.3.91),
+               libdbusmenu-glib-dev (>= 0.3.91),
                cli-common-dev (>= 0.5.7),
                mono-devel (>= 2.4.3),
                gtk-sharp2-gapi,
@@ -26,12 +25,26 @@ Build-Depends: debhelper (>= 5.0),
                libgtk2.0-cil-dev,
                gobject-introspection,
                libgirepository1.0-dev,
-               gir1.0-glib-2.0,
-               gir1.0-gtk-2.0,
+               gir1.2-glib-2.0,
+               gir1.2-gtk-2.0,
                valac-0.12
-Standards-Version: 3.8.4
-Homepage: https://launchpad.net/indicator-application
-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-application/ubuntu
+Standards-Version: 3.9.1
+Homepage: https://launchpad.net/libappindicator
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/libappindicator/ubuntu
+
+Package: python-appindicator
+Section: python
+Architecture: any
+XB-Python-Version: ${python:Versions}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ${python:Depends},
+         libappindicator1 (= ${binary:Version}),
+         python-gobject
+Provides: ${python:Provides}
+Description: Python bindings for libappindicator
+ This package provides Python bindings so that you can use libappindicator from 
+ a Python program.
 
 Package: libappindicator1
 Section: libs
@@ -101,7 +114,9 @@ Description: Application Indicators
  .
  This package contains files that are needed to build applications.
 
-Package: gir1.0-appindicator-0.1
+Package: gir1.2-appindicator-0.1
+Conflicts: gir1.0-appindicator-0.1
+Replaces: gir1.0-appindicator-0.1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -111,17 +126,3 @@ Description: Typelib files for libappindicator1.
  .
  This package can be used by other packages using the GIRepository format
  to generate dynamic bindings.
-
-Package: python-appindicator
-Section: python
-Architecture: any
-XB-Python-Version: ${python:Versions}
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         ${python:Depends},
-         libappindicator1 (= ${binary:Version}),
-         python-gobject
-Provides: ${python:Provides}
-Description: Python bindings for libappindicator
- This package provides Python bindings so that you can use libappindicator from 
- a Python program.
diff --git a/debian/copyright b/debian/copyright
index ba92c05..bd8f0d9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,60 +1,19 @@
-This package was debianized by Robert Collins <robert@canonical.com> on
-Thu, 29 Oct 2009 15:44:14 +1100
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Upstream-Name: libappindicator
+Upstream-Maintainer: Ted Gould <ted@ubuntu.com>
+Upstream-Source: https://launchpad.net/libappindicator
+
+Files: *
+Copyright: (C) 2009, 2010 Canonical Ltd.
+License: GPL v3
+ The full text of the GPL is distributed in
+ /usr/share/common-licenses/GPL-3 on Debian systems.
+ 
+Files: bindings/python, src/app-indicator-enum-types.h.in,
+       src/app-indicator-enum-types.c, src/app-indicator.h, src/app-indicator.c:
+Copyright: (C) 2009, 2010 Canonical Ltd.
+License: LGPL v2.1
+ The full text of the LGPL is distributed in
+ /usr/share/common-licenses/LGPL-2.1 on Debian systems.
+ 
 
-It was downloaded from <http://launchpad.net/indicator-application/>
-
-Upstream Author:
-
-    Ted Gould <ted@canonical.com>
-
-Copyright:
-
-    Copyright (C) 2009 Canonical Ltd.
-
-License:
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, version 3 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-Two files (app-indicator.c and app-indicator.h) are under:
-
-  1) the GNU Lesser General Public License version 3, as published by the
-     Free Software Foundation; and/or
-  2) the GNU Lesser General Public License version 2.1, as published by
-     the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
-  PURPOSE.  See the applicable version of the GNU Lesser General Public
-  License for more details.
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Lesser General Public
-  License as published by the Free Software Foundation; either
-  version 2.1 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-  Boston, MA 02110-1301 USA
-
-On Debian/Ubuntu systems, the full text of the LGPL v2.1 can be found in
-`/usr/share/common-licenses/LGPL-2.1', the full text of the LGPL v3 can be found in
-`/usr/share/common-licenses/LGPL-3, and the full text of the GPL v3 can be
-found in `/usr/share/common-licenses/GPL-3'
diff --git a/debian/gir1.0-appindicator-0.1.install b/debian/gir1.2-appindicator-0.1.install
index 0791348..0791348 100644
--- a/debian/gir1.0-appindicator-0.1.install
+++ b/debian/gir1.2-appindicator-0.1.install
diff --git a/debian/libappindicator1.symbols b/debian/libappindicator1.symbols
new file mode 100644
index 0000000..2e4d622
--- /dev/null
+++ b/debian/libappindicator1.symbols
@@ -0,0 +1,24 @@
+libappindicator.so.1 libappindicator1 #MINVER#
+ app_indicator_build_menu_from_desktop@Base 0.2.91
+ app_indicator_category_get_type@Base 0.2.91
+ app_indicator_get_attention_icon@Base 0.2.91
+ app_indicator_get_category@Base 0.2.91
+ app_indicator_get_icon@Base 0.2.91
+ app_indicator_get_icon_theme_path@Base 0.2.91
+ app_indicator_get_id@Base 0.2.91
+ app_indicator_get_label@Base 0.2.91
+ app_indicator_get_label_guide@Base 0.2.91
+ app_indicator_get_menu@Base 0.2.91
+ app_indicator_get_ordering_index@Base 0.2.91
+ app_indicator_get_status@Base 0.2.91
+ app_indicator_get_type@Base 0.2.91
+ app_indicator_new@Base 0.2.91
+ app_indicator_new_with_path@Base 0.2.91
+ app_indicator_set_attention_icon@Base 0.2.91
+ app_indicator_set_icon@Base 0.2.91
+ app_indicator_set_icon_theme_path@Base 0.2.91
+ app_indicator_set_label@Base 0.2.91
+ app_indicator_set_menu@Base 0.2.91
+ app_indicator_set_ordering_index@Base 0.2.91
+ app_indicator_set_status@Base 0.2.91
+ app_indicator_status_get_type@Base 0.2.91
diff --git a/debian/rules b/debian/rules
index 324b6ff..4c624b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,19 +63,19 @@ configure-stamp:
 		$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)
 	touch $@
 
-configure/libappindicator:: configure-stamp
+configure/libappindicator1:: configure-stamp
 
 build-stamp:
 	$(MAKE) -C $(DEB_BUILDDIR)
 	touch $@
 
-build/libappindicator:: build-stamp
+build/libappindicator1:: build-stamp
 
 install-stamp:
 	$(MAKE) -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp
 	touch $@
 
-install/libappindicator:: install-stamp
+install/libappindicator1:: install-stamp
 
 binary-predeb/libappindicator1:: install-stamp
 	dh_fixperms
diff --git a/docs/reference/html/ch01.html b/docs/reference/html/ch01.html
index c46e493..cb92e31 100644
--- a/docs/reference/html/ch01.html
+++ b/docs/reference/html/ch01.html
@@ -21,7 +21,7 @@
 </tr></table>
 <div class="chapter" title="Base Classes for Applications">
 <div class="titlepage"><div><div><h2 class="title">
-<a name="id535850"></a>Base Classes for Applications</h2></div></div></div>
+<a name="id586299"></a>Base Classes for Applications</h2></div></div></div>
 <div class="toc"><dl><dt>
 <span class="refentrytitle"><a href="libappindicator-app-indicator.html">AppIndicator</a></span><span class="refpurpose"> — An object to put application information
 		into the panel.</span>
diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html
index bde5569..5b78370 100644
--- a/docs/reference/html/index.html
+++ b/docs/reference/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libappindicator Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      for libappindicator 0.2.91
+      for libappindicator 0.2.91.1
     </p></div>
 </div>
 <hr>
diff --git a/docs/reference/html/libappindicator-app-indicator.html b/docs/reference/html/libappindicator-app-indicator.html
index 94cf302..51b0263 100644
--- a/docs/reference/html/libappindicator-app-indicator.html
+++ b/docs/reference/html/libappindicator-app-indicator.html
@@ -703,7 +703,7 @@ Sets the menu that should be shown when the Application Indicator
         is clicked on in the panel.  An application indicator will not
         be rendered unless it has a menu.
         
-        Wrapper function for property <a href="/usr/share/gtk-doc/html/libappindicator/libappindicator-app-indicator.html#AppIndicator--menu"><span class="type">"menu"</span></a>.
+        Wrapper function for property <span class="type">"menu"</span>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -977,7 +977,7 @@ Wrapper function for property <a class="link" href="libappindicator-app-indicato
 <pre class="programlisting"><a href="http://library.gnome.org/devel/gtk/unstable/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> *           app_indicator_get_menu              (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre>
 <p>
 Gets the menu being used for this application indicator.
-	Wrapper function for property <a href="/usr/share/gtk-doc/html/libappindicator/libappindicator-app-indicator.html#AppIndicator--menu"><span class="type">"menu"</span></a>.
+	Wrapper function for property <span class="type">"menu"</span>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
diff --git a/docs/reference/libappindicator-docs.sgml b/docs/reference/libappindicator-docs.sgml
index ae88cff..9d2f8a8 100644
--- a/docs/reference/libappindicator-docs.sgml
+++ b/docs/reference/libappindicator-docs.sgml
@@ -8,7 +8,7 @@
   <bookinfo>
     <title>libappindicator Reference Manual</title>
     <releaseinfo>
-      for libappindicator 0.2.91
+      for libappindicator 0.2.91.1
     </releaseinfo>
   </bookinfo>
 
diff --git a/docs/reference/version.xml b/docs/reference/version.xml
index 43a6317..32d6842 100644
--- a/docs/reference/version.xml
+++ b/docs/reference/version.xml
@@ -1 +1 @@
-0.2.91
+0.2.91.1
diff --git a/src/Makefile.am b/src/Makefile.am
index a5ea29b..069247f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,11 +101,11 @@ DBUS_SPECS = \
 
 gen-%.xml.h: %.xml
 	@echo "Building $@ from $<"
-	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@
+	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
 
 gen-%.xml.c: %.xml
 	@echo "Building $@ from $<"
-	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@
+	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
 	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
 	@echo ";" >> $@
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 75da889..7457ff8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1089,11 +1089,11 @@ $(marshal_c): $(marshal_h)
 
 gen-%.xml.h: %.xml
 	@echo "Building $@ from $<"
-	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@
+	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
 
 gen-%.xml.c: %.xml
 	@echo "Building $@ from $<"
-	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@
+	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
 	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
 	@echo ";" >> $@
 
diff --git a/src/app-indicator.c b/src/app-indicator.c
index babdaf5..40959bf 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -909,21 +909,21 @@ bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar *
 	AppIndicatorPrivate *priv = app->priv;
 
 	if (g_strcmp0(property, "Id") == 0) {
-		return g_variant_new_string(app->priv->id);
+		return g_variant_new_string(app->priv->id ? app->priv->id : "");
 	} else if (g_strcmp0(property, "Category") == 0) {
         GEnumValue *enum_value;
 		enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_CATEGORY), priv->category);
-		return g_variant_new_string(enum_value->value_nick);
+		return g_variant_new_string(enum_value->value_nick ? enum_value->value_nick : "");
 	} else if (g_strcmp0(property, "Status") == 0) {
         GEnumValue *enum_value;
 		enum_value = g_enum_get_value ((GEnumClass *) g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), priv->status);
-		return g_variant_new_string(enum_value->value_nick);
+		return g_variant_new_string(enum_value->value_nick ? enum_value->value_nick : "");
 	} else if (g_strcmp0(property, "IconName") == 0) {
-		return g_variant_new_string(priv->icon_name);
+		return g_variant_new_string(priv->icon_name ? priv->icon_name : "");
 	} else if (g_strcmp0(property, "AttentionIconName") == 0) {
-		return g_variant_new_string(priv->attention_icon_name);
+		return g_variant_new_string(priv->attention_icon_name ? priv->attention_icon_name : "");
 	} else if (g_strcmp0(property, "IconThemePath") == 0) {
-		return g_variant_new_string(priv->icon_theme_path);
+		return g_variant_new_string(priv->icon_theme_path ? priv->icon_theme_path : "");
 	} else if (g_strcmp0(property, "Menu") == 0) {
 		if (priv->menuservice != NULL) {
 			GValue strval = { 0 };
@@ -936,9 +936,9 @@ bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar *
 			return g_variant_new("o", "/");
 		}
 	} else if (g_strcmp0(property, "XAyatanaLabel") == 0) {
-		return g_variant_new_string(priv->label);
+		return g_variant_new_string(priv->label ? priv->label : "");
 	} else if (g_strcmp0(property, "XAyatanaLabelGuide") == 0) {
-		return g_variant_new_string(priv->label_guide);
+		return g_variant_new_string(priv->label_guide ? priv->label_guide : "");
 	} else if (g_strcmp0(property, "XAyatanaOrderingIndex") == 0) {
 		return g_variant_new_uint32(priv->ordering_index);
 	}
diff --git a/src/appindicator-0.1.pc.in b/src/appindicator-0.1.pc.in
index b80fded..d885fd3 100644
--- a/src/appindicator-0.1.pc.in
+++ b/src/appindicator-0.1.pc.in
@@ -5,7 +5,7 @@ bindir=@bindir@
 includedir=@includedir@
 
 Cflags: -I${includedir}/libappindicator-0.1
-Requires: dbusmenu-glib gtk+-2.0
+Requires: dbusmenu-glib-0.4 gtk+-2.0
 Libs: -L${libdir} -lappindicator
 
 Name: appindicator-0.1
diff --git a/src/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in
index a485910..f59ac70 100644
--- a/src/appindicator3-0.1.pc.in
+++ b/src/appindicator3-0.1.pc.in
@@ -5,7 +5,7 @@ bindir=@bindir@
 includedir=@includedir@
 
 Cflags: -I${includedir}/libappindicator3-0.1
-Requires: dbusmenu-glib gtk+-3.0
+Requires: dbusmenu-glib-0.4 gtk+-3.0
 Libs: -L${libdir} -lappindicator3
 
 Name: appindicator3-0.1
diff --git a/src/dbus-shared.h b/src/dbus-shared.h
index 1d8d89c..71c063e 100644
--- a/src/dbus-shared.h
+++ b/src/dbus-shared.h
@@ -20,9 +20,9 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-#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 INDICATOR_APPLICATION_DBUS_ADDR        "com.canonical.indicator.application"
+#define INDICATOR_APPLICATION_DBUS_OBJ         "/com/canonical/indicator/application/service"
+#define INDICATOR_APPLICATION_DBUS_IFACE       "com.canonical.indicator.application.service"
 
 #define NOTIFICATION_WATCHER_DBUS_ADDR    "org.kde.StatusNotifierWatcher"
 #define NOTIFICATION_WATCHER_DBUS_OBJ     "/StatusNotifierWatcher"