Merge lp:~indicator-applet-developers/indicator-messages/ubuntu into lp:~ubuntu-desktop/indicator-messages/ubuntu

[Ted Gould]

=== modified file 'AUTHORS'
--- AUTHORS	2009-02-11 22:05:18 +0000
+++ AUTHORS	2011-01-14 20:29:34 +0000
@@ -1,1 +1,10 @@
-Ted Gould <[e-mail]>
+# Generated by Makefile. Do not edit.
+
+ Andrea Cimitan 
+ cody 
+ David Barth 
+ James Westby 
+ Kees Cook 
+ Michael Terry 
+ Sebstien Bacher 
+ Ted Gould 

=== modified file 'ChangeLog'
--- ChangeLog	2008-12-05 03:13:41 +0000
+++ ChangeLog	2011-01-14 20:29:34 +0000
@@ -0,0 +1,2302 @@
+# Generated by Makefile. Do not edit.
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.90
+
[phone]  Ted Gould  <[e-mail]>
+
+	ayatana.org to canonical.com
+
[phone]  Ted Gould  <[e-mail]>
+
+	ayatana.org to canonical.com
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching dbusmenu and indicator messages
+
[phone]  Ted Gould  <[e-mail]>
+
+	Prototype changes
+
[phone]  Ted Gould  <[e-mail]>
+
+	Emitting signals for the connections
+
[phone]  Ted Gould  <[e-mail]>
+
+	Saving the connection
+
[phone]  Ted Gould  <[e-mail]>
+
+	Swiching to our method function.. woot! 
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting up the vtable and making it connect in
+
[phone]  Ted Gould  <[e-mail]>
+
+	Get the connection in the cool new style
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching how we get our interface info
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switch to new dbusmenu signal prototype
+
[phone]  Ted Gould  <[e-mail]>
+
+	Type to session
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching the function callbacks
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing the signal callbacks
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing the creation of the proxy
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing to get the interface from the included XML file
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching over from using dbus-binding-tool to sed
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching the pkgconfig files that are used.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fix deprecations and ensure they're part of distcheck
+
[phone]  Michael Terry  <[e-mail]>
+
+	avoid deprecated API
+
[phone]  Ted Gould  <[e-mail]>
+
+	Building ChangeLog and AUTHORS from makefile
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.11
+
[phone]  Ted Gould  <[e-mail]>
+
+	Pass the dbusmenu menuitem to the expose callback.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making sure to put the dbusmenu item in the callback
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.10
+
[phone]  Ted Gould  <[e-mail]>
+
+	Shifting the locations of the triangles and the icons.
+
[phone]  David Barth  <[e-mail]>
+
+	adjusted position of the left icons and triangle overlay
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing some extra code that's not needed and ensuring the icon is always shown.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Only show the avatar if it is sent
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing the blank menu items
+
[phone]  Ted Gould  <[e-mail]>
+
+	Set the image menu icon
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.9
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing the parenthesis
+
[phone]  David Barth  <[e-mail]>
+
+	0.3.8
+
[phone]  David Barth  <[e-mail]>
+
+	running apps triangle indicator overlay from Cimi
+
[phone]  Andrea Cimitan  <[e-mail]>
+
+	merged dbarth's branch
+
[phone]  David Barth  <[e-mail]>
+
+	better aspect ratio for the triangle
+
[phone]  David Barth  <[e-mail]>
+
+	adjust the triangle size
+
[phone]  David Barth  <[e-mail]>
+
+	remove the old running app. icon
+
[phone]  David Barth  <[e-mail]>
+
+	fix typos to build and clean up comments
+
[phone]  Andrea Cimitan  <[e-mail]>
+
+	remove the previous icon
+
[phone]  Andrea Cimitan  <[e-mail]>
+
+	trailing whitespace
+
[phone]  Andrea Cimitan  <[e-mail]>
+
+	Draw a triangle on the left
+
[phone]  David Barth  <[e-mail]>
+
+	message counters are now rendered with a nice rounded background
+
[phone]  Andrea Cimitan  <[e-mail]>
+
+	check if widget is really a widget before getting its style (from dbarth)
+
[phone]  Andrea Cimitan  <[e-mail]>
+
+	Ops, readded the label :P
+
[phone]  Andrea Cimitan  <[e-mail]>
+
+	Added rounded rectangles on the right
+
[phone]  Andrea Cimitan  <[e-mail]>
+
+	Fixed position of sub menu indicators (the one with the counter on the right)
+
[phone]  Andrea Cimitan  <cimi@gemini>
+
+	Added triangles on the left and new label design on the right.
+	We still need to align not-active services but I don't have any clue on how to do this
+
[phone]  Ted Gould  <[e-mail]>
+
+	Dummy commit
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.7
+
[phone]  Ted Gould  <[e-mail]>
+
+	Patch from Kees to ensure the hashtable keeps its memory
+
[phone]  Kees Cook  <[e-mail]>
+
+	Allocate memory for hash table items (LP: #533021)
+
[phone]  Ted Gould  <[e-mail]>
+
+	Check for whether a desktop file is eclipsed when loaded.
+
[phone]  Ted Gould  <[e-mail]>
+
+	When adding a desktop file look through teh applications we have to check for eclipsing
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ensure that we cleanup proxy items as shortcuts.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Forgot to pass the object here.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Handling the remove and add in separate functions.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing the changed signal to be added/removed so that we can make things even more fun.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Minor refactoring to make the logic clearer
+
[phone]  Ted Gould  <[e-mail]>
+
+	Some debug messages when removing shortcuts
+
[phone]  Ted Gould  <[e-mail]>
+
+	It's possible the newroot could be NULL, and that's okay.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Negative debugging
+
[phone]  Ted Gould  <[e-mail]>
+
+	Some debugging messages
+
[phone]  Ted Gould  <[e-mail]>
+
+	Deleteing shortcuts on update if they need to be
+
[phone]  Ted Gould  <[e-mail]>
+
+	Killing hte launcher shortcuts on exit as well.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing the shortcuts when removing the application entry.
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.6
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fixes to the placement of notifications and their visibility.  Lots of lovely cleanups.
+
[phone]  Ted Gould  <[e-mail]>
+
+	We only want to increment the position if we didn't find an entry
+
[phone]  Ted Gould  <[e-mail]>
+
+	Dropping a useless warning
+
[phone]  Ted Gould  <[e-mail]>
+
+	Actually, more correctly, that should be a weak ref.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fixing a mixed up signal name.  Small memory leak.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making application items default to invisible, and only become visible if they get a valid desktop file.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ensuring that the visibility property is set on the application entries.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Make the visibility of indictor items and separators follow the visibility of the application item.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Build the separator after checking to see which entry to use.  That way we've always got one.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making the messaging menu use the service architecture.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making it so that we don't build two icon_proxies ever.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting in a timeout to clear the icon if there were messages waiting when we lost the service.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making the service into an indicator service.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching over to using an indicator service manager instead of setting up the proxies by hand.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Comments and formatting.
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.5
+
[phone]  Ted Gould  <[e-mail]>
+
+	Tracking which applications we've seen before.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fail if we have init called more than once.  Merge comment.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Give us a minute before we write it out.
+
[phone]  Ted Gould  <[e-mail]>
+
+	When we're being reshown eval the label
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ah, classic failure
+
[phone]  Ted Gould  <[e-mail]>
+
+	Make this easier to test
+
[phone]  Ted Gould  <[e-mail]>
+
+	Building us a file.
+
[phone]  Ted Gould  <[e-mail]>
+
+	More comments
+
[phone]  Ted Gould  <[e-mail]>
+
+	Copyright headers.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Some comments
+
[phone]  Ted Gould  <[e-mail]>
+
+	Have a background process for writing out the seen DB
+
[phone]  Ted Gould  <[e-mail]>
+
+	Code to read in the keyfile
+
[phone]  Ted Gould  <[e-mail]>
+
+	Building a file name and checking if it exists.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Only build shortcuts if we've been seen before.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Checking to see if we've seen the application before choosing whether we have the name or the setup string.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding the new server to the seen database.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Building the seen db on init
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing to be more of a singleton type of thing.  Really that makes more sense.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making a basic interface for the seen database.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in support for shifting over command items
+
[phone]  Ted Gould  <[e-mail]>
+
+	Increasing the dbusmenu required version to 0.2.8
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making sure command items are using blanks
+
[phone]  Ted Gould  <[e-mail]>
+
+	Set the blank icon on proxy objects
+
[phone]  Ted Gould  <[e-mail]>
+
+	Grab changes in app icons.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Allow for applications icons to change incase we haven't gotten the property yet.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making a small indicator on apps that are running.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing app-gtk-menu-item as it really wasn't needed.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Looking for the right property
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing to use the new app type
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adds in an application menu item.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Replacing the count with the icon
+
[phone]  Ted Gould  <[e-mail]>
+
+	updating to trunk
+
[phone]  Ted Gould  <[e-mail]>
+
+	Building a new base object for our menuitem
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.4
+
[phone]  Ted Gould  <[e-mail]>
+
+	Make the avatar spacing same as the other icons in the menu
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting the minimum allocation for the image to be the menu icon size even if there isn't any pixmap.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting padding between the items to make them pretty like.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Use the standard libindicator icon handling
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switch to using the image helper and drop design team size
+
[phone]  Ted Gould  <[e-mail]>
+
+	Bumping libindicator version to 0.3.5
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fix to use translated string.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Grab translation for default name.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Handling bools by getting a value for indicators requesting attention.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching the attention callback to using a value so it can correctly handle booleans.
+
[phone]  Ted Gould  <[e-mail]>
+
+	String changes to match everyone else.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing from microblogging to broadcast
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.3
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting in default icons for the default apps that are panel themed
+
[phone]  Ted Gould  <[e-mail]>
+
+	Using the default icon in the application indicator as well.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making it so that if the app is default, it uses a generic icon.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in an icon lookup to the default apps db
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a base set of icons from the gnome theme.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting up default application names in the menu.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Checking the default name on application items
+
[phone]  Ted Gould  <[e-mail]>
+
+	Checking to see if we have a default name.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Keeping our desktop file paths safe.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Copyright headers.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making the default applications strings translatable.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in the setup function.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Refactoring into a helper
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding empathy and gwibber to the mix.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Actually searching through the list
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding a small little function to find default applications.
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.2
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in an icon to show the application as running
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in an application-running icon
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing the applications to have icons.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Put the icons into the active items.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing the launcher custom menu type
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switch to having a launcher be a standard item with an icon.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Getting dynamic items from libindicate and dbusmenu
+
[phone]  Ted Gould  <[e-mail]>
+
+	Upping dbusmenu dep to 0.2.5
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding protection from data fields by checking to ensure they're AppMenuItems
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting the listener to NULL after unrefing it.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Do a resort after adding new items.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Did I ever talk to you about why I hate while loops?  I have to stop using them.  They just lead to bugs.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Eh, forgot to flesh out the lists
+
[phone]  Ted Gould  <[e-mail]>
+
+	If we already have children, make sure to process them right away.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding some debug messages
+
[phone]  Ted Gould  <[e-mail]>
+
+	Moving the shortcuts along with the app item
+
[phone]  Ted Gould  <[e-mail]>
+
+	Getting the shortcuts in, and handling changes of them.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Realized that we can't proxy the root as the items can't then have two parents, and they need to exist with a parent in the menu that we're building.  So we have to leave the proxy items unparented until they get picked up in the service themselves.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding a list to put the shortcuts in
+
[phone]  Ted Gould  <[e-mail]>
+
+	Oops, wrong signal name for this function.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Emitting the new signal all over the place.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a shortcuts changed signal
+
[phone]  Ted Gould  <[e-mail]>
+
+	Handling root item changes.  Mostly.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Init and cleanup the client and root private properties.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fleshing out menu_cb, lots of avenues for expantion in other directions now.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding API for getting items
+
[phone]  Ted Gould  <[e-mail]>
+
+	Grabbing the static commands branch so we can build on it.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in the ability to take static commands from a desktop file
+
[phone]  Ted Gould  <[e-mail]>
+
+	Bumping libindicator to 0.3.3
+
[phone]  Ted Gould  <[e-mail]>
+
+	Use the string allocate by g_key_file instead of creating a new one
+
[phone]  Ted Gould  <[e-mail]>
+
+	Explicitly setting the visible property so we call pull it later.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching over to using _bool for the visible property
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding the shortcuts into the menuhandling code.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fleshing out the get_items function
+
[phone]  Ted Gould  <[e-mail]>
+
+	Applying the eclipsed value to the shortcuts that are associted with this launcher.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making visible use boolean properties.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Responding to clicking on the shortcuts
+
[phone]  Ted Gould  <[e-mail]>
+
+	Build us some shortcut menuitems
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in shortcuts and ids private variables.  Full lifecycle.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding a function to get the items that are in the desktop file.
+
[phone]  Ted Gould  <[e-mail]>
+
+	If we see a keyfile, use the keyfile processing.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Spliting out the launchers into the keyfiles
+
[phone]  Ted Gould  <[e-mail]>
+
+	Abstracting out the keyfile handling stuff.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in the ability to use keyfiles for the black list
+
[phone]  Ted Gould  <[e-mail]>
+
+	Property disconnect the count changed signal.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Some comments.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Disconnecting the signal handler attached to the listener when we go away.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing the in brackets creation of a variable that also existed in the function, thus creating a NULL pointer.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Kids, ignore pot
+
[phone]  Ted Gould  <[e-mail]>
+
+	Creating a local variable that was masking the one in the function.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fixing debug message
+
[phone]  Ted Gould  <[e-mail]>
+
+	I shouldn't have to have a ref there as it's got a ref count of one.
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.1
+
[phone]  Ted Gould  <[e-mail]>
+
+	Update to new dbusmenu 0.2.2
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fixing one more timestamp
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing callback prototype and activate signals
+
[phone]  Ted Gould  <[e-mail]>
+
+	Upping to dbusmenu-gtk 0.2.2
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.0
+
[phone]  Ted Gould  <[e-mail]>
+
+	Updating to dbusmenu v0.2.0
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching type to use the #define
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching the property callback to be GValue
+
[phone]  Ted Gould  <[e-mail]>
+
+	Requiring the 0.2.x series of dbusmenu
+
[phone]  Ted Gould  <[e-mail]>
+
+	Apparently order matters.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Disabling static builds because we don't need them, and they seem to cause errors on amd64.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Moving to the libindicator 0.3.0 API
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching to the new indicator interface.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Requiring the new libindicator
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding translator comments for the hours and minutes strings.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding a translators comments for minutes and hours strings.
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.2.6
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making sure that the menu is calculated after it is determined after the black list is checked.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Resort the menu after the blacklist has been checked case we've black listed the last item in the menu.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Stupid ordering, just asking for a memory leak.
+
[phone]  Ted Gould  <[e-mail]>
+
+	0.2.5
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a check to see if the time was set, if not, don't display it in the menu item.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making sure we don't update the text for the time if it's zero.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a creation seconds and returning that if seconds isn't set.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Checking for icon status when adding launchers to ensure that we get the correct status.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Checking to see if the menu should get un-hidden when we're installing new launchers.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Getting the path for icons from pkgconfig and putting them in the right location.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Using the new icon directory define.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a variable for the icon directory.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making a 0.2.4
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in the minimum width branch to fix descriptions getting truncated when they're a reasonable length.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a resort after editing the blacklist
+
[phone]  Ted Gould  <[e-mail]>
+
+	Too big
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting in teh size request a minimum width
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in the icon scaling branch
+
[phone]  Ted Gould  <[e-mail]>
+
+	Forgot to scale on icon changing.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting in a little code to scale icons.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Version to kick LP
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in branch to add a path for indicators in /usr/share and make it so that invalid desktop files don't create visible menu items.
+
[phone]  Ted Gould  <[e-mail]>
+
+	If we're not given a valid desktop file we should eclipse ourselves, and if we're eclipsed, we should hide the separator as well.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Looking at the old system apps directory as well.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing directory names
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making a purdy 0.2.3
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in i18n branch to add i18n.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Forgot intltool
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in header for gettext
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in some encoding to make things fun.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Oops, teach me to cut and paste :) 
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making it so the po directory is connected in.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding configure stuff in to set up gettext
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding a po directory with a list of files.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting up the gettext stuff.
+
[phone]  Sebstien Bacher  <[e-mail]>
+
+	Patch from Seb to init localization
+
[phone]  Ted Gould  <[e-mail]>
+
+	Going 0.2.2
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in the separators
+
[phone]  Ted Gould  <[e-mail]>
+
+	When removing an application item we need to get rid of its separator as well.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in the time init stuff into this branch so that it gets into this code review.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting the default seconds to be the current time.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switch to checking the separator by keeping track of the last one incase there are a bunch of launchers that are eclipsed at the end of the list.  We'll have too many cases, it's easier just to see who we unhide.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Check eclipse to see if we should make indicators visible or not.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Hiding the last item on the list depending on who is last.
+
[phone]  Ted Gould  <[e-mail]>
+
+	When eclipsing a launcher we're hiding it's separator as well.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting the separators into the resorting of the menu.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Handling separators on launchers.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Initializing local imList_t objects.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Forgot to initialize a separator.  Also initializing the locally defined server objects to make it easier to find bugs with not setting stuff.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making the server separator and putting it in.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Updated to current trunk.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Updating to latest trunk
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in the menu update branch.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding indicator-messages.service to the clean files for distcheck.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making 0.2.1
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting the dbus service (correctly) in the libexec directory instead of the bin directory.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in the local install flag to make that distcheck passes.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Update to the v2 API and getting the majority of 423013.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Bother.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Checking the wrong variable, let's not get caught by those legacy guys ;) 
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in support for properties changing on the indicator menu item on the visualization side of things.
+
[phone]  Ted Gould  <[e-mail]>
+
+	No atoi, no stdlib.h, that's how it is.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fixing as I fixed the libindicate API, we shouldn't have to do an atoi here.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting up the listener signal to make it so that we know when the count changes.  Using the property call back and just calling that function.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Replacing type with count
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing the count on the label boolean as we're detecting that differently now.
+
[phone]  Ted Gould  <[e-mail]>
+
+	We don't need to be tracking the added and removed signals for indicators anymore.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fleshing out indicator changing the attention parameter.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Connecting into the attention signal.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Processing the attention when an indicator leaves the building.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Comments.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fleshing out checking server attention by looking at all the indicators.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Initializing count
+
[phone]  Ted Gould  <[e-mail]>
+
+	Oops, a little silly before.  We really need to check the indicators as well, we can't just clear the attention for the count value.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Reworking how we handle the server count changing and how that makes us check for attention now.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding an attention parameter to the server and initing it.
+
[phone]  Ted Gould  <[e-mail]>
+
+	If the item was shown, and we're in an overload case, we need to find someone else to show when we're dying.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a small function to access the show variable.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Hiding the items that go over our bounds.  That's how it is.  Hard, hard, limits.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Defining the max number of indicators and telling the server about it.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting the property on the dbusmenu menuitem as well
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a show state.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fleshing out the attention_cb to make it record the value and signal on changes.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding an attention variable and a function to access it.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a signal for when the attention changes.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fleshing out the count item
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ask for all the properties up front.
+
[phone]  Ted Gould  <[e-mail]>
+
+	We're tracking count instead of whether we should show the time as a boolean.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making the sender support the name attribute and clean up the code a bit.
+
[phone]  Ted Gould  <[e-mail]>
+
+	oops forgot to remove type from the modified one, oops.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Well, you know, Oholoh says that I don't comment enough.  Better put some more in.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing the properties to be the indicate v2 ones.  Mostly this involves adding extra properties at this point.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing the indicate-gtk headers.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Dropping dep on indicate-gtk, we don't need it now that we're just passing the image data on.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Converting this over to an indicator menuitem.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fleshing out the indicator item.  It's purdy.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making sure these don't conflict with ones already in usage.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding properties for the new menuitems we need to build for showing applications and indicators.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing the type from the indicator_removed function.
+
[phone]  Ted Gould  <[e-mail]>
+
+	We have to drop show_time as a parameter as the caller doesn't really know if that's the case or not anymore.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Reshuffle.  Now the creation of an indicator makes for a im-menu-item without looking at type and subtype at all.  We'll have a bunch more now.
+
[phone]  Ted Gould  <[e-mail]>
+
+	libindicate dependency was already 0.2.0, but marking this as the case in the version history.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in the dbusmenu011 branch.  I think I got other trunk updates as well.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Bringing up to use some of the new features and defines in DBusmenu 0.1.1
+
[phone]  Ted Gould  <[e-mail]>
+
+	A variable and a prototype.  Such is life.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fixing a header and some defines.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Using the defines fo dealing with the icons and using the generic image type.  We're just passing along the PNGs right now.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Using defines for visibility.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Upping dbusmenu version
+
[phone]  Ted Gould  <[e-mail]>
+
+	Updating to dbusmenu 0.1.0 as a versioning snafu got involved.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing to version 0.2.0.  We need a release sometime.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in a branch that updates to the new dbusmenu but also uses it to add a custom launcher item.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Checking args from libdbusmenu, stealing code from there.  Comments by Neil.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Attaching a bug to a branch.
+
[phone]  Ted Gould  <[e-mail]>
+
+	This stuff is crashing big time now.  Not sure why it worked before, but not going to look into it now.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding a little style to our labels.  Hopefully making them look a little nicer.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Use that handy get_description function that we just merged in.  Heh, wonder why we did that...
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in the lift-and-separate branch to get the description function on there.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding a get_description function
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in the dirwatch branch
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting the type of the item and app name
+
[phone]  Ted Gould  <[e-mail]>
+
+	Filling in the new launcher menu item
+
[phone]  Ted Gould  <[e-mail]>
+
+	Pulling the type and the properties into the shared DBus header.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Injecting in a type for the launchers.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making ourselves a variable in the middle of everything.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Replacing the prop strings with defines
+
[phone]  Ted Gould  <[e-mail]>
+
+	Locking to version 0.0.2 to use some of the new nicities
+
[phone]  Ted Gould  <[e-mail]>
+
+	show -> visible
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in changes to make the green dot appear and the icon hide when no one is there.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding the green dot bug onto the branch.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Some debug messages and checking the list length, but most importantly, got the show/eclipsed logic backwards.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Checking hidden when servers are added and removed as well.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting in the hiding logic
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in teh ability to count the number of launchers that are visable
+
[phone]  Ted Gould  <[e-mail]>
+
+	The documentation clearly states that you don't need these if the client supports introspection.  I thought I was being old school by still putting them in.  But, THE DOCUMENTATION LIES, you need to add the signals no matter what.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Forgot to change to Ayatana
+
[phone]  Ted Gould  <[e-mail]>
+
+	Bad name, fixed.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting the attention parameter in the dbus interface.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Legal crap.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Oh, wow, now there's some flesh on these.  Let's hide and show icons.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting up signals and callbacks, oh my!  Watch for lions.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Building a proxy...
+
[phone]  Ted Gould  <[e-mail]>
+
+	Okay, now we're signaling change.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making some signal lovin'
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding the basic set functions into the C files.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Some comments.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Bringing up the object and having some variables to access.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Creating a real object and initing it.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Building an object to represent the service over DBus.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a new dbus interface.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching to ayatana.org and adding a new name for the service as a whole.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in the directory watch branch.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Checking to see if error is null before looking inside it.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Now we're really killing these puppies!  Don't cry, they weren't cuddly puppies.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fleshing out the first part of destroy, in that we're just removing an item from a list.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Relinking back to trunk.
+
[phone]  Ted Gould  <[e-mail]>
+
+	The launcher creation didn't test to see if it already exists.  Now we keep one launcher per desktop file.  Makes sense, eh?  That's what we're going for.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Start responding to changes in the applications directories
+
[phone]  Ted Gould  <[e-mail]>
+
+	I'd have to say that hash_table_find didn't do what I expected, and is pretty useless.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fleshing out remove to try to get rid of all these blacklist items.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Turning blacklist dir changes into events
+
[phone]  Ted Gould  <[e-mail]>
+
+	Basic code to monitor the directories
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in black list support
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in the black list branch.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Updating to trunk
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding the user APPS directory to the places where we can find applications
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching the build to take the directory as a parameter
+
[phone]  Ted Gould  <[e-mail]>
+
+	Some debug and fixing checking the desktop file.  All good.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Now parsing the directory on start up.  Getting this whole thing started up.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Writing the fairly extensive and complex check function.  But, if that's the way it needs to be, I guess it needs to be that way.
+
[phone]  Ted Gould  <[e-mail]>
+
+	We're taking ownership of that variable as well
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fleshing out the add function.  Just a little.
+
[phone]  Ted Gould  <[e-mail]>
+
+	More of a basis for the black list stuff.  Some functions and an interface.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in some seperators to make things more clear.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a couple of blacklist check point.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in the launchers branch
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in support for launchers
+
[phone]  Ted Gould  <[e-mail]>
+
+	Should be in milliseconds not micro
+
[phone]  Ted Gould  <[e-mail]>
+
+	Use a GDK app context.  Not sure about the timestamp units though.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Oh, some debug messages to see what's going on.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ah, where casting kills.  You can cast anything to the right value even though it's not.  Nice opaque errors you get for that.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Big commit.  Trying to check for eclipses, but first both objects needed to track their desktop file paths.  So I had to add that little nugget in as well.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding an eclipsed function for the LMI
+
[phone]  Ted Gould  <[e-mail]>
+
+	Clean up, clean up, everybody everywhere
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a couple function to deal with disappearing launchers.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in the activate logic so that the menu items actually launch the application.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding the launcher list to the resorting function.  This looks more complex than it is, it's just merging the two lists on the fly in alphabetical order.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making this file a little more readable.  Eh, I guess you never plan on them getting this big when you start do you?  I remember when he was just a little automake file.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Missing a couple headers for distcheckness
+
[phone]  Ted Gould  <[e-mail]>
+
+	Getting launchers to add to the menu, and changing the function to do that so it's not all server based.  We want everyone involved now.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting the label of the menu item.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Lots of debug, but also cleaning up the desktop file name path so it gets properly into the constructor.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Oops, forgot one level of redirection here
+
[phone]  Ted Gould  <[e-mail]>
+
+	Spliting out the building of the items as it'll read the desktop file off disk and parse it.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Go through the launchers and start building items
+
[phone]  Ted Gould  <[e-mail]>
+
+	Not sure why, but the naming of this file is really bugging me.  Fixed now.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a new menu-item type.  One for launchers!  Woo Hoo!
+
[phone]  Ted Gould  <[e-mail]>
+
+	No reason that all these should be linked into the loadable module.  Err, fail.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding the basis for launchers
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding directories.  Let's put them in one file so that they'll be changable easy :)
+
[phone]  Ted Gould  <[e-mail]>
+
+	AM 1.11 silent rule
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fixing the messaging indicator to unref the menu item, which removes the signal handlers.
+
[phone]  Ted Gould  <[e-mail]>
+
+	indicate-gtk changes that are required
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in the branch that pulls in the dbusmenu changes that change to using a service.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Aw, bother, turns out I messed up the service file.  Let's fix that.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Building a simple little activator to find out if we can activate the service.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting a little more error handling code in.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Failing on warnings
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching to the better dbus service dir
+
[phone]  Ted Gould  <[e-mail]>
+
+	Starting the service if it isn't there
+
[phone]  Ted Gould  <[e-mail]>
+
+	Getting a name, and grabbing it, and loving it...
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing the child_reorder function as it's now upstream
+
[phone]  Ted Gould  <[e-mail]>
+
+	First pass at moving everything to doing work with the DbusmenuMenuitem's instead of GTK
+
[phone]  Ted Gould  <[e-mail]>
+
+	Converting to a DbusmenuMenuitem instead of GtkMenuItem
+
[phone]  Ted Gould  <[e-mail]>
+
+	Converting to a DbusmenuMenuitem instead of GtkMenuItem
+
[phone]  Ted Gould  <[e-mail]>
+
+	First pass, build the listener and do fun stuff like that.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Building the indicator-messages-service
+
[phone]  Ted Gould  <[e-mail]>
+
+	A simple main() to get things to compile
+
[phone]  Ted Gould  <[e-mail]>
+
+	Install the DBus Service
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a service descriptor for adding to DBUS
+
[phone]  Ted Gould  <[e-mail]>
+
+	Lookup the dbus services
+
[phone]  Ted Gould  <[e-mail]>
+
+	Linking in the dbus data
+
[phone]  Ted Gould  <[e-mail]>
+
+	Moving the complex code into the service and leaving the rest for the loadable module.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in dbus name and object
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding a dependency on the dbus menu library.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in fix for tracking the timers.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Not setting the variable time_update_min when creating the source.  Bug found by Ka-Hing Cheung
+
[phone]  Ted Gould  <[e-mail]>
+
+	Get rid of the main menu variable that we're not using.  Hide the image.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting the name to 'messages'
+
[phone]  Ted Gould  <[e-mail]>
+
+	removing a warning by ref'ing the default
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fixing return type
+
[phone]  Ted Gould  <[e-mail]>
+
+	Breaking out into libindicator style function calls.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Including the indicator info
+
[phone]  Ted Gould  <[e-mail]>
+
+	Installing to indicator dir instead of other fun places
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting a 'dev' on the version number
+
[phone]  Ted Gould  <[e-mail]>
+
+	Increasing the version of indicate required and requiring indicator
+
[phone]  Ted Gould  <[e-mail]>
+
+	Some changes suggested by Cody Russell to make things a little bit safer.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Freeing the appinfo and type from the application object on finalize
+
[phone]  Ted Gould  <[e-mail]>
+
+	Moving signal disconnecting and unref to the dispose function instead of finalize.  Fix by Cody Russell on bug 362124.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding a ref'ing and deref'ing of the listener to the application menu item to ensure it stays around while we hav signals attached to it.  Fix by Code Russell on bug 362124.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fixes to the finalize function.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making a 6
+
[phone]  Ted Gould  <[e-mail]>
+
+	Merging in Cody's fix for 359018
+
[phone]  cody  <cody@raconteur>
+
+	move parent->finalize() to the end of the finalize function
+
[phone]  Ted Gould  <[e-mail]>
+
+	Including some cleanups from James Westby.  Thanks
+
[phone]  James Westby  <[e-mail]>
+
+	Be aware that appinfo can be NULL.
+
[phone]  James Westby  <[e-mail]>
+
+	Fix PKG_NAME in autogen.sh.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Require indicate version 0.1.5 or higher
+
[phone]  Ted Gould  <[e-mail]>
+
+	Trying to set this to also act like FUSA so that we get the same visual as the rest of the panel.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Make sure we disconnect from all our signals and free from memory that really exists.  Lots of little nasty bugs.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Actually removing indicators when the server goes bye-bye and freeing up the indicator data.  Wow, two biggie leaks.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Should have been using g_strcmp0 all along.  No reason not to use the safer one.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making these new0 to make sure that our lists are NULL
+
[phone]  Ted Gould  <[e-mail]>
+
+	Using the right symbol names now
+
[phone]  Ted Gould  <[e-mail]>
+
+	Using the correct way to find the DBus name and ids.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting version 0.1.5
+
[phone]  Ted Gould  <[e-mail]>
+
+	Showing some interest in teh clients we talk to.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in some consts to match the new prototypes better
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing version number
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making time more about it's own relative nature rather than a fixed time.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a couple of statics
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making it so that an indicator gets displayed when someone logs in, eventually it disappears.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting version number to 0.1.3 to match all of the other indicator stuff.  Probably should split things out more later.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making the truth correct
+
[phone]  Ted Gould  <[e-mail]>
+
+	Backwards sorting
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in message.im, should have spec'd this better now there's some drift.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making the IM list sorted and handling the time changed signal
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting the seconds into the private structure, a function to get them, and a signal when they change.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fleshing out the reconsile function.  And making sure it gets called everytime there is a name change on the server side.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Wrong name
+
[phone]  Ted Gould  <[e-mail]>
+
+	Relaying out the data structures so that the indicators are sub to the servers
+
[phone]  Ted Gould  <[e-mail]>
+
+	Forgot to actually pass the value to the signal, ahhhh
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching the servers from a hash table to a list.  Cleans things up a little, and sets us up for menu organization at a more complete level.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding functions to make it so that we can get signaled on name changes and also query them in app-menu-items
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting in a sorting function to make sure that the individual indicators are always below the server that they're associated with.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Bad truth
+
[phone]  Ted Gould  <[e-mail]>
+
+	Disconnecting our signals properly, avoids a crash
+
[phone]  Ted Gould  <[e-mail]>
+
+	Add simulation of zero count on server remove
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting up the library versioning to basically not have any, this is a module.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching the icon to be based on whether or not the server is reporting indicators instead of counting the number of indicators items.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Splitting the label updating into it's own function and making that called by the other functions that adjust how that happens.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in an unread count variable, and then a signal to show it chagned.  Also, watching for the indicators on this server to make sure it stays correct.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing the version number, but don't release it :)
+
[phone]  Ted Gould  <[e-mail]>
+
+	changing the size of the icon
+
[phone]  Ted Gould  <[e-mail]>
+
+	Turns out that in configure it was 'messaging' -- oops, fixed to be the same as everywhere else.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making this an upstream branch, no packaging.
+
[phone]  Ted Gould  <[e-mail]>
+
+	releasing version 0.1~ppa15
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making the menu hide itself if there is no one around
+
[phone]  Ted Gould  <[e-mail]>
+
+	releasing version 0.1~ppa14
+
[phone]  Ted Gould  <[e-mail]>
+
+	Forgot to change all the names.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making the image global, and changing it based on how many IMs we have.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Add a callback to display the app
+
[phone]  Ted Gould  <[e-mail]>
+
+	Oh, I forgot these create log messages.  Very annoying.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in desktop file support, which required configure changes to get the right headers.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in functions to get the desktop file and type of the application
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding a callback for when things like the time get modified.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in scaling of icons
+
[phone]  Ted Gould  <[e-mail]>
+
+	Setting up to use the icon and time helper functions and make icons update.  Whoot!
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a copyright for the debian packaging and description of the package license
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding myself as an author
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in license headers, GPL v3
+
[phone]  Ted Gould  <[e-mail]>
+
+	More debugging and temorarily showing the menu item ourselves
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in some debug messages
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in the basis for making a server based menu item
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing the need for an indicator
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in an application menu item to start building those
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making the activate callback static and putting in a prototype
+
[phone]  Ted Gould  <[e-mail]>
+
+	Removing warnings by getting the right pointer types
+
[phone]  Ted Gould  <[e-mail]>
+
+	Oh, two things.  First is setting alignment of the two strings and also getting the time from an ISO8601 string
+
[phone]  Ted Gould  <[e-mail]>
+
+	releasing version 0.1~ppa13
+
[phone]  Ted Gould  <[e-mail]>
+
+	Using the right damn function
+
[phone]  Ted Gould  <[e-mail]>
+
+	releasing version 0.1~ppa12
+
[phone]  Ted Gould  <[e-mail]>
+
+	Installing to the wrong directory
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in data directory
+
[phone]  Ted Gould  <[e-mail]>
+
+	releasing version 0.1~ppa11
+
[phone]  Ted Gould  <[e-mail]>
+
+	Taking the icons from Evolution and GNOME icon themes.  Some slight modifications.
+
[phone]  Ted Gould  <[e-mail]>
+
+	releasing version 0.1~ppa10
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in dummy icons
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in icons
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changed libindicate name to libindicate0, so need to have
+	another build in the PPA.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Bumping for PPA
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in activate callback when the menu item is
+	clicked on.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in an activate callback
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making things better, now menu items are created and
+	destroyed as they are, well, indicators are created
+	and destroyed.  Also minor cleanups.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Switching from a hash table to a list
+
[phone]  Ted Gould  <[e-mail]>
+
+	Putting a debug message on compare
+
[phone]  Ted Gould  <[e-mail]>
+
+	Warning on not removing something that should have been.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Basically now indicators show up if someone puts an IM message
+	on the Bus.  Way cool.  No delete or anything fancy, but good
+	progress.
+
[phone]  Ted Gould  <[e-mail]>
+
+	I always get the order of these backwards
+
[phone]  Ted Gould  <[e-mail]>
+
+	Changing the text to be a little shorter
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in a show that I forgot :(
+
[phone]  Ted Gould  <[e-mail]>
+
+	Better debug message and getting the time callback to check for the right property
+
[phone]  Ted Gould  <[e-mail]>
+
+	Lots of debugging message to figure out that I hadn't passed
+	the return variable in _new :(
+
[phone]  Ted Gould  <[e-mail]>
+
+	I hate me
+
[phone]  Ted Gould  <[e-mail]>
+
+	It's truly amazing how many logic errors I make
+
[phone]  Ted Gould  <[e-mail]>
+
+	Make menu items for IM indicators
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in some more warnings
+
[phone]  Ted Gould  <[e-mail]>
+
+	Forgot a _start
+
[phone]  Ted Gould  <[e-mail]>
+
+	Forgot to connect in the signal handler, oops.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Get this to compile
+
[phone]  Ted Gould  <[e-mail]>
+
+	Linking together
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fleshed this item out some
+
[phone]  Ted Gould  <[e-mail]>
+
+	Boiler plate IM menu items
+
[phone]  Ted Gould  <[e-mail]>
+
+	ifdef'ing out the mail stuff as we need to get IM working first
+
[phone]  Ted Gould  <[e-mail]>
+
+	Building the basis of what needs to be the indicator.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Adding in libindicate as a dependency
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ignore stuff
+
[phone]  Ted Gould  <[e-mail]>
+
+	Moving the directory
+
[phone]  Ted Gould  <[e-mail]>
+
+	Starting Debian Packaging
+
[phone]  Ted Gould  <[e-mail]>
+
+	Showing by default.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Making the directory the same as the applet.  Should have done that first, eh.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Ignoring
+
[phone]  Ted Gould  <[e-mail]>
+
+	Actually getting this all to build reasonably.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Checkmark checkin
+

=== modified file 'Makefile.am'
--- Makefile.am	2009-09-15 21:06:55 +0000
+++ Makefile.am	2011-01-14 20:29:34 +0000
@@ -4,5 +4,30 @@
 	data \
 	po
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
+DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall --enable-deprecations
 
+dist-hook:
+	@if test -d "$(top_srcdir)/.bzr"; \
+		then \
+			echo Creating ChangeLog && \
+				( cd "$(top_srcdir)" && \
+				echo '# Generated by Makefile. Do not edit.'; echo; \
+				$(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
+				&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+				|| (rm -f ChangeLog.tmp; \
+					echo Failed to generate ChangeLog >&2 ); \
+        else \
+			echo Failed to generate ChangeLog: not a branch >&2; \
+	fi
+	@if test -d "$(top_srcdir)/.bzr"; \
+		then \
+			echo Creating AUTHORS && \
+				( cd "$(top_srcdir)" && \
+				echo '# Generated by Makefile. Do not edit.'; echo; \
+				$(top_srcdir)/missing --run  bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
+				&& mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
+				|| (rm -f AUTHORS.tmp; \
+					echo Failed to generate AUTHORS >&2 ); \
+        else \
+			echo Failed to generate AUTHORS: not a branch >&2; \
+	fi

=== modified file 'Makefile.in'
--- Makefile.in	2010-08-12 18:08:18 +0000
+++ Makefile.in	2011-01-14 20:29:34 +0000
@@ -258,7 +258,7 @@
 	data \
 	po
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
+DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall --enable-deprecations
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -519,6 +519,9 @@
 	      || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-test -n "$(am__skip_mode_fix)" \
 	|| find "$(distdir)" -type d ! -perm -755 \
 		-exec chmod u+rwx,go+rx {} \; -o \
@@ -740,8 +743,8 @@
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
+	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
@@ -754,6 +757,32 @@
 	ps ps-am tags tags-recursive uninstall uninstall-am
 
 
+dist-hook:
+	@if test -d "$(top_srcdir)/.bzr"; \
+		then \
+			echo Creating ChangeLog && \
+				( cd "$(top_srcdir)" && \
+				echo '# Generated by Makefile. Do not edit.'; echo; \
+				$(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
+				&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+				|| (rm -f ChangeLog.tmp; \
+					echo Failed to generate ChangeLog >&2 ); \
+        else \
+			echo Failed to generate ChangeLog: not a branch >&2; \
+	fi
+	@if test -d "$(top_srcdir)/.bzr"; \
+		then \
+			echo Creating AUTHORS && \
+				( cd "$(top_srcdir)" && \
+				echo '# Generated by Makefile. Do not edit.'; echo; \
+				$(top_srcdir)/missing --run  bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
+				&& mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
+				|| (rm -f AUTHORS.tmp; \
+					echo Failed to generate AUTHORS >&2 ); \
+        else \
+			echo Failed to generate AUTHORS: not a branch >&2; \
+	fi
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

=== modified file 'aclocal.m4'
--- aclocal.m4	2010-08-12 18:08:18 +0000
+++ aclocal.m4	2011-01-14 20:29:34 +0000
@@ -8782,7 +8782,7 @@
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-_PKG_TEXT])dnl
+_PKG_TEXT])[]dnl
         ])
 elif test $pkg_failed = untried; then
      	AC_MSG_RESULT([no])
@@ -8793,7 +8793,7 @@
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
         ])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

=== modified file 'configure'
--- configure	2010-09-09 18:22:04 +0000
+++ configure	2011-01-14 20:29:34 +0000
@@ -918,6 +918,7 @@
 with_gnu_ld
 enable_libtool_lock
 enable_silent_rules
+enable_deprecations
 enable_localinstall
 '
       ac_precious_vars='build_alias
@@ -1564,6 +1565,7 @@
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-silent-rules          less verbose build output (undo: `make V=1')
   --disable-silent-rules         verbose build output (undo: `make V=0')
+  --enable-deprecations   allow deprecated API usage [default=yes]
   --enable-localinstall   install all of the files localy instead of system
                           directories (for distcheck)
 
@@ -2843,7 +2845,7 @@
 
 # Define the identity of the package.
  PACKAGE=indicator-messages
- VERSION=0.3.11
+ VERSION=0.3.90
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6257,13 +6259,13 @@
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6260: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6262: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6263: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6265: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6266: output\"" >&5)
+  (eval echo "\"\$as_me:6268: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7468,7 +7470,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7471 "configure"' > conftest.$ac_ext
+  echo '#line 7473 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8713,11 +8715,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8716: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8718: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8720: \$? = $ac_status" >&5
+   echo "$as_me:8722: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9052,11 +9054,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9055: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9057: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9059: \$? = $ac_status" >&5
+   echo "$as_me:9061: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9157,11 +9159,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9160: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9162: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9164: \$? = $ac_status" >&5
+   echo "$as_me:9166: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9212,11 +9214,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9215: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9217: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9219: \$? = $ac_status" >&5
+   echo "$as_me:9221: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11596,7 +11598,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11599 "configure"
+#line 11601 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11692,7 +11694,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11695 "configure"
+#line 11697 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11936,6 +11938,18 @@
 AM_BACKSLASH='\'
 
 
+# Check whether --enable-deprecations was given.
+if test "${enable_deprecations+set}" = set; then :
+  enableval=$enable_deprecations;
+else
+  enable_deprecations=yes
+fi
+
+if test "x$enable_deprecations" = xno; then :
+  CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"
+
+fi
+
 ###########################
 # Dependencies
 ###########################
@@ -11943,9 +11957,9 @@
 GTK_REQUIRED_VERSION=2.12
 GIO_UNIX_REQUIRED_VERSION=2.18
 PANEL_REQUIRED_VERSION=2.0.0
-INDICATE_REQUIRED_VERSION=0.3.0
+INDICATE_REQUIRED_VERSION=0.4.90
 INDICATOR_REQUIRED_VERSION=0.3.5
-DBUSMENUGTK_REQUIRED_VERSION=0.2.8
+DBUSMENUGTK_REQUIRED_VERSION=0.3.90
 
 
 
@@ -12078,21 +12092,21 @@
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
                           gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
                           indicator >= \$INDICATOR_REQUIRED_VERSION
-                          indicate >= \$INDICATE_REQUIRED_VERSION
-                          dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
+                          indicate-0.5 >= \$INDICATE_REQUIRED_VERSION
+                          dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
                           indicator >= $INDICATOR_REQUIRED_VERSION
-                          indicate >= $INDICATE_REQUIRED_VERSION
-                          dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5
+                          indicate-0.5 >= $INDICATE_REQUIRED_VERSION
+                          dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
                           indicator >= $INDICATOR_REQUIRED_VERSION
-                          indicate >= $INDICATE_REQUIRED_VERSION
-                          dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
+                          indicate-0.5 >= $INDICATE_REQUIRED_VERSION
+                          dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12106,21 +12120,21 @@
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED_VERSION
                           gio-unix-2.0 >= \$GIO_UNIX_REQUIRED_VERSION
                           indicator >= \$INDICATOR_REQUIRED_VERSION
-                          indicate >= \$INDICATE_REQUIRED_VERSION
-                          dbusmenu-gtk >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
+                          indicate-0.5 >= \$INDICATE_REQUIRED_VERSION
+                          dbusmenu-gtk-0.4 >= \$DBUSMENUGTK_REQUIRED_VERSION\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
                           indicator >= $INDICATOR_REQUIRED_VERSION
-                          indicate >= $INDICATE_REQUIRED_VERSION
-                          dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5
+                          indicate-0.5 >= $INDICATE_REQUIRED_VERSION
+                          dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
                           indicator >= $INDICATOR_REQUIRED_VERSION
-                          indicate >= $INDICATE_REQUIRED_VERSION
-                          dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
+                          indicate-0.5 >= $INDICATE_REQUIRED_VERSION
+                          dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12143,14 +12157,14 @@
 	        APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
                           indicator >= $INDICATOR_REQUIRED_VERSION
-                          indicate >= $INDICATE_REQUIRED_VERSION
-                          dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
+                          indicate-0.5 >= $INDICATE_REQUIRED_VERSION
+                          dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
         else
 	        APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
                           indicator >= $INDICATOR_REQUIRED_VERSION
-                          indicate >= $INDICATE_REQUIRED_VERSION
-                          dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
+                          indicate-0.5 >= $INDICATE_REQUIRED_VERSION
+                          dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$APPLET_PKG_ERRORS" >&5
@@ -12158,8 +12172,8 @@
 	as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
                           indicator >= $INDICATOR_REQUIRED_VERSION
-                          indicate >= $INDICATE_REQUIRED_VERSION
-                          dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) were not met:
+                          indicate-0.5 >= $INDICATE_REQUIRED_VERSION
+                          dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) were not met:
 
 $APPLET_PKG_ERRORS
 

=== modified file 'configure.ac'
--- configure.ac	2010-09-09 18:10:37 +0000
+++ configure.ac	2011-01-14 20:29:34 +0000
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-messages, 0.3.11)
+AM_INIT_AUTOMAKE(indicator-messages, 0.3.90)
 
 AM_MAINTAINER_MODE
 
@@ -22,6 +22,15 @@
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
+AC_ARG_ENABLE([deprecations],
+  [AS_HELP_STRING([--enable-deprecations],
+    [allow deprecated API usage @<:@default=yes@:>@])],
+  [],
+  [enable_deprecations=yes])
+AS_IF([test "x$enable_deprecations" = xno],
+  [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"]
+)
+
 ###########################
 # Dependencies 
 ###########################
@@ -29,15 +38,15 @@
 GTK_REQUIRED_VERSION=2.12
 GIO_UNIX_REQUIRED_VERSION=2.18
 PANEL_REQUIRED_VERSION=2.0.0
-INDICATE_REQUIRED_VERSION=0.3.0
+INDICATE_REQUIRED_VERSION=0.4.90
 INDICATOR_REQUIRED_VERSION=0.3.5
-DBUSMENUGTK_REQUIRED_VERSION=0.2.8
+DBUSMENUGTK_REQUIRED_VERSION=0.3.90
 
 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
                           indicator >= $INDICATOR_REQUIRED_VERSION
-                          indicate >= $INDICATE_REQUIRED_VERSION
-                          dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION)
+                          indicate-0.5 >= $INDICATE_REQUIRED_VERSION
+                          dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
 AC_SUBST(APPLET_CFLAGS)
 AC_SUBST(APPLET_LIBS)
 

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-09 18:08:54 +0000
+++ debian/changelog	2011-01-14 20:29:34 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 indicator-messages (0.3.11-0ubuntu4) natty; urgency=low
 
   * debian/control
@@ -11,6 +12,16 @@
 
  -- Greg Auger <[e-mail]> Tue, 09 Nov 2010 18:49:38 +0000
 
+=======
+indicator-messages (0.3.90-0ubuntu1~ppa1) natty; urgency=low
+
+  * New upstream release.
+    * GDBus Port
+    * New libindicate and dbusmenu
+
+ -- Ted Gould <[e-mail]>  Fri, 14 Jan 2011 14:25:15 -0600
+
+>>>>>>> MERGE-SOURCE
 indicator-messages (0.3.11-0ubuntu2) maverick; urgency=low
 
   * Rebuild for libindicator ABI change (LP: #637692)

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-03-25 01:26:43 +0000
+++ src/Makefile.am	2011-01-14 20:29:34 +0000
@@ -9,7 +9,8 @@
 messaginglib_LTLIBRARIES = libmessaging.la
 libmessaging_la_SOURCES = \
 	indicator-messages.c \
-	messages-service-client.h \
+	gen-messages-service.xml.h \
+	gen-messages-service.xml.c \
 	dbus-data.h
 libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
 libmessaging_la_LIBADD = $(APPLET_LIBS)
@@ -23,9 +24,10 @@
 	default-applications.h \
 	default-applications.c \
 	messages-service.c \
-	messages-service-server.h \
 	messages-service-dbus.c \
 	messages-service-dbus.h \
+	gen-messages-service.xml.h \
+	gen-messages-service.xml.c \
 	im-menu-item.c \
 	im-menu-item.h \
 	app-menu-item.c \
@@ -39,23 +41,19 @@
 indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
 indicator_messages_service_LDADD = $(APPLET_LIBS)
 
-messages-service-client.h: $(srcdir)/messages-service.xml
-	dbus-binding-tool \
-		--prefix=_messages_service_client \
-		--mode=glib-client \
-		--output=messages-service-client.h \
-		$(srcdir)/messages-service.xml
+gen-%.xml.h: %.xml
+	@echo "Building $@ from $<"
+	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
 
-messages-service-server.h: $(srcdir)/messages-service.xml
-	dbus-binding-tool \
-		--prefix=_messages_service_server \
-		--mode=glib-server \
-		--output=messages-service-server.h \
-		$(srcdir)/messages-service.xml
+gen-%.xml.c: %.xml
+	@echo "Building $@ from $<"
+	echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
+	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
+	@echo ";" >> $@
 
 BUILT_SOURCES = \
-	messages-service-client.h \
-	messages-service-server.h
+	gen-messages-service.xml.h \
+	gen-messages-service.xml.c
 
 CLEANFILES = \
 	$(BUILT_SOURCES)

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2010-08-12 18:08:18 +0000
+++ src/Makefile.in	2011-01-14 20:29:34 +0000
@@ -72,7 +72,8 @@
 LTLIBRARIES = $(messaginglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libmessaging_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libmessaging_la_OBJECTS = libmessaging_la-indicator-messages.lo
+am_libmessaging_la_OBJECTS = libmessaging_la-indicator-messages.lo \
+	libmessaging_la-gen-messages-service.xml.lo
 libmessaging_la_OBJECTS = $(am_libmessaging_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -86,6 +87,7 @@
 	indicator_messages_service-default-applications.$(OBJEXT) \
 	indicator_messages_service-messages-service.$(OBJEXT) \
 	indicator_messages_service-messages-service-dbus.$(OBJEXT) \
+	indicator_messages_service-gen-messages-service.xml.$(OBJEXT) \
 	indicator_messages_service-im-menu-item.$(OBJEXT) \
 	indicator_messages_service-app-menu-item.$(OBJEXT) \
 	indicator_messages_service-launcher-menu-item.$(OBJEXT) \
@@ -283,7 +285,8 @@
 messaginglib_LTLIBRARIES = libmessaging.la
 libmessaging_la_SOURCES = \
 	indicator-messages.c \
-	messages-service-client.h \
+	gen-messages-service.xml.h \
+	gen-messages-service.xml.c \
 	dbus-data.h
 
 libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
@@ -297,9 +300,10 @@
 	default-applications.h \
 	default-applications.c \
 	messages-service.c \
-	messages-service-server.h \
 	messages-service-dbus.c \
 	messages-service-dbus.h \
+	gen-messages-service.xml.h \
+	gen-messages-service.xml.c \
 	im-menu-item.c \
 	im-menu-item.h \
 	app-menu-item.c \
@@ -314,8 +318,8 @@
 indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
 indicator_messages_service_LDADD = $(APPLET_LIBS)
 BUILT_SOURCES = \
-	messages-service-client.h \
-	messages-service-server.h
+	gen-messages-service.xml.h \
+	gen-messages-service.xml.c
 
 CLEANFILES = \
 	$(BUILT_SOURCES)
@@ -446,11 +450,13 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-app-menu-item.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-default-applications.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-im-menu-item.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-launcher-menu-item.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-messages-service-dbus.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-messages-service.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_messages_service-seen-db.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmessaging_la-gen-messages-service.xml.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmessaging_la-indicator-messages.Plo@am__quote@
 
 .c.o:
@@ -485,6 +491,14 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmessaging_la_CFLAGS) $(CFLAGS) -c -o libmessaging_la-indicator-messages.lo `test -f 'indicator-messages.c' || echo '$(srcdir)/'`indicator-messages.c
 
+libmessaging_la-gen-messages-service.xml.lo: gen-messages-service.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmessaging_la_CFLAGS) $(CFLAGS) -MT libmessaging_la-gen-messages-service.xml.lo -MD -MP -MF $(DEPDIR)/libmessaging_la-gen-messages-service.xml.Tpo -c -o libmessaging_la-gen-messages-service.xml.lo `test -f 'gen-messages-service.xml.c' || echo '$(srcdir)/'`gen-messages-service.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmessaging_la-gen-messages-service.xml.Tpo $(DEPDIR)/libmessaging_la-gen-messages-service.xml.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gen-messages-service.xml.c' object='libmessaging_la-gen-messages-service.xml.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmessaging_la_CFLAGS) $(CFLAGS) -c -o libmessaging_la-gen-messages-service.xml.lo `test -f 'gen-messages-service.xml.c' || echo '$(srcdir)/'`gen-messages-service.xml.c
+
 indicator_messages_service-default-applications.o: default-applications.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_messages_service_CFLAGS) $(CFLAGS) -MT indicator_messages_service-default-applications.o -MD -MP -MF $(DEPDIR)/indicator_messages_service-default-applications.Tpo -c -o indicator_messages_service-default-applications.o `test -f 'default-applications.c' || echo '$(srcdir)/'`default-applications.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_messages_service-default-applications.Tpo $(DEPDIR)/indicator_messages_service-default-applications.Po
@@ -533,6 +547,22 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_messages_service_CFLAGS) $(CFLAGS) -c -o indicator_messages_service-messages-service-dbus.obj `if test -f 'messages-service-dbus.c'; then $(CYGPATH_W) 'messages-service-dbus.c'; else $(CYGPATH_W) '$(srcdir)/messages-service-dbus.c'; fi`
 
+indicator_messages_service-gen-messages-service.xml.o: gen-messages-service.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_messages_service_CFLAGS) $(CFLAGS) -MT indicator_messages_service-gen-messages-service.xml.o -MD -MP -MF $(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Tpo -c -o indicator_messages_service-gen-messages-service.xml.o `test -f 'gen-messages-service.xml.c' || echo '$(srcdir)/'`gen-messages-service.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Tpo $(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gen-messages-service.xml.c' object='indicator_messages_service-gen-messages-service.xml.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_messages_service_CFLAGS) $(CFLAGS) -c -o indicator_messages_service-gen-messages-service.xml.o `test -f 'gen-messages-service.xml.c' || echo '$(srcdir)/'`gen-messages-service.xml.c
+
+indicator_messages_service-gen-messages-service.xml.obj: gen-messages-service.xml.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_messages_service_CFLAGS) $(CFLAGS) -MT indicator_messages_service-gen-messages-service.xml.obj -MD -MP -MF $(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Tpo -c -o indicator_messages_service-gen-messages-service.xml.obj `if test -f 'gen-messages-service.xml.c'; then $(CYGPATH_W) 'gen-messages-service.xml.c'; else $(CYGPATH_W) '$(srcdir)/gen-messages-service.xml.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Tpo $(DEPDIR)/indicator_messages_service-gen-messages-service.xml.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gen-messages-service.xml.c' object='indicator_messages_service-gen-messages-service.xml.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_messages_service_CFLAGS) $(CFLAGS) -c -o indicator_messages_service-gen-messages-service.xml.obj `if test -f 'gen-messages-service.xml.c'; then $(CYGPATH_W) 'gen-messages-service.xml.c'; else $(CYGPATH_W) '$(srcdir)/gen-messages-service.xml.c'; fi`
+
 indicator_messages_service-im-menu-item.o: im-menu-item.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_messages_service_CFLAGS) $(CFLAGS) -MT indicator_messages_service-im-menu-item.o -MD -MP -MF $(DEPDIR)/indicator_messages_service-im-menu-item.Tpo -c -o indicator_messages_service-im-menu-item.o `test -f 'im-menu-item.c' || echo '$(srcdir)/'`im-menu-item.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_messages_service-im-menu-item.Tpo $(DEPDIR)/indicator_messages_service-im-menu-item.Po
@@ -813,19 +843,15 @@
 	uninstall-messaginglibLTLIBRARIES
 
 
-messages-service-client.h: $(srcdir)/messages-service.xml
-	dbus-binding-tool \
-		--prefix=_messages_service_client \
-		--mode=glib-client \
-		--output=messages-service-client.h \
-		$(srcdir)/messages-service.xml
+gen-%.xml.h: %.xml
+	@echo "Building $@ from $<"
+	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
 
-messages-service-server.h: $(srcdir)/messages-service.xml
-	dbus-binding-tool \
-		--prefix=_messages_service_server \
-		--mode=glib-server \
-		--output=messages-service-server.h \
-		$(srcdir)/messages-service.xml
+gen-%.xml.c: %.xml
+	@echo "Building $@ from $<"
+	echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
+	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
+	@echo ";" >> $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

=== modified file 'src/app-menu-item.c'
--- src/app-menu-item.c	2010-08-26 19:31:18 +0000
+++ src/app-menu-item.c	2011-01-14 20:29:34 +0000
@@ -70,8 +70,8 @@
 static void activate_cb (AppMenuItem * self, guint timestamp, gpointer data);
 static void count_changed (IndicateListener * listener, IndicateListenerServer * server, guint count, gpointer data);
 static void count_cb (IndicateListener * listener, IndicateListenerServer * server, guint value, gpointer data);
-static void menu_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * menupath, gpointer data);
-static void desktop_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data);
+static void menu_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * menupath, gpointer data);
+static void desktop_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * value, gpointer data);
 static void update_label (AppMenuItem * self);
 
 /* GObject Boilerplate */
@@ -300,7 +300,7 @@
    app structure and start sucking data out of it.
    Mostly the name. */
 static void 
-desktop_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * value, gpointer data)
+desktop_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * value, gpointer data)
 {
 	g_return_if_fail(IS_APP_MENU_ITEM(data));
 	AppMenuItem * self = APP_MENU_ITEM(data);
@@ -469,7 +469,7 @@
 /* Gets the path to menuitems if there are some.  Now we need to
    make them special. */
 static void
-menu_cb (IndicateListener * listener, IndicateListenerServer * server, gchar * menupath, gpointer data)
+menu_cb (IndicateListener * listener, IndicateListenerServer * server, const gchar * menupath, gpointer data)
 {
 	g_debug("Got Menu: %s", menupath);
 	g_return_if_fail(IS_APP_MENU_ITEM(data));

=== modified file 'src/dbus-data.h'
--- src/dbus-data.h	2010-08-26 19:31:18 +0000
+++ src/dbus-data.h	2011-01-14 20:29:34 +0000
@@ -2,11 +2,11 @@
 #ifndef __DBUS_DATA_H__
 #define __DBUS_DATA_H__ 1
 
-#define INDICATOR_MESSAGES_DBUS_NAME               "org.ayatana.indicator.messages"
-#define INDICATOR_MESSAGES_DBUS_OBJECT             "/org/ayatana/indicator/messages/menu"
+#define INDICATOR_MESSAGES_DBUS_NAME               "com.canonical.indicator.messages"
+#define INDICATOR_MESSAGES_DBUS_OBJECT             "/com/canonical/indicator/messages/menu"
 
-#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT     "/org/ayatana/indicator/messages/service"
-#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE  "org.ayatana.indicator.messages.service"
+#define INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT     "/com/canonical/indicator/messages/service"
+#define INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE  "com.canonical.indicator.messages.service"
 
 #define APPLICATION_MENUITEM_TYPE        "application-item"
 #define APPLICATION_MENUITEM_PROP_NAME   "label"

=== added file 'src/gen-messages-service.xml.c'
--- src/gen-messages-service.xml.c	1970-01-01 00:00:00 +0000
+++ src/gen-messages-service.xml.c	2011-01-14 20:29:34 +0000
@@ -0,0 +1,27 @@
+const char * _messages_service = 
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<node name=\"/\">\n"
+"	<interface name=\"com.canonical.indicator.messages.service\">\n"
+"\n"
+"<!-- Methods -->\n"
+"		<method name=\"Watch\">\n"
+"			<annotation name=\"org.freedesktop.DBus.GLib.Async\" value=\"true\" />\n"
+"		</method>\n"
+"		<method name=\"AttentionRequested\">\n"
+"			<arg type=\"b\" name=\"dot\" direction=\"out\" />\n"
+"		</method>\n"
+"		<method name=\"IconShown\">\n"
+"			<arg type=\"b\" name=\"hidden\" direction=\"out\" />\n"
+"		</method>\n"
+"\n"
+"<!-- Signals -->\n"
+"		<signal name=\"AttentionChanged\">\n"
+"			<arg type=\"b\" name=\"dot\" direction=\"out\" />\n"
+"		</signal>\n"
+"		<signal name=\"IconChanged\">\n"
+"			<arg type=\"b\" name=\"hidden\" direction=\"out\" />\n"
+"		</signal>\n"
+"\n"
+"	</interface>\n"
+"</node>\n"
+;

=== added file 'src/gen-messages-service.xml.h'
--- src/gen-messages-service.xml.h	1970-01-01 00:00:00 +0000
+++ src/gen-messages-service.xml.h	2011-01-14 20:29:34 +0000
@@ -0,0 +1,1 @@
+extern const char * _messages_service;

=== modified file 'src/im-menu-item.c'
--- src/im-menu-item.c	2010-08-12 14:25:35 +0000
+++ src/im-menu-item.c	2011-01-14 20:29:34 +0000
@@ -358,7 +358,7 @@
    this indicator should be calling for attention or not.  If we are,
    we need to signal that. */
 static void
-attention_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, const GValue * propertydata, gpointer data)
+attention_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GVariant * propertydata, gpointer data)
 {
 	g_debug("Got Attention Information");
 	ImMenuItem * self = IM_MENU_ITEM(data);
@@ -373,10 +373,10 @@
 	ImMenuItemPrivate * priv = IM_MENU_ITEM_GET_PRIVATE(self);
 
 	gboolean wantit;
-	if (G_VALUE_HOLDS_BOOLEAN(propertydata)) {
-		wantit = g_value_get_boolean(propertydata);
-	} else if (G_VALUE_HOLDS_STRING(propertydata)) {
-		const gchar * propstring = g_value_get_string(propertydata);
+	if (g_variant_is_of_type(propertydata, G_VARIANT_TYPE_BOOLEAN)) {
+		wantit = g_variant_get_boolean(propertydata);
+	} else if (g_variant_is_of_type(propertydata, G_VARIANT_TYPE_STRING)) {
+		const gchar * propstring = g_variant_get_string(propertydata, NULL);
 
 		if (propstring == NULL || propstring[0] == '\0' || !g_strcmp0(propstring, "false")) {
 			wantit = FALSE;
@@ -427,7 +427,7 @@
 	} else if (!g_strcmp0(property, INDICATE_INDICATOR_MESSAGES_PROP_COUNT)) {
 		indicate_listener_get_property(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_COUNT, count_cb, self);	
 	} else if (!g_strcmp0(property, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION)) {
-		indicate_listener_get_property_value(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION, attention_cb, self);	
+		indicate_listener_get_property_variant(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION, attention_cb, self);	
 	} else if (!g_strcmp0(property, "sender")) {
 		/* This is a compatibility string with v1 and should be removed */
 		g_debug("Indicator is using 'sender' property which is a v1 string.");
@@ -460,7 +460,7 @@
 	indicate_listener_get_property_time(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_TIME, time_cb, self);	
 	indicate_listener_get_property(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ICON, icon_cb, self);	
 	indicate_listener_get_property(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_COUNT, count_cb, self);	
-	indicate_listener_get_property_value(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION, attention_cb, self);	
+	indicate_listener_get_property_variant(listener, server, indicator, INDICATE_INDICATOR_MESSAGES_PROP_ATTENTION, attention_cb, self);	
 	indicate_listener_get_property(listener, server, indicator, "sender", sender_cb, self);	
 
 	g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL);

=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c	2010-09-03 18:13:16 +0000
+++ src/indicator-messages.c	2011-01-14 20:29:34 +0000
@@ -26,8 +26,6 @@
 #include <gtk/gtk.h>
 #include <libdbusmenu-gtk/menu.h>
 #include <libdbusmenu-gtk/menuitem.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
 
 #include <libindicator/indicator.h>
 #include <libindicator/indicator-object.h>
@@ -35,7 +33,7 @@
 #include <libindicator/indicator-service-manager.h>
 
 #include "dbus-data.h"
-#include "messages-service-client.h"
+#include "gen-messages-service.xml.h"
 
 #define INDICATOR_MESSAGES_TYPE            (indicator_messages_get_type ())
 #define INDICATOR_MESSAGES(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_MESSAGES_TYPE, IndicatorMessages))
@@ -69,8 +67,10 @@
 
 /* Globals */
 static GtkWidget * main_image = NULL;
-static DBusGProxy * icon_proxy = NULL;
+static GDBusProxy * icon_proxy = NULL;
 static GtkSizeGroup * indicator_right_group = NULL;
+static GDBusNodeInfo *            bus_node_info = NULL;
+static GDBusInterfaceInfo *       bus_interface_info = NULL;
 
 /* Prototypes */
 static void indicator_messages_class_init (IndicatorMessagesClass *klass);
@@ -99,6 +99,24 @@
 	io_class->get_image = get_icon;
 	io_class->get_menu = get_menu;
 
+	if (bus_node_info == NULL) {
+		GError * error = NULL;
+
+		bus_node_info = g_dbus_node_info_new_for_xml(_messages_service, &error);
+		if (error != NULL) {
+			g_error("Unable to parse Messaging Menu Interface description: %s", error->message);
+			g_error_free(error);
+		}
+	}
+
+	if (bus_interface_info == NULL) {
+		bus_interface_info = g_dbus_node_info_lookup_interface(bus_node_info, INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE);
+
+		if (bus_interface_info == NULL) {
+			g_error("Unable to find interface '" INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE "'");
+		}
+	}
+
 	return;
 }
 
@@ -145,54 +163,77 @@
 
 /* Functions */
 
-/* Called everytime the attention changes in the service. */
-static void
-attention_changed_cb (DBusGProxy * proxy, gboolean dot, gpointer userdata)
-{
-	if (dot) {
-		indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages-new");
-	} else {
-		indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages");
-	}
-	return;
-}
-
-/* Change the icon to whether it should be visible or not */
-static void
-icon_changed_cb (DBusGProxy * proxy, gboolean hidden, gpointer userdata)
-{
-	if (hidden) {
-		gtk_widget_hide(main_image);
-	} else {
-		gtk_widget_show(main_image);
-	}
+/* Signal off of the proxy */
+static void
+proxy_signal (GDBusProxy * proxy, const gchar * sender, const gchar * signal, GVariant * params, gpointer user_data)
+{
+	gboolean prop = g_variant_get_boolean(g_variant_get_child_value(params, 0));
+
+	if (g_strcmp0("AttentionChanged", signal) == 0) {
+		if (prop) {
+			indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages-new");
+		} else {
+			indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages");
+		}
+	} else if (g_strcmp0("IconChanged", signal) == 0) {
+		if (prop) {
+			gtk_widget_hide(main_image);
+		} else {
+			gtk_widget_show(main_image);
+		}
+	} else {
+		g_warning("Unknown signal %s", signal);
+	}
+
 	return;
 }
 
 /* Callback from getting the attention status from the service. */
 static void
-attention_cb (DBusGProxy * proxy, gboolean dot, GError * error, gpointer userdata)
+attention_cb (GObject * object, GAsyncResult * ares, gpointer user_data)
 {
+	GError * error = NULL;
+	GVariant * res = g_dbus_proxy_call_finish(G_DBUS_PROXY(object), ares, &error);
+
 	if (error != NULL) {
 		g_warning("Unable to get attention status: %s", error->message);
 		g_error_free(error);
 		return;
 	}
 
-	return attention_changed_cb(proxy, dot, userdata);
+	gboolean prop = g_variant_get_boolean(g_variant_get_child_value(res, 0));
+
+	if (prop) {
+		indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages-new");
+	} else {
+		indicator_image_helper_update(GTK_IMAGE(main_image), "indicator-messages");
+	}
+
+	return;
 }
 
 /* Change from getting the icon visibility from the service */
 static void
-icon_cb (DBusGProxy * proxy, gboolean hidden, GError * error, gpointer userdata)
+icon_cb (GObject * object, GAsyncResult * ares, gpointer user_data)
 {
+	GError * error = NULL;
+	GVariant * res = g_dbus_proxy_call_finish(G_DBUS_PROXY(object), ares, &error);
+
 	if (error != NULL) {
 		g_warning("Unable to get icon visibility: %s", error->message);
 		g_error_free(error);
 		return;
 	}
 
-	return icon_changed_cb(proxy, hidden, userdata);
+	gboolean prop = g_variant_get_boolean(g_variant_get_child_value(res, 0));
+	
+	if (prop) {
+		gtk_widget_hide(main_image);
+	} else {
+		gtk_widget_show(main_image);
+	}
+
+	return;
 }
 
 static guint connection_drop_timeout = 0;
@@ -209,6 +250,43 @@
 	return FALSE;
 }
 
+/* Proxy is setup now.. whoo! */
+static void
+proxy_ready_cb (GObject * obj, GAsyncResult * res, gpointer user_data)
+{
+	GError * error = NULL;
+	GDBusProxy * proxy = g_dbus_proxy_new_for_bus_finish(res, &error);
+
+	if (error != NULL) {
+		g_warning("Unable to get proxy of service: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	icon_proxy = proxy;
+
+	g_signal_connect(G_OBJECT(proxy), "g-signal", G_CALLBACK(proxy_signal), user_data);
+
+	g_dbus_proxy_call(icon_proxy,
+	                  "AttentionRequested",
+	                  NULL, /* params */
+	                  G_DBUS_CALL_FLAGS_NONE,
+	                  -1, /* timeout */
+	                  NULL, /* cancel */
+	                  attention_cb,
+	                  user_data);
+	g_dbus_proxy_call(icon_proxy,
+	                  "IconShown",
+	                  NULL, /* params */
+	                  G_DBUS_CALL_FLAGS_NONE,
+	                  -1, /* timeout */
+	                  NULL, /* cancel */
+	                  icon_cb,
+	                  user_data);
+
+	return;
+}
+
 /* Sets up all the icon information in the proxy. */
 static void 
 connection_change (IndicatorServiceManager * sm, gboolean connected, gpointer user_data)
@@ -225,51 +303,46 @@
 		return;
 	}
 
-	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-	if (connection == NULL) {
-		g_warning("Unable to get session bus");
-		return;
-	}
-
 	if (icon_proxy == NULL) {
-		icon_proxy = dbus_g_proxy_new_for_name(connection,
-		                                       INDICATOR_MESSAGES_DBUS_NAME,
-		                                       INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT,
-		                                       INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE);
-		if (icon_proxy == NULL) {
-			g_warning("Unable to get messages service interface.");
-			return;
-		}
-		
-		dbus_g_proxy_add_signal(icon_proxy, "AttentionChanged", G_TYPE_BOOLEAN, G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal(icon_proxy,
-		                            "AttentionChanged",
-		                            G_CALLBACK(attention_changed_cb),
-		                            NULL,
-		                            NULL);
-
-		dbus_g_proxy_add_signal(icon_proxy, "IconChanged", G_TYPE_BOOLEAN, G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal(icon_proxy,
-		                            "IconChanged",
-		                            G_CALLBACK(icon_changed_cb),
-		                            NULL,
-		                            NULL);
+		g_dbus_proxy_new_for_bus(G_BUS_TYPE_SESSION,
+		                         G_DBUS_PROXY_FLAGS_NONE,
+		                         bus_interface_info,
+		                         INDICATOR_MESSAGES_DBUS_NAME,
+		                         INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT,
+		                         INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE,
+		                         NULL, /* cancel */
+		                         proxy_ready_cb,
+		                         sm);
+	} else {
+		g_dbus_proxy_call(icon_proxy,
+		                  "AttentionRequested",
+		                  NULL, /* params */
+		                  G_DBUS_CALL_FLAGS_NONE,
+		                  -1, /* timeout */
+		                  NULL, /* cancel */
+		                  attention_cb,
+		                  sm);
+		g_dbus_proxy_call(icon_proxy,
+		                  "IconShown",
+		                  NULL, /* params */
+		                  G_DBUS_CALL_FLAGS_NONE,
+		                  -1, /* timeout */
+		                  NULL, /* cancel */
+		                  icon_cb,
+		                  sm);
 	}
 
-	org_ayatana_indicator_messages_service_attention_requested_async(icon_proxy, attention_cb, NULL);
-	org_ayatana_indicator_messages_service_icon_shown_async(icon_proxy, icon_cb, NULL);
-
 	return;
 }
 
 /* Sets the icon when it changes. */
 static void
-application_icon_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, gpointer user_data)
+application_icon_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, gpointer user_data)
 {
 	if (!g_strcmp0(prop, APPLICATION_MENUITEM_PROP_ICON)) {
 		/* Set the main icon */
 		if (GTK_IS_IMAGE(user_data)) {
-			gtk_image_set_from_icon_name(GTK_IMAGE(user_data), g_value_get_string(value), GTK_ICON_SIZE_MENU);
+			gtk_image_set_from_icon_name(GTK_IMAGE(user_data), g_variant_get_string(value, NULL), GTK_ICON_SIZE_MENU);
 		}
 	}
 
@@ -278,12 +351,12 @@
 
 /* Sets the label when it changes. */
 static void
-application_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, gpointer user_data)
+application_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, gpointer user_data)
 {
 	if (!g_strcmp0(prop, APPLICATION_MENUITEM_PROP_NAME)) {
 		/* Set the main label */
 		if (GTK_IS_LABEL(user_data)) {
-			gtk_label_set_text(GTK_LABEL(user_data), g_value_get_string(value));
+			gtk_label_set_text(GTK_LABEL(user_data), g_variant_get_string(value, NULL));
 		}
 	}
 
@@ -299,6 +372,7 @@
 static gboolean
 application_triangle_draw_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
+	GtkAllocation allocation;
 	GtkStyle *style;
 	cairo_t *cr;
 	int x, y, arrow_width, arrow_height;
@@ -316,11 +390,12 @@
 	/* set arrow position / dimensions */
 	arrow_width = 5; /* the pixel-based reference triangle is 5x9 */
 	arrow_height = 9;
-	x = widget->allocation.x;
-	y = widget->allocation.y + widget->allocation.height/2.0 - (double)arrow_height/2.0;
+	gtk_widget_get_allocation (widget, &allocation);
+	x = allocation.x;
+	y = allocation.y + allocation.height/2.0 - (double)arrow_height/2.0;
 
 	/* initialize cairo drawing area */
-	cr = (cairo_t*) gdk_cairo_create (widget->window);
+	cr = (cairo_t*) gdk_cairo_create (gtk_widget_get_window (widget));
 
 	/* set line width */	
 	cairo_set_line_width (cr, 1.0);
@@ -359,6 +434,7 @@
 static gboolean
 numbers_draw_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
+	GtkAllocation allocation;
 	GtkStyle *style;
 	cairo_t *cr;
 	double x, y, w, h;
@@ -371,10 +447,11 @@
 	style = gtk_widget_get_style (widget);
 
 	/* set arrow position / dimensions */
-	w = widget->allocation.width;
-	h = widget->allocation.height;
-	x = widget->allocation.x;
-	y = widget->allocation.y;
+	gtk_widget_get_allocation (widget, &allocation);
+	w = allocation.width;
+	h = allocation.height;
+	x = allocation.x;
+	y = allocation.y;
 
 	layout = gtk_label_get_layout (GTK_LABEL(widget));
 
@@ -385,7 +462,7 @@
 	font_size = pango_font_description_get_size (font_description); */
 
 	/* initialize cairo drawing area */
-	cr = (cairo_t*) gdk_cairo_create (widget->window);
+	cr = (cairo_t*) gdk_cairo_create (gtk_widget_get_window (widget));
 
 	/* set line width */	
 	cairo_set_line_width (cr, 1.0);
@@ -468,14 +545,14 @@
 /* Whenever we have a property change on a DbusmenuMenuitem
    we need to be responsive to that. */
 static void
-indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, indicator_item_t * mi_data)
+indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, indicator_item_t * mi_data)
 {
 	if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_LABEL)) {
 		/* Set the main label */
-		gtk_label_set_text(GTK_LABEL(mi_data->label), g_value_get_string(value));
+		gtk_label_set_text(GTK_LABEL(mi_data->label), g_variant_get_string(value, NULL));
 	} else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_RIGHT)) {
 		/* Set the right label */
-		gtk_label_set_text(GTK_LABEL(mi_data->right), g_value_get_string(value));
+		gtk_label_set_text(GTK_LABEL(mi_data->right), g_variant_get_string(value, NULL));
 	} else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_ICON)) {
 		/* We don't use the value here, which is probably less efficient, 
 		   but it's easier to use the easy function.  And since th value

=== removed file 'src/messages-service-client.h'
--- src/messages-service-client.h	2010-04-01 15:10:00 +0000
+++ src/messages-service-client.h	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-/* Generated by dbus-binding-tool; do not edit! */
-
-#include <glib.h>
-#include <dbus/dbus-glib.h>
-
-G_BEGIN_DECLS
-
-#ifndef _DBUS_GLIB_ASYNC_DATA_FREE
-#define _DBUS_GLIB_ASYNC_DATA_FREE
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-void
-_dbus_glib_async_data_free (gpointer stuff)
-{
-	g_slice_free (DBusGAsyncData, stuff);
-}
-#endif
-
-#ifndef DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_indicator_messages_service
-#define DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_indicator_messages_service
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-org_ayatana_indicator_messages_service_watch (DBusGProxy *proxy, GError **error)
-
-{
-  return dbus_g_proxy_call (proxy, "Watch", error, G_TYPE_INVALID, G_TYPE_INVALID);
-}
-
-typedef void (*org_ayatana_indicator_messages_service_watch_reply) (DBusGProxy *proxy, GError *error, gpointer userdata);
-
-static void
-org_ayatana_indicator_messages_service_watch_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
-  DBusGAsyncData *data = (DBusGAsyncData*) user_data;
-  GError *error = NULL;
-  dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
-  (*(org_ayatana_indicator_messages_service_watch_reply)data->cb) (proxy, error, data->userdata);
-  return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-org_ayatana_indicator_messages_service_watch_async (DBusGProxy *proxy, org_ayatana_indicator_messages_service_watch_reply callback, gpointer userdata)
-
-{
-  DBusGAsyncData *stuff;
-  stuff = g_slice_new (DBusGAsyncData);
-  stuff->cb = G_CALLBACK (callback);
-  stuff->userdata = userdata;
-  return dbus_g_proxy_begin_call (proxy, "Watch", org_ayatana_indicator_messages_service_watch_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-org_ayatana_indicator_messages_service_attention_requested (DBusGProxy *proxy, gboolean* OUT_dot, GError **error)
-
-{
-  return dbus_g_proxy_call (proxy, "AttentionRequested", error, G_TYPE_INVALID, G_TYPE_BOOLEAN, OUT_dot, G_TYPE_INVALID);
-}
-
-typedef void (*org_ayatana_indicator_messages_service_attention_requested_reply) (DBusGProxy *proxy, gboolean OUT_dot, GError *error, gpointer userdata);
-
-static void
-org_ayatana_indicator_messages_service_attention_requested_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
-  DBusGAsyncData *data = (DBusGAsyncData*) user_data;
-  GError *error = NULL;
-  gboolean OUT_dot;
-  dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_BOOLEAN, &OUT_dot, G_TYPE_INVALID);
-  (*(org_ayatana_indicator_messages_service_attention_requested_reply)data->cb) (proxy, OUT_dot, error, data->userdata);
-  return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-org_ayatana_indicator_messages_service_attention_requested_async (DBusGProxy *proxy, org_ayatana_indicator_messages_service_attention_requested_reply callback, gpointer userdata)
-
-{
-  DBusGAsyncData *stuff;
-  stuff = g_slice_new (DBusGAsyncData);
-  stuff->cb = G_CALLBACK (callback);
-  stuff->userdata = userdata;
-  return dbus_g_proxy_begin_call (proxy, "AttentionRequested", org_ayatana_indicator_messages_service_attention_requested_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVALID);
-}
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-gboolean
-org_ayatana_indicator_messages_service_icon_shown (DBusGProxy *proxy, gboolean* OUT_hidden, GError **error)
-
-{
-  return dbus_g_proxy_call (proxy, "IconShown", error, G_TYPE_INVALID, G_TYPE_BOOLEAN, OUT_hidden, G_TYPE_INVALID);
-}
-
-typedef void (*org_ayatana_indicator_messages_service_icon_shown_reply) (DBusGProxy *proxy, gboolean OUT_hidden, GError *error, gpointer userdata);
-
-static void
-org_ayatana_indicator_messages_service_icon_shown_async_callback (DBusGProxy *proxy, DBusGProxyCall *call, void *user_data)
-{
-  DBusGAsyncData *data = (DBusGAsyncData*) user_data;
-  GError *error = NULL;
-  gboolean OUT_hidden;
-  dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_BOOLEAN, &OUT_hidden, G_TYPE_INVALID);
-  (*(org_ayatana_indicator_messages_service_icon_shown_reply)data->cb) (proxy, OUT_hidden, error, data->userdata);
-  return;
-}
-
-static
-#ifdef G_HAVE_INLINE
-inline
-#endif
-DBusGProxyCall*
-org_ayatana_indicator_messages_service_icon_shown_async (DBusGProxy *proxy, org_ayatana_indicator_messages_service_icon_shown_reply callback, gpointer userdata)
-
-{
-  DBusGAsyncData *stuff;
-  stuff = g_slice_new (DBusGAsyncData);
-  stuff->cb = G_CALLBACK (callback);
-  stuff->userdata = userdata;
-  return dbus_g_proxy_begin_call (proxy, "IconShown", org_ayatana_indicator_messages_service_icon_shown_async_callback, stuff, _dbus_glib_async_data_free, G_TYPE_INVALID);
-}
-#endif /* defined DBUS_GLIB_CLIENT_WRAPPERS_org_ayatana_indicator_messages_service */
-
-G_END_DECLS

=== modified file 'src/messages-service-dbus.c'
--- src/messages-service-dbus.c	2009-08-26 15:35:56 +0000
+++ src/messages-service-dbus.c	2011-01-14 20:29:34 +0000
@@ -24,9 +24,10 @@
 #include "config.h"
 #endif
 
-#include <dbus/dbus-glib.h>
+#include <gio/gio.h>
 #include "messages-service-dbus.h"
 #include "dbus-data.h"
+#include "gen-messages-service.xml.h"
 
 enum {
 	ATTENTION_CHANGED,
@@ -40,6 +41,7 @@
 
 struct _MessageServiceDbusPrivate
 {
+	GDBusConnection * connection;
 	gboolean dot;
 	gboolean hidden;
 };
@@ -51,15 +53,26 @@
 static void message_service_dbus_init       (MessageServiceDbus *self);
 static void message_service_dbus_dispose    (GObject *object);
 static void message_service_dbus_finalize   (GObject *object);
-
-static void _messages_service_server_watch  (void);
-static gboolean _messages_service_server_attention_requested (MessageServiceDbus * self, gboolean * dot, GError ** error);
-static gboolean _messages_service_server_icon_shown (MessageServiceDbus * self, gboolean * hidden, GError ** error);
-
-#include "messages-service-server.h"
+static void     bus_method_call             (GDBusConnection * connection,
+                                             const gchar * sender,
+                                             const gchar * path,
+                                             const gchar * interface,
+                                             const gchar * method,
+                                             GVariant * params,
+                                             GDBusMethodInvocation * invocation,
+                                             gpointer user_data);
+
+static GDBusNodeInfo *            bus_node_info = NULL;
+static GDBusInterfaceInfo *       bus_interface_info = NULL;
+static const GDBusInterfaceVTable bus_interface_table = {
+	method_call:    bus_method_call,
+	get_property:   NULL,  /* No properties */
+	set_property:   NULL   /* No properties */
+};
 
 G_DEFINE_TYPE (MessageServiceDbus, message_service_dbus, G_TYPE_OBJECT);
 
+
 static void
 message_service_dbus_class_init (MessageServiceDbusClass *klass)
 {
@@ -86,8 +99,57 @@
 	                                      g_cclosure_marshal_VOID__BOOLEAN,
 	                                      G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 
-
-	dbus_g_object_type_install_info(MESSAGE_SERVICE_DBUS_TYPE, &dbus_glib__messages_service_server_object_info);
+	if (bus_node_info == NULL) {
+		GError * error = NULL;
+
+		bus_node_info = g_dbus_node_info_new_for_xml(_messages_service, &error);
+		if (error != NULL) {
+			g_error("Unable to parse Messaging Menu Interface description: %s", error->message);
+			g_error_free(error);
+		}
+	}
+
+	if (bus_interface_info == NULL) {
+		bus_interface_info = g_dbus_node_info_lookup_interface(bus_node_info, INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE);
+
+		if (bus_interface_info == NULL) {
+			g_error("Unable to find interface '" INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE "'");
+		}
+	}
+
+	return;
+}
+
+static void
+connection_cb (GObject * object, GAsyncResult * res, gpointer user_data)
+{
+	GError * error = NULL;
+	GDBusConnection * connection = g_bus_get_finish(res, &error);
+
+	if (error != NULL) {
+		g_error("Unable to connect to the session bus: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(user_data);
+	priv->connection = connection;
+
+	g_dbus_connection_register_object(connection,
+	                                  INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT,
+	                                  bus_interface_info,
+	                                  &bus_interface_table,
+	                                  user_data,
+	                                  NULL, /* destroy */
+	                                  &error);
+
+	if (error != NULL) {
+		g_error("Unable to register on session bus: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	g_debug("Service on session bus");
 
 	return;
 }
@@ -95,10 +157,7 @@
 static void
 message_service_dbus_init (MessageServiceDbus *self)
 {
-	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-	dbus_g_connection_register_g_object(connection,
-										INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT,
-										G_OBJECT(self));
+	g_bus_get(G_BUS_TYPE_SESSION, NULL, connection_cb, self);
 
 	MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(self);
 
@@ -111,7 +170,12 @@
 static void
 message_service_dbus_dispose (GObject *object)
 {
+	MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(object);
 
+	if (priv->connection != NULL) {
+		g_object_unref(priv->connection);
+		priv->connection = NULL;
+	}
 
 	G_OBJECT_CLASS (message_service_dbus_parent_class)->dispose (object);
 	return;
@@ -132,31 +196,23 @@
 	return MESSAGE_SERVICE_DBUS(g_object_new(MESSAGE_SERVICE_DBUS_TYPE, NULL));
 }
 
-/* DBus function to say that someone is watching */
+/* Method request off of DBus */
 static void
-_messages_service_server_watch  (void)
-{
-
-}
-
-/* DBus interface to request the private variable to know
-   whether there is a green dot. */
-static gboolean
-_messages_service_server_attention_requested (MessageServiceDbus * self, gboolean * dot, GError ** error)
-{
-	MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(self);
-	*dot = priv->dot;
-	return TRUE;
-}
-
-/* DBus interface to request the private variable to know
-   whether the icon is hidden. */
-static gboolean
-_messages_service_server_icon_shown (MessageServiceDbus * self, gboolean * hidden, GError ** error)
-{
-	MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(self);
-	*hidden = priv->hidden;
-	return TRUE;
+bus_method_call (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * method, GVariant * params, GDBusMethodInvocation * invocation, gpointer user_data)
+{
+	MessageServiceDbusPrivate * priv = MESSAGE_SERVICE_DBUS_GET_PRIVATE(user_data);
+
+	if (g_strcmp0("AttentionRequested", method) == 0) {
+		g_dbus_method_invocation_return_value(invocation, g_variant_new("(b)", priv->dot));
+		return;
+	} else if (g_strcmp0("IconShown", method) == 0) {
+		g_dbus_method_invocation_return_value(invocation, g_variant_new("(b)", priv->hidden));
+		return;
+	} else {
+		g_warning("Unknown function call '%s'", method);
+	}
+
+	return;
 }
 
 void
@@ -167,6 +223,16 @@
 	if (attention != priv->dot) {
 		priv->dot = attention;
 		g_signal_emit(G_OBJECT(self), signals[ATTENTION_CHANGED], 0, priv->dot, TRUE);
+
+		if (priv->connection != NULL) {
+			g_dbus_connection_emit_signal(priv->connection,
+			                              NULL,
+			                              INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT,
+			                              INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE,
+			                              "AttentionChanged",
+			                              g_variant_new("(b)", priv->dot),
+			                              NULL);
+		}
 	}
 	return;
 }
@@ -179,6 +245,16 @@
 	if (hidden != priv->hidden) {
 		priv->hidden = hidden;
 		g_signal_emit(G_OBJECT(self), signals[ICON_CHANGED], 0, priv->hidden, TRUE);
+
+		if (priv->connection != NULL) {
+			g_dbus_connection_emit_signal(priv->connection,
+			                              NULL,
+			                              INDICATOR_MESSAGES_DBUS_SERVICE_OBJECT,
+			                              INDICATOR_MESSAGES_DBUS_SERVICE_INTERFACE,
+			                              "IconChanged",
+			                              g_variant_new("(b)", priv->hidden),
+			                              NULL);
+		}
 	}
 	return;
 }

=== removed file 'src/messages-service-server.h'
--- src/messages-service-server.h	2010-08-12 18:09:42 +0000
+++ src/messages-service-server.h	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-/* Generated by dbus-binding-tool; do not edit! */
-
-
-#ifndef __dbus_glib_marshal__messages_service_server_MARSHAL_H__
-#define __dbus_glib_marshal__messages_service_server_MARSHAL_H__
-
-#include	<glib-object.h>
-
-G_BEGIN_DECLS
-
-#ifdef G_ENABLE_DEBUG
-#define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
-#define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
-#define g_marshal_value_peek_int(v)      g_value_get_int (v)
-#define g_marshal_value_peek_uint(v)     g_value_get_uint (v)
-#define g_marshal_value_peek_long(v)     g_value_get_long (v)
-#define g_marshal_value_peek_ulong(v)    g_value_get_ulong (v)
-#define g_marshal_value_peek_int64(v)    g_value_get_int64 (v)
-#define g_marshal_value_peek_uint64(v)   g_value_get_uint64 (v)
-#define g_marshal_value_peek_enum(v)     g_value_get_enum (v)
-#define g_marshal_value_peek_flags(v)    g_value_get_flags (v)
-#define g_marshal_value_peek_float(v)    g_value_get_float (v)
-#define g_marshal_value_peek_double(v)   g_value_get_double (v)
-#define g_marshal_value_peek_string(v)   (char*) g_value_get_string (v)
-#define g_marshal_value_peek_param(v)    g_value_get_param (v)
-#define g_marshal_value_peek_boxed(v)    g_value_get_boxed (v)
-#define g_marshal_value_peek_pointer(v)  g_value_get_pointer (v)
-#define g_marshal_value_peek_object(v)   g_value_get_object (v)
-#else /* !G_ENABLE_DEBUG */
-/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
- *          Do not access GValues directly in your code. Instead, use the
- *          g_value_get_*() functions
- */
-#define g_marshal_value_peek_boolean(v)  (v)->data[0].v_int
-#define g_marshal_value_peek_char(v)     (v)->data[0].v_int
-#define g_marshal_value_peek_uchar(v)    (v)->data[0].v_uint
-#define g_marshal_value_peek_int(v)      (v)->data[0].v_int
-#define g_marshal_value_peek_uint(v)     (v)->data[0].v_uint
-#define g_marshal_value_peek_long(v)     (v)->data[0].v_long
-#define g_marshal_value_peek_ulong(v)    (v)->data[0].v_ulong
-#define g_marshal_value_peek_int64(v)    (v)->data[0].v_int64
-#define g_marshal_value_peek_uint64(v)   (v)->data[0].v_uint64
-#define g_marshal_value_peek_enum(v)     (v)->data[0].v_long
-#define g_marshal_value_peek_flags(v)    (v)->data[0].v_ulong
-#define g_marshal_value_peek_float(v)    (v)->data[0].v_float
-#define g_marshal_value_peek_double(v)   (v)->data[0].v_double
-#define g_marshal_value_peek_string(v)   (v)->data[0].v_pointer
-#define g_marshal_value_peek_param(v)    (v)->data[0].v_pointer
-#define g_marshal_value_peek_boxed(v)    (v)->data[0].v_pointer
-#define g_marshal_value_peek_pointer(v)  (v)->data[0].v_pointer
-#define g_marshal_value_peek_object(v)   (v)->data[0].v_pointer
-#endif /* !G_ENABLE_DEBUG */
-
-
-/* NONE:POINTER */
-#define dbus_glib_marshal__messages_service_server_VOID__POINTER	g_cclosure_marshal_VOID__POINTER
-#define dbus_glib_marshal__messages_service_server_NONE__POINTER	dbus_glib_marshal__messages_service_server_VOID__POINTER
-
-/* BOOLEAN:POINTER,POINTER */
-extern void dbus_glib_marshal__messages_service_server_BOOLEAN__POINTER_POINTER (GClosure     *closure,
-                                                                                 GValue       *return_value,
-                                                                                 guint         n_param_values,
-                                                                                 const GValue *param_values,
-                                                                                 gpointer      invocation_hint,
-                                                                                 gpointer      marshal_data);
-void
-dbus_glib_marshal__messages_service_server_BOOLEAN__POINTER_POINTER (GClosure     *closure,
-                                                                     GValue       *return_value G_GNUC_UNUSED,
-                                                                     guint         n_param_values,
-                                                                     const GValue *param_values,
-                                                                     gpointer      invocation_hint G_GNUC_UNUSED,
-                                                                     gpointer      marshal_data)
-{
-  typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER_POINTER) (gpointer     data1,
-                                                             gpointer     arg_1,
-                                                             gpointer     arg_2,
-                                                             gpointer     data2);
-  register GMarshalFunc_BOOLEAN__POINTER_POINTER callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-  gboolean v_return;
-
-  g_return_if_fail (return_value != NULL);
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_BOOLEAN__POINTER_POINTER) (marshal_data ? marshal_data : cc->callback);
-
-  v_return = callback (data1,
-                       g_marshal_value_peek_pointer (param_values + 1),
-                       g_marshal_value_peek_pointer (param_values + 2),
-                       data2);
-
-  g_value_set_boolean (return_value, v_return);
-}
-
-G_END_DECLS
-
-#endif /* __dbus_glib_marshal__messages_service_server_MARSHAL_H__ */
-
-#include <dbus/dbus-glib.h>
-static const DBusGMethodInfo dbus_glib__messages_service_server_methods[] = {
-  { (GCallback) _messages_service_server_watch, dbus_glib_marshal__messages_service_server_NONE__POINTER, 0 },
-  { (GCallback) _messages_service_server_attention_requested, dbus_glib_marshal__messages_service_server_BOOLEAN__POINTER_POINTER, 48 },
-  { (GCallback) _messages_service_server_icon_shown, dbus_glib_marshal__messages_service_server_BOOLEAN__POINTER_POINTER, 121 },
-};
-
-const DBusGObjectInfo dbus_glib__messages_service_server_object_info = {
-  0,
-  dbus_glib__messages_service_server_methods,
-  3,
-"org.ayatana.indicator.messages.service\0Watch\0A\0\0org.ayatana.indicator.messages.service\0AttentionRequested\0S\0dot\0O\0F\0N\0b\0\0org.ayatana.indicator.messages.service\0IconShown\0S\0hidden\0O\0F\0N\0b\0\0\0",
-"org.ayatana.indicator.messages.service\0AttentionChanged\0org.ayatana.indicator.messages.service\0IconChanged\0\0",
-"\0"
-};
-

=== modified file 'src/messages-service.c'
--- src/messages-service.c	2010-08-26 19:31:18 +0000
+++ src/messages-service.c	2011-01-14 20:29:34 +0000
@@ -25,7 +25,6 @@
 #include <libintl.h>
 #include <config.h>
 #include <pango/pango-utils.h>
-#include <dbus/dbus-glib-bindings.h>
 #include <libindicate/listener.h>
 #include <libindicator/indicator-service.h>
 #include <gio/gio.h>

=== modified file 'src/messages-service.xml'
--- src/messages-service.xml	2009-08-26 02:40:35 +0000
+++ src/messages-service.xml	2011-01-14 20:29:34 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
-	<interface name="org.ayatana.indicator.messages.service">
+	<interface name="com.canonical.indicator.messages.service">
 
 <!-- Methods -->
 		<method name="Watch">