17 files changed, 914 insertions, 205 deletions

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
new file mode 100644
index 0000000..36c28f8
--- /dev/null
+++ b/.bzr-builddeb/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = False
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..5b731f0
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,742 @@
+indicator-messages (0.5.95-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    * Fix 0.5.94 blacklist regression.
+    * Fix broken icon images in Thunderbird (LP: #956147)
+
+ -- Charles Kerr <charles.kerr@canonical.com>  Thu, 05 Apr 2012 12:27:14 -0500
+
+indicator-messages (0.5.94-0ubuntu1) precise; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * Fix for missing icons in the messaging menu (LP: #960553)
+    * Fix i18n for description (LP: #957525)
+    * Implementing initial testing
+    * Fixing blacklists (LP: #939258)
+  * debian/control: Adding dep on libgtest-dev
+
+  [ Ken VanDine ]
+  * debian/control: Don't build depend on libgtest-dev, it isn't in main
+  * debian/rules: disable tests, they require libgtest-dev
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 21 Mar 2012 17:00:10 -0400
+
+indicator-messages (0.5.93-0ubuntu2) precise; urgency=low
+
+  * src/im-menu-item.c
+    - cherry picked fix for missing icons in the messaging menu (LP: #960553)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 20 Mar 2012 16:41:13 -0400
+
+indicator-messages (0.5.93-0ubuntu1) precise; urgency=low
+  
+  * debian/control:
+    - drop build-depends on gnome-doc-utils and scrollkeeper, not required
+
+  [ Ted Gould ]
+  * New upstream release.
+    * Fixing alignment of menu items (LP: #939953)
+    * Vertically centering alignment of double high items (LP: #770486)
+    * Fixing setting of status on telepathy (LP: #943757)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 08 Mar 2012 22:11:24 +0100
+
+indicator-messages (0.5.92-0ubuntu1) precise; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * Fix goto handling (by removing) (LP: #937441, LP: #937438)
+    * Tell accountsservice when user has messages for the benefit of
+      LightDM.
+  * Dropping debian/patches: Merged upstream
+
+  [ Ken VanDine ]
+  * debian/source/format
+    - dropped "3.0 (quilt), it doesn't play well with bzr maintained packages 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 23 Feb 2012 02:48:09 -0500
+
+indicator-messages (0.5.91-0ubuntu3) precise; urgency=low
+
+  * debian/source/format:
+    - Make "3.0 (quilt)"
+  * debian/patches/tell-accounts-service.patch:
+    - Tell accountsservice when user has messages for the benefit of
+      LightDM.
+
+ -- Michael Terry <mterry@ubuntu.com>  Wed, 15 Feb 2012 15:32:16 -0500
+
+indicator-messages (0.5.91-0ubuntu2) precise; urgency=low
+
+  * debian/control: build-depends on dh-autoreconf as well
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 14 Feb 2012 23:50:15 +0100
+
+indicator-messages (0.5.91-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+    * Better lozenges that look nice
+  * debian/rules: Adding autoreconf and running make check
+  * debian/compat: 5
+  * debian/source/format: Dropping
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 14 Feb 2012 15:29:52 -0600
+
+indicator-messages (0.5.90-0ubuntu1) precise; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * Adding code coverage targets
+    * Match libindicate 0.6.90
+    * Updating for Dbusmenu 0.5.90
+    * Plug leak in launcher_menu_item_new
+    * Fix memory leak: Free path string.
+    * Compare server and path for multi-server clients
+    * Using the new GTK3 box API to avoid deprecations
+    * Adding a name hint
+  * debian/control: Requiring libindicate 0.6.90 and dbusmenu 0.5.90
+
+  [ Ken VanDine ]
+  * debian/rules
+    - drop no-error=deprecated-declarations from CFLAGS
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 10 Feb 2012 14:29:59 -0500
+
+indicator-messages (0.5.0-1ubuntu1) precise; urgency=low
+
+  * rebuild for libindicator7
+  * debian/rules
+    - build with no-error=deprecated-declarations
+  * debian/control
+    - set ubuntu-desktop VCS and maintainer
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 25 Jan 2012 09:56:59 -0500
+
+indicator-messages (0.5.0-1) experimental; urgency=low
+
+  * Merge new upstream from Ubuntu.
+
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 19 Oct 2011 13:36:00 +0200
+
+indicator-messages (0.5.0-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    * Fix memory leak (LP: #690668)
+  * Drop debian/patches/lp_690668.patch: Merged upstream
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 28 Sep 2011 10:39:26 -0500
+
+indicator-messages (0.4.95-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    * Fix naming of "Clear" item
+    * Fix alignment of items to there is a consistent gutter
+  * debian/patches/lp_690668.patch: Updating
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 25 Aug 2011 09:09:20 -0500
+
+indicator-messages (0.4.94-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    ∘ Fix drawing of triangles and capsules in GTK3
+    ∘ Fix Emesene statuses (LP: #817504)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 18 Aug 2011 10:57:40 -0500
+
+indicator-messages (0.4.93-0ubuntu2) oneiric; urgency=low
+
+  * debian/rules
+    - run intltool-update to update the translations template
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 12 Aug 2011 10:05:01 -0400
+
+indicator-messages (0.4.93-0ubuntu1) oneiric; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * Add an item to clear the alert
+    * Choose mail applications based on the default application
+    * Clear based on middle click
+
+  [ Ken VanDine ]
+  * debian/control
+    - Bumped build depends for libindicate to >= 0.5.90 
+  * debian/rules
+    - Fixed configure arg for gtk version
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 11 Aug 2011 14:18:05 -0400
+
+indicator-messages (0.4.92-0ubuntu4) oneiric; urgency=low
+
+  * debian/control
+    - Dropped recommends for gwibber now that it is seeded
+  * cherry picked r220 from trunk 
+    - Make sure to insert in the right locations
+  * cherry picked r221 from trunk
+    - Making mail applications based on the default mail client not a 
+      hardcoded desktop file.
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 05 Aug 2011 14:33:39 -0400
+
+indicator-messages (0.4.92-0ubuntu3) oneiric; urgency=low
+
+  * debian/control
+    - Added recommends for gwibber, it got missed when we dropped indicator-me
+      should get removed after we get it seeded properly
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Sun, 31 Jul 2011 16:36:09 -0400
+
+indicator-messages (0.4.92-0ubuntu2) oneiric; urgency=low
+
+  * debian/control:
+    - use conflicts against indicator-me
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 29 Jul 2011 15:49:40 +0200
+
+indicator-messages (0.4.92-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+  * debian/control
+    - Added Replaces indicator-me
+    - Added build depends for libtelepathy-glib-dev
+    - Added new binary packages, libindicator-messages-status-provider-dev,
+      libindicator-messages-status-provider1, and each provider
+    - Make indicator-messages recommend indicator-status-provider-mc5
+  * debian/libindicator-messages-status-provider1.symbols
+    - Added symbols file
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 14 Jul 2011 16:28:23 -0400
+
+indicator-messages (0.4.91-0ubuntu1) oneiric; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * Update for libindicator 0.4
+
+  [ Ken VanDine ]
+  * debian/control
+    - Bumped build depends for libindicator to >= 0.3.90
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 08 Jul 2011 11:23:58 -0400
+
+indicator-messages (0.4.90-0ubuntu2) oneiric; urgency=low
+
+  * Rebuild for libdbusmenu-gtk3-4
+  * debian/control
+    - Removed duplicate build depends
+    - Dropped build depends on indicator-messages-gtk2
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 28 Jun 2011 09:01:12 -0400
+
+indicator-messages (0.4.90-0ubuntu1) oneiric; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * GTK 3
+
+  [ Ken VanDine ]
+  * debian/control
+    - Bumped standards version to 3.9.2
+    - Add new binary for indicator-messages-gtk2 
+    - Make indicator-messages recommend indicator-messages-gtk2 (until unity 
+      can load gtk3 indicators)
+    - indicator-messages-gtk2 replaces indicator-messages << 0.4.90
+    - Added build depends for libdbusmenu-gtk3-dev and libindicator3-dev
+  * debian/rules
+    - build for both gtk2 and gtk3
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 22 Jun 2011 12:34:43 -0400
+
+indicator-messages (0.4.0-1) unstable; urgency=low
+
+  * Merge new upstream from Ubuntu.
+  * Standards-Version: 3.9.2
+
+ -- Evgeni Golov <evgeni@debian.org>  Sun, 05 Jun 2011 13:16:03 +0200
+
+indicator-messages (0.4.0-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    ∘ Set the type before other variables to get default handling more
+      reliable (LP: #723873)
+    ∘ Add support for overriding the default icon with a specific one
+      for the messaging menu (LP: #741068)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 07 Apr 2011 12:35:36 -0500
+
+indicator-messages (0.3.92-1) unstable; urgency=low
+
+  * Merge new upstream from Ubuntu.
+  * Fix 0.3.11-0ubuntu3 changelog entry (missed a space), so that
+    bzr builddeb won't go crazy (see Debian Bug #620242)
+  * Fix debian/copyright, was refering to libdbusmenu by mistake.
+
+ -- Evgeni Golov <evgeni@debian.org>  Sun, 03 Apr 2011 13:37:33 +0200
+
+indicator-messages (0.3.92-0ubuntu3) natty; urgency=low
+
+  * debian/patches/lp_690668.patch
+    - Memory leak fixes (LP: #690668)
+  * debian/control
+    - Bump standards version to 3.9.1
+  * debian/source/format
+    - Use source format 3.0 (quilt)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 24 Feb 2011 12:13:33 -0500
+
+indicator-messages (0.3.92-0ubuntu2) natty; urgency=low
+
+  * src/launcher-menu-item.c
+    - Make sure menu entries are displayed for launchers that aren't running (LP: #723873)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 23 Feb 2011 16:06:37 -0500
+
+indicator-messages (0.3.92-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    * Adding in accessible description support
+  * debian/control: libindicator version 0.3.19
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 17 Feb 2011 12:18:32 -0600
+
+indicator-messages (0.3.91-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    * Fixing the service file
+    * Adding a log domain
+    * Fixing type handler for dbusmenu 0.3.94
+  * debian/control: dbusmenu to 0.3.94
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 27 Jan 2011 17:01:34 -0600
+
+indicator-messages (0.3.90-0ubuntu1) natty; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * GDBus Port
+    * New libindicate and dbusmenu
+
+  [ Ken VanDine ]
+  * debian/control
+    - Build depends on libindicate-dev to 0.4.91
+    - Build depends on dbusmenu to 0.3.91
+    - Set Vcs to ~ubuntu-desktop
+  * data/indicator-messages.service.in
+    - Fixed dbus interface name
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 14 Jan 2011 14:50:30 -0600
+
+indicator-messages (0.3.11-0ubuntu4) natty; urgency=low
+
+  * debian/control
+    - Bump build depends for libdbusmenu-* to >= 0.3.90
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 09 Dec 2010 11:39:40 -0500
+
+indicator-messages (0.3.11-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/control: package description spelling (LP: #658096)
+
+ -- Greg Auger <gregory.auger@googlemail.com>  Tue, 09 Nov 2010 18:49:38 +0000
+
+indicator-messages (0.3.11-0ubuntu2) maverick; urgency=low
+
+  * Rebuild for libindicator ABI change (LP: #637692)
+  * debian/control: depends on latest libindicator-dev 
+
+ -- Didier Roche <didrocks@ubuntu.com>  Wed, 22 Sep 2010 18:39:27 +0200
+
+indicator-messages (0.3.11-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Fixing triangles by passing data to callback (LP: #623453)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 09 Sep 2010 13:24:13 -0500
+
+indicator-messages (0.3.10-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Shifting icons into the gutter and adjusting the arrow
+      padding.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 26 Aug 2010 15:08:31 -0500
+
+indicator-messages (0.3.9-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Remove parens from counts
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 12 Aug 2010 13:10:10 -0500
+
+indicator-messages (0.3.8-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    - running apps triangle indicator overlay
+    - message counters are now rendered with a nice rounded background
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 29 Jul 2010 13:33:14 -0400
+
+indicator-messages (0.3.7-1) unstable; urgency=low
+
+  * Merge from Ubuntu.
+    Closes: #586132
+  * debian/control:
+    - Homepage is at LP/indicator-messages, not -applet.
+    - Update package description.
+    - Update Vcs-* fields.
+    - Standards-Version: 3.8.4.
+  * debian/copyright:
+    - Convert to DEP5 format.
+    - Add missing copyright holders of debian/.
+
+ -- Evgeni Golov <evgeni@debian.org>  Thu, 17 Jun 2010 13:02:37 +0200
+
+indicator-messages (0.3.7-0ubuntu1~ppa1) lucid; urgency=low
+
+  * New upstream release.
+    * When loading desktop files check to see if they've
+      already been eclipsed by an app. (LP: #549096)
+    * Track better application shortcuts and ensure that they
+      get removed when the application is. (LP: #539167)
+    * Track blacklisted apps to ensure that the messaging menu
+      hides when there is no app.  (LP: #533021)
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 21 May 2010 15:02:16 -0500
+
+indicator-messages (0.3.6-0ubuntu2) lucid; urgency=low
+
+  * Upstream Merge
+    * When loading desktop files check to see if they've
+      already been eclipsed by an app. (LP: #549096)
+    * Track better application shortcuts and ensure that they
+      get removed when the application is. (LP: #539167)
+
+ -- Ted Gould <ted@ubuntu.com>  Sat, 17 Apr 2010 13:10:42 -0500
+
+indicator-messages (0.3.6-0ubuntu1) lucid; urgency=low
+
+  * New upstream release.
+    * Fixing several bugs with regards to visibility and placement
+      if items and separators in the menu.  (LP: #446914)
+    * Changing the service management over to using libindicator
+      services and service manager for robustness.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 01 Apr 2010 10:13:38 -0500
+
+indicator-messages (0.3.5-0ubuntu2) lucid; urgency=low
+
+  * debian/control:
+    - change the indicator-applet depends to a recommends to let other 
+      desktops use other options rather than having to trigger GNOME
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 30 Mar 2010 10:35:59 +0200
+
+indicator-messages (0.3.5-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.3.5
+    * Show which applications are running with a small icon
+      next to their entry. (LP: #438526)
+    * Shift command items to line up with application names.
+      (LP: #537312)
+    * Track applications we've seen so that we can show "Set Up"
+      text if we've not seen the app before.
+    * Fix avatar spacing to match other menu items
+    * Use standard libindicator icon handling in panel
+    * Fix translation of non-running applications (LP: #540148)
+    * Handling bools for requesting attention from apps
+    * Changing microblogging to broadcast to match Me Menu (LP: #534952)
+  * debian/control: 
+    - Updating requirement to libindicator 0.3.5
+    - Increasing dbusmenu-glib dep to 0.2.8
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 25 Mar 2010 10:53:01 -0500
+
+indicator-messages (0.3.4-0ubuntu1~ppa1) lucid; urgency=low
+
+  * Upstream release 0.3.4
+    * Fix avatar spacing to match other menu items
+    * Use standard libindicator icon handling in panel
+    * Fix translation of non-running applications (LP: #540148)
+    * Handling bools for requesting attention from apps
+    * Changing microblogging to broadcast to match Me Menu (LP: #534952)
+  * debian/control: Updating requirement to libindicator 0.3.5
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 18 Mar 2010 13:45:19 -0500
+
+indicator-messages (0.3.3-0ubuntu2) lucid; urgency=low
+
+  * src/default-applications.c
+    - string change for consistency (LP: #534952) 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 12 Mar 2010 11:44:46 -0500
+
+indicator-messages (0.3.3-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.3.3
+    * Changing names of default applications to generic names
+    * Making icons of default applications match panel theme
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Mar 2010 16:02:11 -0600
+
+indicator-messages (0.3.2-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.3.2
+    * Removing extra ref
+    * Moving locally defined variable to use the one defined in
+      the function to fix a NULL pointer. (lp: #518547)
+    * Disconnect the count changed signal property
+    * Adding static desktop shortcuts to application items
+    * Adding dynamic application menuitems
+    * Switching application menu items to remove descriptions
+      and add in application icons
+  * debian/control:
+    * libindicator build dependency to 0.3.3
+    * dbusmenu build dependency to 0.2.5
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 18 Feb 2010 12:23:29 -0600
+
+indicator-messages (0.3.1-0ubuntu2) lucid; urgency=low
+
+  * Upstream Merge
+    * Removing extra ref
+    * Moving locally defined variable to use the one defined in
+      the function to fix a NULL pointer. (lp: #518547)
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 09 Feb 2010 09:30:10 -0600
+
+indicator-messages (0.3.1-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.3.1
+    * Updates for dbusmenu 0.2.2
+    * Updates for libindicate 0.3.0
+  * debian/control:
+    * dbusmenu* depends to 0.2.2
+    * libindicate* depends to 0.3.0
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 18:23:34 -0800
+
+indicator-messages (0.3.0-0ubuntu1) lucid; urgency=low
+
+  * Upstream release 0.3.0
+    - Disabling static builds.
+    - Porting to libindicator 0.3.0
+    - Adding translator comments from hours and minutes strings.
+      (LP: #456437)
+    - Upgrading to dbusmenu 0.2.0
+  * debian/control: Updating dbusmenu dependency to 0.2.0
+  * debian/control: Increasing libindicator-dev dependency to
+    0.3.0
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 08 Jan 2010 12:05:25 -0600
+
+indicator-messages (0.2.6+r156-0ubuntu2) lucid; urgency=low
+
+  * debian/control
+    - add a Breaks for indicator-applet (<< 0.3.0) 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Tue, 15 Dec 2009 11:57:42 -0500
+
+indicator-messages (0.2.6+r156-0ubuntu1) lucid; urgency=low
+
+  * New snapshot for libindicator 0.3.0
+  * debian/control
+    - Build-Depends on libindicator >= 0.3.0
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 10 Dec 2009 14:35:46 -0500
+
+indicator-messages (0.2.6-0ubuntu1) karmic; urgency=low
+
+  * Upstream release 0.2.6 (LP: #446629)
+    * Building the menu after checking the blacklist so that the
+      separators are all correct.
+    * Small fix for a perspective memory leak.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 09 Oct 2009 08:14:27 +0200
+
+indicator-messages (0.2.5-0ubuntu1) karmic; urgency=low
+
+  * Upstream release 0.2.5 (LP: #440217)
+    * Adding a check on addition of launchers to ensure icon is correctly
+      visible. (LP: #433274)
+    * Making it so that if applications don't set the time on an indicator
+      the time isn't shown in the menu. (LP: #438237)
+    * Putting icons in the right places. (LP: #436460)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 01 Oct 2009 23:34:28 +0200
+
+indicator-messages (0.2.4-0ubuntu1) karmic; urgency=low
+
+  * Upstream release 0.2.4 (LP: #436093)
+    - Merging in the min menu width feature (LP: #428292)
+    - Merging in icon scaling branch from trunk. Now better icons (LP: #433143)
+    - Merging in updated trunk (LP: #434097 and LP: #435184)
+    - add i18n support
+    - Prevent null entries (LP: #435184)
+    - add a path for indicators in /usr/share (LP: #434097)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 24 Sep 2009 13:07:46 -0500
+
+indicator-messages (0.2.2-0ubuntu2) karmic; urgency=low
+
+  * src/messages-service.c: initialise the translations
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 15 Sep 2009 16:41:03 +0200
+
+indicator-messages (0.2.2-0ubuntu1) karmic; urgency=low
+
+  * New release (LP: #427357)
+    * Adds in separators between application groups
+    * Merging in v2-api stuff which will become 0.2.1
+  * debian/control: 
+    - Requiring > 0.2.0 of libindicate-*
+    - bump dbusmenu dependencies.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 10 Sep 2009 09:11:57 -0500
+
+indicator-messages (0.2.0-0ubuntu2) karmic; urgency=low
+
+  * debian/control
+    - Bump build depends on dbusmenu to 0.1.0
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 27 Aug 2009 21:14:46 +0200
+
+indicator-messages (0.2.0-0ubuntu1) karmic; urgency=low
+
+  [ Ted Gould ]
+  * Upstream version 0.2.0
+  * debian/control: Adding dependency information for libdbusmenu
+    to say >= 0.0.2 to match upstream build system.
+  * debian/watch: Changing to use indicator-messages project.
+
+  [ Martin Pitt ]
+  * debian/control: Update Vcs-Bzr: for new branch location.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 27 Aug 2009 20:46:27 +0200
+
+indicator-messages (0.2.0~bzr124-0ubuntu1) karmic; urgency=low
+
+  * Update to fix build issue
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 07 Aug 2009 17:12:40 +0100
+
+indicator-messages (0.2.0~bzr121-0ubuntu3) karmic; urgency=low
+
+  * Fix to dereference the application menu items correctly so that
+    the signal handlers are dropped as well. (lp: #410251)
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 05 Aug 2009 19:00:31 +0100
+
+indicator-messages (0.2.0~bzr121-0ubuntu2) karmic; urgency=low
+
+  * Run autogen.sh before upload
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 05 Aug 2009 00:42:39 +0100
+
+indicator-messages (0.2.0~bzr121-0ubuntu1) karmic; urgency=low
+
+  [ Ted Gould ]
+  * debian/control: Adding in a build dep on libindicate-gtk-dev
+  * Changes for the changing libindicate stuff.
+  * Merge in the dbusmenu changes from the dbusmenu branch
+  * debian/control: Adding in a build dependency on libdbusmenu-glib and
+    libdbusmenu-gtk to catch up with the merge.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 05 Aug 2009 00:21:50 +0100
+
+indicator-messages (0.2.0~bzr120-0ubuntu1) jaunty; urgency=low
+
+  * Fix to track the timer. (LP: #365187)
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 13 May 2009 09:56:20 -0500
+
+indicator-messages (0.2.0~bzr119-0ubuntu1) jaunty; urgency=low
+
+  * Upstream update
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 22 Apr 2009 23:34:21 -0500
+
+indicator-messages (0.2.0~bzr116-0ubuntu3) jaunty; urgency=low
+
+  * debian/rules: Adding a rule to remove the .la/.a clutter
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 22 Apr 2009 16:46:59 -0500
+
+indicator-messages (0.2.0~bzr116-0ubuntu2) jaunty; urgency=low
+
+  * debian/control: libindicator-dev to ~bzr301
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 22 Apr 2009 15:58:45 -0500
+
+indicator-messages (0.2.0~bzr116-0ubuntu1) jaunty; urgency=low
+
+  * Upstream release
+    * Bug fixes
+    * Update API to new libindicator
+  * debian/control: Adding new dependency on libindicator-dev
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 22 Apr 2009 15:45:21 -0500
+
+indicator-messages (0.1.6-0ubuntu1) jaunty; urgency=low
+
+  * New upstream version
+    * Patch from Cody Russell to fix LP: #359018 by correctly implementing
+      the finalize functions.
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 14 Apr 2009 11:32:00 +0200
+
+indicator-messages (0.1.5-0ubuntu1) jaunty; urgency=low
+
+  * New upstream version
+    * Fixes the lifecycle of the various structures tracking the messages
+      and applications.  Fixing bugs like (LP: #355616) (LP: #352881)
+    * Fixes the visual appearance by setting the widget name to grab the
+      style settings from the main applet.  (LP: #351979)
+  * debian/control: Upgrading dependency on libindicate-dev to 0.1.5 or
+    higher as the new version requires that.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 03 Apr 2009 16:32:49 -0500
+
+indicator-messages (0.1.4-0ubuntu1) jaunty; urgency=low
+
+  * New upstream version
+    * Adding the display of indicators that are login messages coming from
+      other applications.  (LP: #345494)
+    * Making all times displayed for IM messages relative instead of
+      absolute.  (LP: #346345)
+    * Cleaning up the server removal code.  May fix (LP: #345599), I can't
+      recreate it anymore afterwards.
+
+ -- Ted Gould <ted@ubuntu.com>  Mon, 30 Mar 2009 09:40:40 +0200
+
+indicator-messages (0.1.3-0ubuntu1) jaunty; urgency=low
+
+  [ Ted Gould ]
+  * New upstream version.
+    - Now changes the icon based on non-IM indicators so that Evolution
+      works much better.  (LP: #342480)
+    - Now the menu items are in a predictable order, alphabetical.
+    - The Messages for a particular client (i.e. Pidgin) are grouped with
+      the client they're associated with.
+    - Adjusting the icon size to match the new one in the Human theme.
+    - Adjusting the build so that all the different libraries are not
+      built in a versioned manner.  Now it's just one .so, which is
+      what it should have been originally.
+
+  [ Martin Pitt ]
+  * Add debian/watch.
+  * Add bzr-builddeb configuration.
+  * debian/copyright: Fix download location.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 19 Mar 2009 12:23:17 +0100
+
+indicator-messages (0.1-0ubuntu1) jaunty; urgency=low
+
+  * Initial release, based on DX team's PPA packaging branch.
+    (lp:~indicator-applet-developers/indicator-applet/messages-packaging)
+  * debian/control: Add Homepage:, Vcs-Bzr:, and fix package
+    description.
+  * debian/copyright: Properly describe license.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 17 Feb 2009 11:35:38 +0100
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..40b8dd5
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,108 @@
+Source: indicator-messages
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
+Uploaders: Evgeni Golov <evgeni@debian.org>
+Build-Depends: debhelper (>= 5.0),
+               cdbs (>= 0.4.41),
+               dh-autoreconf,
+               libgtk2.0-dev (>= 2.12.0),
+               libgtk-3-dev,
+               libdbus-glib-1-dev,
+               intltool,
+               libindicate-dev (>= 0.6.90),
+               libindicate-gtk-dev (>= 0.6.90),
+               libindicate-gtk3-dev (>= 0.6.90),
+               libindicator-dev (>= 0.3.90),
+               libindicator3-dev (>= 0.3.90),
+               libdbusmenu-glib-dev (>= 0.5.90),
+               libdbusmenu-gtk-dev (>= 0.5.90),
+               libdbusmenu-gtk3-dev (>= 0.5.90),
+               libtelepathy-glib-dev (>= 0.9.0)
+Standards-Version: 3.9.2
+Homepage: https://launchpad.net/indicator-messages
+Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu/files
+
+Package: indicator-messages
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: indicator-applet | indicator-renderer, indicator-status-provider-mc5
+Replaces: indicator-me
+Breaks: indicator-applet (<< 0.3.0)
+Conflicts: indicator-me
+Description: indicator that collects messages that need a response
+ A place on the user's desktop that collects messages that need a response.
+ This menu provides a condensed and collected view of all of those messages
+ for quick access, but without making them annoying in times that you want
+ to ignore them.
+
+Package: indicator-messages-gtk2
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         indicator-messages (= ${binary:Version})
+Recommends: indicator-applet | indicator-renderer
+Replaces: indicator-messages (<< 0.4.90)
+Breaks: indicator-applet (<< 0.3.0)
+Description: indicator that collects messages that need a response
+ A place on the user's desktop that collects messages that need a response.
+ This menu provides a condensed and collected view of all of those messages
+ for quick access, but without making them annoying in times that you want
+ to ignore them.
+
+Package: libindicator-messages-status-provider1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: indicator status provider - shared library
+ This library contains information to build status providers to go into
+ the messaging menu.
+
+Package: libindicator-messages-status-provider-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         libindicator-messages-status-provider1 (= ${binary:Version})
+Description: indicator status provider - library development files
+ This library contains information to build status providers to go into
+ the messaging menu.
+
+Package: indicator-status-provider-mc5
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         indicator-messages (>= 0.4.92)
+Description: indicator-messages status provider for telepathy mission-control-5
+ A status provider for indicator-messages to update your desktop presence 
+ from telepathy mission-control-5.
+
+Package: indicator-status-provider-pidgin
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         indicator-messages (>= 0.4.92)
+Description: indicator-messages status provider for pidgin 
+ A status provider for indicator-messages to update your desktop presence 
+ from pidgin.
+
+Package: indicator-status-provider-telepathy
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         indicator-messages (>= 0.4.92)
+Description: indicator-messages status provider for telepathy (pre-mc5)
+ A status provider for indicator-messages to update your desktop presence 
+ from telepathy (pre-mc5).
+
+Package: indicator-status-provider-emesene
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         indicator-messages (>= 0.4.92)
+Description: indicator-messages status provider for emesene 
+ A status provider for indicator-messages to update your desktop presence 
+ from emesene.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..ba41392
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,19 @@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: indicator-messages
+Maintainer: Ted Gould <ted@canonical.com>
+Source: https://launchpad.net/indicator-messages
+
+Files: *
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+License: GPL-3
+
+Files: debian/*
+Copyright: 2009-2010 Evgeni Golov <evgeni@debian.org>
+Copyright: 2009-2010 Ted Gould <ted@canonical.com>, Canonical Ltd.
+Copyright: 2009-2010 Sebastien Bacher <seb128@ubuntu.com>
+Copyright: 2009-2010 Ken VanDine <ken.vandine@canonical.com>
+License: GPL-3
+
+License: GPL-3
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/indicator-messages-gtk2.install b/debian/indicator-messages-gtk2.install
new file mode 100644
index 0000000..8d1fc9f
--- /dev/null
+++ b/debian/indicator-messages-gtk2.install
@@ -0,0 +1 @@
+debian/tmp/gtk2/usr/lib/indicators /usr/lib/
diff --git a/debian/indicator-messages.install b/debian/indicator-messages.install
new file mode 100644
index 0000000..ebbf1eb
--- /dev/null
+++ b/debian/indicator-messages.install
@@ -0,0 +1,4 @@
+debian/tmp/gtk3/usr/lib/indicators3 /usr/lib/
+debian/tmp/gtk3/usr/lib/indicator-messages/indicator-messages-service /usr/lib/indicator-messages/
+debian/tmp/gtk3/usr/share/dbus-1 /usr/share/
+debian/tmp/gtk3/usr/share/libindicator /usr/share/
diff --git a/debian/indicator-status-provider-emesene.install b/debian/indicator-status-provider-emesene.install
new file mode 100644
index 0000000..3a16809
--- /dev/null
+++ b/debian/indicator-status-provider-emesene.install
@@ -0,0 +1 @@
+debian/tmp/gtk3/usr/lib/indicator-messages/status-providers/1/libemesene.so /usr/lib/indicator-messages/status-providers/1/
diff --git a/debian/indicator-status-provider-mc5.install b/debian/indicator-status-provider-mc5.install
new file mode 100644
index 0000000..e8d3f25
--- /dev/null
+++ b/debian/indicator-status-provider-mc5.install
@@ -0,0 +1 @@
+debian/tmp/gtk3/usr/lib/indicator-messages/status-providers/1/libmc5.so /usr/lib/indicator-messages/status-providers/1/
diff --git a/debian/indicator-status-provider-pidgin.install b/debian/indicator-status-provider-pidgin.install
new file mode 100644
index 0000000..701f499
--- /dev/null
+++ b/debian/indicator-status-provider-pidgin.install
@@ -0,0 +1 @@
+debian/tmp/gtk3/usr/lib/indicator-messages/status-providers/1/libpidgin.so /usr/lib/indicator-messages/status-providers/1/
diff --git a/debian/indicator-status-provider-telepathy.install b/debian/indicator-status-provider-telepathy.install
new file mode 100644
index 0000000..8a3b666
--- /dev/null
+++ b/debian/indicator-status-provider-telepathy.install
@@ -0,0 +1 @@
+debian/tmp/gtk3/usr/lib/indicator-messages/status-providers/1/libtelepathy.so /usr/lib/indicator-messages/status-providers/1/
diff --git a/debian/libindicator-messages-status-provider-dev.install b/debian/libindicator-messages-status-provider-dev.install
new file mode 100644
index 0000000..1b53b59
--- /dev/null
+++ b/debian/libindicator-messages-status-provider-dev.install
@@ -0,0 +1,3 @@
+debian/tmp/gtk3/usr/lib/libindicator-messages-status-provider.so /usr/lib/
+debian/tmp/gtk3/usr/include /usr/
+debian/tmp/gtk3/usr/lib/pkgconfig /usr/lib/
diff --git a/debian/libindicator-messages-status-provider1.install b/debian/libindicator-messages-status-provider1.install
new file mode 100644
index 0000000..cdf5aa3
--- /dev/null
+++ b/debian/libindicator-messages-status-provider1.install
@@ -0,0 +1 @@
+debian/tmp/gtk3/usr/lib/libindicator-messages-status-provider.so.* /usr/lib/
diff --git a/debian/libindicator-messages-status-provider1.symbols b/debian/libindicator-messages-status-provider1.symbols
new file mode 100644
index 0000000..be2e86a
--- /dev/null
+++ b/debian/libindicator-messages-status-provider1.symbols
@@ -0,0 +1,4 @@
+libindicator-messages-status-provider.so.1 libindicator-messages-status-provider1 #MINVER#
+ status_provider_get_status@Base 0.4.92
+ status_provider_get_type@Base 0.4.92
+ status_provider_set_status@Base 0.4.92
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..f5faa84
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+
+DEB_BUILDDIR = build
+DEB_MAKE_FLAVORS = gtk2 gtk3
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
+
+DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@
+DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
+
+DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2
+DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
+
+LDFLAGS += -Wl,-z,defs -Wl,--as-needed
+
+debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2)
+debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3)
+
+common-install-arch::
+	find debian/tmp -name \*.la -delete
+	cd po; intltool-update --pot --verbose
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..a744070
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://launchpad.net/indicator-messages/+download .*/indicator-messages-([0-9.]+)\.tar\.gz
diff --git a/src/messages-service-dbus.c b/src/messages-service-dbus.c
index 2b72f2e..1585ac0 100644
--- a/src/messages-service-dbus.c
+++ b/src/messages-service-dbus.c
@@ -42,8 +42,6 @@ typedef struct _MessageServiceDbusPrivate MessageServiceDbusPrivate;
 struct _MessageServiceDbusPrivate
 {
 	GDBusConnection * connection;
-	GCancellable    * accounts_cancel;
-	GDBusProxy      * accounts_user;
 	gboolean dot;
 	gboolean hidden;
 };
@@ -157,199 +155,9 @@ connection_cb (GObject * object, GAsyncResult * res, gpointer user_data)
 }
 
 static void
-accounts_notify_cb (GObject *source_object, GAsyncResult *res,
-                    gpointer user_data)
-{
-	GError * error = NULL;
-	GVariant * answer = g_dbus_proxy_call_finish(G_DBUS_PROXY(source_object), res, &error);
-
-	if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-		g_error_free(error);
-		return; /* Must exit before accessing freed memory */
-	}
-
-	MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(user_data);
-
-	if (priv->accounts_cancel != NULL) {
-		g_object_unref(priv->accounts_cancel);
-		priv->accounts_cancel = NULL;
-	}
-
-	if (error != NULL) {
-		g_warning("Unable to get notify accounts service of message status: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-
-	g_variant_unref (answer);
-}
-
-static void
-accounts_notify (MessageServiceDbus *self)
-{
-	MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(self);
-
-	if (priv->accounts_user == NULL)
-		return; /* We're not able to talk to accounts service */
-
-	if (priv->accounts_cancel != NULL) {
-		/* Cancel old notify before starting new one */
-		g_cancellable_cancel(priv->accounts_cancel);
-		g_object_unref(priv->accounts_cancel);
-		priv->accounts_cancel = NULL;
-	}
-
-	priv->accounts_cancel = g_cancellable_new();
-	g_dbus_proxy_call(priv->accounts_user,
-	                  "SetXHasMessages",
-	                  g_variant_new ("(b)", priv->dot),
-	                  G_DBUS_CALL_FLAGS_NONE,
-	                  -1, /* timeout */
-	                  priv->accounts_cancel,
-	                  accounts_notify_cb,
-	                  self);
-}
-
-static void
-get_accounts_user_proxy_cb (GObject *source_object, GAsyncResult *res,
-                            gpointer user_data)
-{
-	GError * error = NULL;
-	GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error);
-
-	if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-		g_error_free(error);
-		return; /* Must exit before accessing freed memory */
-	}
-
-	MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(user_data);
-
-	if (priv->accounts_cancel != NULL) {
-		g_object_unref(priv->accounts_cancel);
-		priv->accounts_cancel = NULL;
-	}
-
-	if (error != NULL) {
-		g_warning("Unable to get proxy of accountsservice: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-
-	priv->accounts_user = proxy;
-	accounts_notify (MESSAGE_SERVICE_DBUS (user_data));
-}
-
-static void
-get_accounts_user_find_user_cb (GObject *source_object, GAsyncResult *res,
-                                gpointer user_data)
-{
-	GError * error = NULL;
-	GVariant * answer = g_dbus_proxy_call_finish(G_DBUS_PROXY(source_object), res, &error);
-
-	/* We're done with main accounts proxy now */
-	g_object_unref (source_object);
-
-	if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-		g_error_free(error);
-		return; /* Must exit before accessing freed memory */
-	}
-
-	MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(user_data);
-
-	if (priv->accounts_cancel != NULL) {
-		g_object_unref(priv->accounts_cancel);
-		priv->accounts_cancel = NULL;
-	}
-
-	if (error != NULL) {
-		g_warning("Unable to get object name of user from accountsservice: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-
-	if (!g_variant_is_of_type (answer, G_VARIANT_TYPE ("(o)"))) {
-		g_warning("Unexpected type from FindUserByName: %s", g_variant_get_type_string (answer));
-		g_variant_unref(answer);
-		return;
-	}
-
-	const gchar *path;
-	g_variant_get(answer, "(&o)", &path);
-
-	priv->accounts_cancel = g_cancellable_new();
-	g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
-	                         G_DBUS_PROXY_FLAGS_NONE,
-	                         NULL,
-	                         "org.freedesktop.Accounts", 
-	                         path,
-	                         "org.freedesktop.Accounts.User",
-	                         priv->accounts_cancel,
-	                         get_accounts_user_proxy_cb,
-	                         user_data);
-
-	g_variant_unref (answer);
-}
-
-static void
-get_accounts_proxy_cb (GObject *source_object, GAsyncResult *res,
-                       gpointer user_data)
-{
-	GError * error = NULL;
-	GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error);
-
-	if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-		g_error_free(error);
-		return; /* Must exit before accessing freed memory */
-	}
-
-	MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(user_data);
-
-	if (priv->accounts_cancel != NULL) {
-		g_object_unref(priv->accounts_cancel);
-		priv->accounts_cancel = NULL;
-	}
-
-	if (error != NULL) {
-		g_warning("Unable to get proxy of accountsservice: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-
-	priv->accounts_cancel = g_cancellable_new();
-	g_dbus_proxy_call(proxy,
-	                  "FindUserByName",
-	                  g_variant_new ("(s)", g_get_user_name ()),
-	                  G_DBUS_CALL_FLAGS_NONE,
-	                  -1, /* timeout */
-	                  priv->accounts_cancel,
-	                  get_accounts_user_find_user_cb,
-	                  user_data);
-}
-
-static void
-get_accounts_proxy (MessageServiceDbus *self)
-{
-	MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(self);
-
-	g_return_if_fail(priv->accounts_cancel == NULL);
-
-	priv->accounts_cancel = g_cancellable_new();
-	g_dbus_proxy_new_for_bus(G_BUS_TYPE_SYSTEM,
-	                         G_DBUS_PROXY_FLAGS_NONE,
-	                         NULL,
-	                         "org.freedesktop.Accounts", 
-	                         "/org/freedesktop/Accounts",
-	                         "org.freedesktop.Accounts",
-	                         priv->accounts_cancel,
-	                         get_accounts_proxy_cb,
-	                         self);
-}
-
-static void
 message_service_dbus_init (MessageServiceDbus *self)
 {
 	g_bus_get(G_BUS_TYPE_SESSION, NULL, connection_cb, self);
-	get_accounts_proxy (self);
 
 	MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(self);
 
@@ -369,17 +177,6 @@ message_service_dbus_dispose (GObject *object)
 		priv->connection = NULL;
 	}
 
-	if (priv->accounts_cancel != NULL) {
-		g_cancellable_cancel(priv->accounts_cancel);
-		g_object_unref(priv->accounts_cancel);
-		priv->accounts_cancel = NULL;
-	}
-
-	if (priv->accounts_user != NULL) {
-		g_object_unref(priv->accounts_user);
-		priv->accounts_user = NULL;
-	}
-
 	G_OBJECT_CLASS (message_service_dbus_parent_class)->dispose (object);
 	return;
 }
@@ -443,8 +240,6 @@ message_service_dbus_set_attention (MessageServiceDbus * self, gboolean attentio
 			                              g_variant_new("(b)", priv->dot),
 			                              NULL);
 		}
-
-		accounts_notify (self);
 	}
 	return;
 }