* New upstream release.

  * Fix service file names
  * Add log domain
  * Fix dbusmenu prototypes

13 files changed, 3067 insertions, 26 deletions

diff --git a/AUTHORS b/AUTHORS
index a1771e3..ec0ccc9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,14 @@
-Ted Gould <ted@canonical.com>
-Cody Russell <crussell@canonical.com>
+# Generated by Makefile. Do not edit.
+
+ Alexander Sack 
+ Christoph Korn 
+ Cody Russell 
+ David Barth 
+ Gabor Kelemen 
+ Ken VanDine 
+ Kyle Nitzsche 
+ Marc Deslauriers 
+ Martin Pitt 
+ Michael Terry 
+ Ted Gould 
+ vish 
diff --git a/ChangeLog b/ChangeLog
index e69de29..285cdd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -0,0 +1,2949 @@
+# Generated by Makefile. Do not edit.
+
+2011-01-28  Ted Gould  <ted@gould.cx>
+
+	0.2.12
+
+2011-01-28  Ted Gould  <ted@gould.cx>
+
+	Fixing prototypes to match dbusmenu
+
+2011-01-18  Ted Gould  <ted@gould.cx>
+
+	Fixing log domain and dist
+
+2011-01-17  Ted Gould  <ted@gould.cx>
+
+	Adding in log domains for messages
+
+2011-01-17  Ted Gould  <ted@gould.cx>
+
+	Oops, up to trunk we go.
+
+2011-01-17  Ted Gould  <ted@gould.cx>
+
+	Removing the indicator-users service file as we don't build this anymore.
+
+2011-01-17  Ted Gould  <ted@gould.cx>
+
+	Changing service files
+
+2010-09-21  Ted Gould  <ted@gould.cx>
+
+	Generating Changelog and AUTHORS by make dist
+
+2011-01-14  Ken VanDine  <ken.vandine@canonical.com>
+
+	version bump, 0.2.11
+
+2011-01-13  Ken VanDine  <ken.vandine@canonical.com>
+
+	dbus interface rename, com.canonical
+
+2011-01-13  Ken VanDine  <ken.vandine@canonical.com>
+
+	Merged gdbus/dbusmenu 0.4 port from Michael Terry
+
+2011-01-11  Michael Terry  <mike@mterry.name>
+
+	and cancel the cancel object
+
+2011-01-11  Michael Terry  <mike@mterry.name>
+
+	also dispose of canel object
+
+2011-01-11  Michael Terry  <mike@mterry.name>
+
+	port to gdbus and dbusmenu 0.4
+
+2010-09-03  Ted Gould  <ted@gould.cx>
+
+	Don't look at an invalid message.
+
+2010-09-01  Ted Gould  <ted@gould.cx>
+
+	Removing the error messages as it's not always initialized properly.
+
+2010-08-12  Ted Gould  <ted@gould.cx>
+
+	0.2.10
+
+2010-08-12  Ted Gould  <ted@gould.cx>
+
+	Fixing the lock screen functionality to match the new design.
+
+2010-08-06  Ted Gould  <ted@gould.cx>
+
+	Linking to bug 599848
+
+2010-08-06  Ted Gould  <ted@gould.cx>
+
+	Add and accel group to the indicator for the shortcut
+
+2010-08-06  Ted Gould  <ted@gould.cx>
+
+	Putting the shortcut on the menuitem
+
+2010-08-06  Ted Gould  <ted@gould.cx>
+
+	Set up the listener for the keybinding
+
+2010-08-06  Ted Gould  <ted@gould.cx>
+
+	Getting keybinding defines
+
+2010-08-06  Ted Gould  <ted@gould.cx>
+
+	Making it so that lock_screen always locks the screen
+
+2010-08-06  Ted Gould  <ted@gould.cx>
+
+	Removing the ability to have the menu item say anything other than 'Lock Screen'
+
+2010-08-12  Ted Gould  <ted@gould.cx>
+
+	Fixing captialization of the completion string.
+
+2010-08-02  Cody Russell  <crussell@canonical.com>
+
+	Bump version.
+
+2010-08-02  Cody Russell  <crussell@canonical.com>
+
+	Ellipsize
+
+2010-07-31  vish  <vish@ubuntu.com>
+
+	Changing 'Restart Required' to 'Restart To Complete Update'
+
+2010-04-09  Ted Gould  <ted@gould.cx>
+
+	0.2.8
+
+2010-04-07  Ted Gould  <ted@gould.cx>
+
+	Make restart and shutdown configurable with GConf
+
+2010-04-06  Ted Gould  <ted@gould.cx>
+
+	Check to see if the shutdown and restart items should be shown on first run.
+
+2010-04-06  Ted Gould  <ted@gould.cx>
+
+	Changing prototype to not have the same info twice.
+
+2010-04-06  Ted Gould  <ted@gould.cx>
+
+	Filling out everything to check and update the shutdown/restart items
+
+2010-04-06  Ted Gould  <ted@gould.cx>
+
+	Adding the restart and shutdown keys and functions to check them.
+
+2010-04-06  Ted Gould  <ted@gould.cx>
+
+	Formatting
+
+2010-04-06  Ted Gould  <ted@gould.cx>
+
+	Adding configuration options for the restart menuitem and the shutdown one.
+
+2010-04-06  Ted Gould  <ted@gould.cx>
+
+	Not printing a message that is sometimes invalid.
+
+2010-04-01  Ted Gould  <ted@gould.cx>
+
+	Seems that the message isn't always valid
+
+2010-04-06  Ted Gould  <ted@gould.cx>
+
+	Passing the right object in the guest activate callback.
+
+2010-04-06  Ted Gould  <ted@gould.cx>
+
+	Attaching bug
+
+2010-04-06  Ted Gould  <ted@gould.cx>
+
+	Adding some protection.  We should always use protection.
+
+2010-04-06  Ted Gould  <ted@gould.cx>
+
+	Actually pass the service in the callback
+
+2010-03-31  Ted Gould  <ted@gould.cx>
+
+	Switching 'Sleep' to 'Suspend'
+
+2010-03-25  Ted Gould  <ted@gould.cx>
+
+	Changing the menu item to 'Suspend'
+
+2010-03-29  Ted Gould  <ted@gould.cx>
+
+	Use contexts correctly.
+
+2010-03-29  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	Use contexts properly
+
+2010-03-25  Ted Gould  <ted@gould.cx>
+
+	0.2.7
+
+2010-03-25  Ted Gould  <ted@gould.cx>
+
+	Adding a switch for translations that don't have a useful 'Switch From'
+
+2010-03-24  Ted Gould  <ted@gould.cx>
+
+	Adding in a check to see if the translator would like to fallback to not using the username.
+
+2010-03-24  Ted Gould  <ted@gould.cx>
+
+	Properly scale avatars if they are too large.
+
+2010-03-24  Ted Gould  <ted@gould.cx>
+
+	Flipping things around a little bit so that if we get an error, we'll still build the default icon.
+
+2010-03-24  Ted Gould  <ted@gould.cx>
+
+	Scale the avatars to be ICON_SIZE_MENU
+
+2010-03-24  Ted Gould  <ted@gould.cx>
+
+	String fix for some not backed out.
+
+2010-03-23  Ted Gould  <ted@gould.cx>
+
+	Fixes bug 545578
+
+2010-03-23  Ted Gould  <ted@gould.cx>
+
+	Missed the 'Switch Off' texts in the dialog.
+
+2010-03-18  Ted Gould  <ted@gould.cx>
+
+	0.2.6
+
+2010-03-18  Ted Gould  <ted@gould.cx>
+
+	Reverting from 'Switch Off' to 'Shut Down'
+
+2010-03-18  Ted Gould  <ted@gould.cx>
+
+	Handle updating of sessions and mark the guest account when it has an open session.
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Linking to 436030
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Watch for the logged in property changing and hide or show the logged in widget depending on it.
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Some debugging an checking to ensure the menu item is not NULL
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Uhg, false sucks.
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Using defines to make sure the strings are right.
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Switching to getting locked proxies.  Just to have more error handling.
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Switching to the generated dbus interface
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Grabbing the session interface from consolekit
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Switching to using sesson proxies for the session we want to look at instead of our session
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Setting the logged in parameter on the guest item and tracking the session ID of the guest session.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Setting the guest item once it gets built.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Adding a guest_item for the guest menu item and a function to set it.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	When a session is added or removed we need to change the state of that user item.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Setting the menuitem for the user.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Adding a menuitem property to the user data structure.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Switching both of these function to using the generated header file.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Building a proxy to the local display factory
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Adding in the GDM local display DBus interface spec.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Adding a way to activate the guest session through GDM
+
+2010-03-18  Ted Gould  <ted@gould.cx>
+
+	Only lock screensaver if the screensaver is set to lock.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Make sure to call to activate teh screensaver if we can't lock it.  Oh, and that takes a reply.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Splitting out the params here.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Forgot to make this static.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Adding lock-helper.c in as it has translatable strings now.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Adding in the mechanism to actually do the callback and change the label.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Connecting in the update item.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Adding a function for updating the logout menuitem.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Instead of making the item disabled, change the text when we won't lock the screen.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Sync up to trunk.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Bad boolean
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Add in the key for locking the screen and making that part of will_lock
+
+2010-03-18  Ted Gould  <ted@gould.cx>
+
+	Using an icon for users or a stock item if they don't have an icon.
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Linking to 436028
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Getting the horizontal padding for a nice spacing between widgets.
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Handling the file URIs
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Moving debug message
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Check to ensure the file exists.
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Nice debugging message.
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Using proper icon.
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Setting the user icon
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Building an icon based on teh icon props
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Some properties for putting icons on the user items.
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Changing the case of 'Switch From'
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Updating the PO files and removing the fuzzy on the case change.
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Updating to Ubuntu translations
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Fix capitalization of 'Switch From'
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Merging in the Ubuntu translations gotten as a tarball from Launchpad
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Adding in new languages.
+
+2010-03-17  Ted Gould  <ted@gould.cx>
+
+	Adding in the Ubuntu Translator's translations
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Track whether we've setup GConf notification and unregister on update.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Tracking the notifications, so that we can unregister them with new menus.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	When switching users try to lock the screen
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Switching the debug message to be more correct.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Making a small little wrapper to check the lockdown key.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Grabbing the screensaver gconf key branch
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Lock the screen in the various activate functions.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	If policy kit disables the suspend and hibernate don't show them.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Checking the error to make sure we're getting back reasonable data or reporting the error.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Use the upower allowed interface to check to see if PK is blocking suspend and hibernate
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Grabbing the upower definition file so that we can build a client for it.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Adding properties for allowing the suspend and hibernate
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Grab the branch doing screensaver stuff.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Adding a GConf key for showing the logout item.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Add in checking whether the logout button is shown, and get it changing with the others.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Update to handle the new key for showing the logout menu item.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Adding in a new gconf key for showing the logout button.
+
+2010-03-16  Ted Gould  <ted@gould.cx>
+
+	Watching for the screensaver lockdown GConf key.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Switching the suspend/hibernate handling to a cached value.  And that way we can regen the menus without looking up the values.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Only setup signals if we're building the proxy for the first time.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Adding some comments to describe a long function.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Handling the locking of the screen in the rebuild function.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Removing the lock separator as we don't need it anymore.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Changing the lockdown key to do all the switching instead of just the switch user item.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Switching from hiding entries to just rebuilding the menus.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Switching around the GConf notification setup to do an entire directory.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Tracking the separator next to the lock item as well.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Embarassing 4 letter word to forget.  Guess the compiler would add it back anyway though.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Reacting to changes in the screensaver lockdown key.
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Changing the define name to have room for more locdown keys
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Updating to latest trunk
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Switching the names of the restart icons.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Making sure that if we can't get the icon, we leave it alone.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Switching to building with GIcon so that we don't have to add an icon, we can use fallbacks.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Restart icon name.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Merging in the panel restart icon branch
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Changing the emblem to system-restart-panel
+
+2010-03-15  Ted Gould  <ted@gould.cx>
+
+	Allowing for a desktop file to be tacted on the end of the session menu.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Looking for a desktop file, and if it exists, putting it as a final menu item.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Adding in gio-unix for desktop file reading
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Use the libindicator image helper to get fallbacks and nicer icons.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Using the libindicator helpers so we get things like fallbacks!  \o/
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Upping libindicator dep to 0.3.5
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	The icon changed enough, we need to have the restart icon stuff.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Make it so the panel icon can switch between two values based on whether the user needs to restart
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Merging to trunk to remove merge conflicts.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Keeping the names the same for now, until we have artwork.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Copyright headers
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Making our service come up a little earlier
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Protecting from a NULL object
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Setting the icon when the restart is touched.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Moving the icon names into the shared header files
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Getting the icon, but only when we're connected.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Setting the icon to something sensable
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Icon name changing signal for updating the image.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Building us a proxy!  Now we are dangerous.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Add shared names for the dbus interfaces.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Creating our little dbus-object.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Build us a signal
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	providing a set_name function
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Setting up the object and giving it a name.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Connecting and registering the dbus object.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Setting up session dbus interface client server stuff.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Adding in base objects
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Simple starter object for making the dbus interface.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Use the library i18n libs to use the right translation domain.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Setting up the indicator to use library translations so they'll be grabbed from the right domain.
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Putting the restart icon in the gutter by using a GtkImageMenuItem
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Changing the service to use the new menu item
+
+2010-03-12  Ted Gould  <ted@gould.cx>
+
+	Adding in a handler and renderer for the restart required item
+
+2010-03-11  Ted Gould  <ted@gould.cx>
+
+	A bunch of properties to make our new menu item type.
+
+2010-03-10  Ted Gould  <ted@gould.cx>
+
+	Translation updates from OEM
+
+2010-03-10  Kyle Nitzsche  <kyle.nitzsche@canonical.com>
+
+	add LINGUAS with 31 languages and corresponding 31 po files, which adds 14 strings (10 fuzzy, 8 untransalted)
+
+2010-03-10  Ted Gould  <ted@gould.cx>
+
+	Match the prototyp of the signal correctly.
+
+2010-03-10  Cody Russell  <crussell@canonical.com>
+
+	Use gint64, not UserData*, for the callback to user-added signal.
+
+2010-03-04  Ted Gould  <ted@gould.cx>
+
+	0.2.5
+
+2010-03-04  Ted Gould  <ted@gould.cx>
+
+	Setting the icon and changing the text on the restart menu if one is required by update.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Some function comments.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Adds a file watcher to see if we should change the menuitem to warn that a restart is recommended.
+
+2010-03-04  Ted Gould  <ted@gould.cx>
+
+	Updating to new logout dialogs.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	LGPL not needed with dropping the logout-dialog.c file.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Sync to trunk
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Copyright headers
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Slightly longer string for better wrapping.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Setting the default button.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	String fixes and a comment.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Checking to see if we need updates and allowing that on logout dialogs.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Adding in different button strings if we need authentication.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Filling in the code to check and see if we can restart or stop.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Flattening the build tree.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Updating merge to new enums.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Merging in the consolekit branch to get the interface file.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Skeleton for checking the different states.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Removing the old ck-pk helpers.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Flipping button order
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Putting the image in and cleaning up the props
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Provide the basis for the window
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Switching translatable file.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Adding in all the strings.
+
+2010-02-24  Ted Gould  <ted@gould.cx>
+
+	Changing to new enums and function prototypes.
+
+2010-02-24  Ted Gould  <ted@gould.cx>
+
+	Adding some types of dialog and a new function.
+
+2010-02-23  Ted Gould  <ted@gould.cx>
+
+	Place holder new object
+
+2010-02-23  Ted Gould  <ted@gould.cx>
+
+	Removing the old logout dialog.  It's been through too much, better to start over.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Changing strings to match distro wide sleep and switch off.
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Suspends to sleep
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Changing shutdowns to switch offs
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Removing the current user from the list.
+
+2010-03-02  Ted Gould  <ted@gould.cx>
+
+	Switching things around a little bit.  Making sure we always go through the list to search for the guest account to see if it's logged in.  But, still not making menu entries.
+
+2010-03-02  Ted Gould  <ted@gould.cx>
+
+	Restructuring callbacks to not need the count variable.
+
+2010-03-02  Ted Gould  <ted@gould.cx>
+
+	Making it so that count is not a global and just calculated from the list.
+
+2010-03-02  Ted Gould  <ted@gould.cx>
+
+	Making it so that users is not a global and just grabbed everytime and used.
+
+2010-03-02  Ted Gould  <ted@gould.cx>
+
+	Check the UID to see if it's me
+
+2010-03-03  Ted Gould  <ted@gould.cx>
+
+	Sorting based on real names and conflict naming.
+
+2010-03-02  Ted Gould  <ted@gould.cx>
+
+	If we ARE a conflicted name then we need to fallback into displaying the user name.
+
+2010-03-02  Ted Gould  <ted@gould.cx>
+
+	Creating a field for the user that has the real name in it, and a place for that to conflict.
+
+2010-03-02  Ted Gould  <ted@gould.cx>
+
+	Sort by real name
+
+2010-03-02  Ted Gould  <ted@gould.cx>
+
+	Removing errors on getting sessions from CK and some other cleanups.
+
+2010-03-01  Ted Gould  <ted@gould.cx>
+
+	Switching to using the dbus client code.
+
+2010-03-01  Ted Gould  <ted@gould.cx>
+
+	Stealing the consolekit manager interface out of consolekit
+
+2010-03-02  Ted Gould  <ted@gould.cx>
+
+	Unreffing an allocated layout.
+
+2010-03-01  Ted Gould  <ted@gould.cx>
+
+	Unreffing the layout that we allocated
+
+2010-02-25  Ted Gould  <ted@gould.cx>
+
+	Stop forcing the decorations on.
+
+2010-02-25  Cody Russell  <crussell@canonical.com>
+
+	Don't set the gdk decorations.
+
+2010-02-25  Ted Gould  <ted@gould.cx>
+
+	Fixing ConsoleKit fallback to wait on responses.
+
+2010-02-25  Ted Gould  <ted@gould.cx>
+
+	can't really use async as we dont' have a mainloop here
+
+2010-02-25  Ted Gould  <ted@gould.cx>
+
+	Switching to getting a reply
+
+2010-02-25  Ted Gould  <ted@gould.cx>
+
+	0.2.4
+
+2010-02-25  Ted Gould  <ted@gould.cx>
+
+	Falling back to ConsoleKit when we can't talk to Gnome Session
+
+2010-02-24  Ted Gould  <ted@gould.cx>
+
+	Adding in shutdown and restart
+
+2010-02-24  Ted Gould  <ted@gould.cx>
+
+	Adding a fallback for now gnome-session detected.
+
+2010-02-25  Ted Gould  <ted@gould.cx>
+
+	Name changes for upower
+
+2010-02-23  Ted Gould  <ted@gould.cx>
+
+	Changed names to patch current upower
+
+2010-02-19  Ted Gould  <ted@gould.cx>
+
+	Fixing when we can't connect to GDM
+
+2010-02-19  David Barth  <david.barth@canonical.com>
+
+	prevent crash in g_error when gdm is not running
+
+2010-02-18  Ted Gould  <ted@gould.cx>
+
+	0.2.3
+
+2010-02-18  Ted Gould  <ted@gould.cx>
+
+	adding prototype for new user item
+
+2010-02-18  Ted Gould  <ted@gould.cx>
+
+	Adding in user items
+
+2010-02-17  Ted Gould  <ted@gould.cx>
+
+	Switching users over to user items
+
+2010-02-17  Ted Gould  <ted@gould.cx>
+
+	Switching the guest over to a user item.
+
+2010-02-17  Ted Gould  <ted@gould.cx>
+
+	Fleshing out the building of the user item
+
+2010-02-17  Ted Gould  <ted@gould.cx>
+
+	Registering a handler for our new type
+
+2010-02-17  Ted Gould  <ted@gould.cx>
+
+	Adding in some defines for our new menu type.
+
+2010-02-17  Ted Gould  <ted@gould.cx>
+
+	Building the make files
+
+2010-02-17  Ted Gould  <ted@gould.cx>
+
+	Adding a status directory and icons for accounts that are logged in
+
+2010-02-18  Ted Gould  <ted@gould.cx>
+
+	Switching label to be 'switch from'
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	Removing comment.
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	Adding in the ability to monitor style changes and re-evaluate.
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	Fixing a value
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	Calculating font size with PANGO_SCALE getting involved
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	Switching to using Pango to get the width
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	Make sure to realize the offscreen window
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	Get returns in better shape
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	Switching the menu item that we're creating.
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	Fleshing out the menu_switch function with a function that looks at the length of the label and sees if we need to ellipsize it or not.
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	Setting up the type handler
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	Building shared names for dbusmenu objects.
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	Woot, a dbusmenu, much better.
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	Refactoring so the menu is created in init.
+
+2010-02-08  Ted Gould  <ted@gould.cx>
+
+	First pass, get the string.
+
+2010-02-17  Ted Gould  <ted@gould.cx>
+
+	Switching from DevKit Power to upower
+
+2010-02-17  Martin Pitt  <martin.pitt@canonical.com>
+
+	Port from DeviceKit-power to upower
+
+2010-02-17  Ted Gould  <ted@gould.cx>
+
+	Fix the order of items to the new design spec
+
+2010-02-16  David Barth  <david.barth@canonical.com>
+
+	add forgotten separator and re-order the user switch entry according to the spec
+
+2010-02-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	included autogen.sh in EXTRA_DIST to make packagers happy
+
+2010-02-11  Ted Gould  <ted@gould.cx>
+
+	0.2.2
+
+2010-02-09  Ted Gould  <ted@gould.cx>
+
+	Enabling and fixing user switching.
+
+2010-02-09  Cody Russell  <crussell@canonical.com>
+
+	The reincarnation of user switching
+
+2010-02-08  Ted Gould  <ted@gould.cx>
+
+	Removing GPM proxy as we're not using the setting.
+
+2010-02-08  Ted Gould  <ted@gould.cx>
+
+	Removing the callback into the lock helper for GDM autologin settings change.
+
+2010-02-08  Ted Gould  <ted@gould.cx>
+
+	Removing the gdm proxy creation and usage.
+
+2010-02-08  Ted Gould  <ted@gould.cx>
+
+	Kill screensaver autobuild proxy
+
+2010-02-08  Ted Gould  <ted@gould.cx>
+
+	Only get the screensaver proxy when needed.
+
+2010-02-08  Ted Gould  <ted@gould.cx>
+
+	Only building the proxy when we try to do something with the proxy.
+
+2010-02-08  Ted Gould  <ted@gould.cx>
+
+	Checking the lockdown key for user switching.
+
+2010-02-08  Cody Russell  <crussell@canonical.com>
+
+	Remove unnecessary cast
+
+2010-02-08  Cody Russell  <crussell@canonical.com>
+
+	Fixes
+
+2010-02-08  Cody Russell  <crussell@canonical.com>
+
+	Check switch_menuitem for NULL first
+
+2010-02-08  Cody Russell  <crussell@canonical.com>
+
+	Fix a typo
+
+2010-02-08  Cody Russell  <crussell@canonical.com>
+
+	Lockdown
+
+2010-02-04  Ted Gould  <ted@gould.cx>
+
+	0.2.1
+
+2010-02-04  Ted Gould  <ted@gould.cx>
+
+	Making the proxy track GNOME Screensaver
+
+2010-02-04  Marc Deslauriers  <marc.deslauriers@canonical.com>
+
+	- src/lock-helper.c: use dbus_g_proxy_new_for_name so when
+	gnome-screensaver gets respawned by D-Bus, indicator-session will
+	still be able to communicate with it. (LP: #484603)
+
+2010-02-04  Ted Gould  <ted@gould.cx>
+
+	Updating to new dbusmenu interfaces.
+
+2010-02-02  Ted Gould  <ted@gould.cx>
+
+	Changing more prototypes to match the new activate signal.
+
+2010-02-02  Ted Gould  <ted@gould.cx>
+
+	Changing the lock_screen function to match the new activate prototype.
+
+2010-01-08  Ted Gould  <ted@gould.cx>
+
+	0.2.0
+
+2010-01-05  Ted Gould  <ted@gould.cx>
+
+	Clean up POTFILES.in
+
+2010-01-05  Ted Gould  <ted@gould.cx>
+
+	Forgot to include user-service-dbus.h in the dist
+
+2010-01-05  Ted Gould  <ted@gould.cx>
+
+	Removing the status bits and pieces (they're now in indicator-me) and merging users and session so that we only have one service and one menu.  Nice and simple.
+
+2010-01-04  Ted Gould  <ted@gould.cx>
+
+	Adding in a separator
+
+2010-01-04  Ted Gould  <ted@gould.cx>
+
+	Cleaning out user-service.c
+
+2010-01-04  Ted Gould  <ted@gould.cx>
+
+	First pass at merging user-service in.
+
+2010-01-04  Ted Gould  <ted@gould.cx>
+
+	Switching the session service to using a IndicatorService object.
+
+2010-01-04  Ted Gould  <ted@gould.cx>
+
+	Trying to clean these two up for getting ready to merge.
+
+2010-01-04  Ted Gould  <ted@gould.cx>
+
+	Killing the user service
+
+2009-12-24  Ted Gould  <ted@gould.cx>
+
+	Simplifying the indicator so that it just gets a menu.  That's it! 
+
+2009-12-24  Ted Gould  <ted@gould.cx>
+
+	Removing more of the icons.
+
+2009-12-24  Ted Gould  <ted@gould.cx>
+
+	Removing status icons.
+
+2009-12-24  Ted Gould  <ted@gould.cx>
+
+	Dropping the status service file.
+
+2009-12-24  Ted Gould  <ted@gould.cx>
+
+	Brutal status rip out.
+
+2009-12-22  Ted Gould  <ted@gould.cx>
+
+	Merging in changes needed for the new libdbusmenu.
+
+2009-12-18  Ted Gould  <ted@gould.cx>
+
+	Settin' some bools
+
+2009-12-18  Ted Gould  <ted@gould.cx>
+
+	Setting booleans and values oh my! 
+
+2009-12-18  Ted Gould  <ted@gould.cx>
+
+	Setting the values with booleans and remove setting the type
+
+2009-12-18  Ted Gould  <ted@gould.cx>
+
+	Need a newer dbusmenu
+
+2009-12-08  Ted Gould  <ted@gould.cx>
+
+	Update to use libtelepathy instead of libempathy
+
+2009-12-08  Ken VanDine  <ken.vandine@canonical.com>
+
+	Added missing files to EXTRA_DIST
+
+2009-12-08  Ken VanDine  <ken.vandine@canonical.com>
+
+	Ported from libempathy to telepathy-glib
+
+2009-11-05  Ted Gould  <ted@canonical.com>
+
+	Updating to libindicator 0.3.0 API.
+
+2009-11-04  Ted Gould  <ted@canonical.com>
+
+	Porting over to the 0.3.0 API
+
+2009-11-04  Ted Gould  <ted@canonical.com>
+
+	Upping to libindicator 0.3.0
+
+2009-10-10  Ted Gould  <ted@canonical.com>
+
+	Listening for MC5 coming on and off the bus as EmpathyAccountManager was doing that for us before.
+
+2009-10-08  Ted Gould  <ted@canonical.com>
+
+	Checking to see if there is an MC5 there when we start.
+
+2009-10-08  Ted Gould  <ted@canonical.com>
+
+	Signaling a state change when disconnecting.
+
+2009-10-08  Ted Gould  <ted@canonical.com>
+
+	Dealing with DBus's stupid views of NULL.  If I wanted it like that I'd use Python.  I have values, or not.  Simple as that.
+
+2009-10-08  Ted Gould  <ted@canonical.com>
+
+	Debug message
+
+2009-10-08  Ted Gould  <ted@canonical.com>
+
+	Checking the name we're getting and the name we're loosing.
+
+2009-10-08  Ted Gould  <ted@canonical.com>
+
+	Adding a dbus proxy and setting up a signal handler for the namechange event which will start or stop the empathy account manager.
+
+2009-10-08  Ted Gould  <ted@canonical.com>
+
+	Moving the building of the EmpathyAccountManager to it's own function.
+
+2009-10-08  Ted Gould  <ted@canonical.com>
+
+	0.1.7
+
+2009-10-08  Ted Gould  <ted@canonical.com>
+
+	Changing the icon so that if you are disconnected it is 'system-shutdown-panel' and making sure that we see it sometimes by not allocating the EmpathyAccountManager isn't allocated until status is set.
+
+2009-10-06  Ted Gould  <ted@canonical.com>
+
+	Changing icon name again.  This is probably better WRT the icon naming spec.
+
+2009-10-06  Ted Gould  <ted@canonical.com>
+
+	Changing the icon name in the code.
+
+2009-10-06  Ted Gould  <ted@canonical.com>
+
+	Adding a new icon 'indicator-system-shutdown'
+
+2009-10-06  Ted Gould  <ted@canonical.com>
+
+	Making it so that the manager only gets created if the status is set.
+
+2009-10-06  Ted Gould  <ted@canonical.com>
+
+	Setting the default icon as well.
+
+2009-10-06  Ted Gould  <ted@canonical.com>
+
+	Use the shutdown icon in the disconnected state.
+
+2009-10-08  Ted Gould  <ted@canonical.com>
+
+	Better ignore
+
+2009-10-07  Ted Gould  <ted@canonical.com>
+
+	Make it so that when locking the screen on suspend we ensure that the screen actually locks.  Also stop the screen saver starting on suspend and hibernate.
+
+2009-10-07  Ted Gould  <ted@canonical.com>
+
+	Attaching Bug
+
+2009-10-07  Ted Gould  <ted@canonical.com>
+
+	Oops, forgot to say who we were.
+
+2009-10-07  Ted Gould  <ted@canonical.com>
+
+	Switching the sleep action to have a response so we can make sure to unthrottle the screensaver.
+
+2009-10-07  Ted Gould  <ted@canonical.com>
+
+	Adding throttle and unthrottle functions
+
+2009-10-07  Ted Gould  <ted@canonical.com>
+
+	Copyright headers
+
+2009-10-07  Ted Gould  <ted@canonical.com>
+
+	Building a GSS proxy and setting up a signal to it.  Then when we lock, we drop to a mainloop and wait for the screensaver to activate.
+
+2009-10-06  Ted Gould  <ted@canonical.com>
+
+	Linking into the lock screen helper.
+
+2009-10-06  Ted Gould  <ted@canonical.com>
+
+	Setting up the callback
+
+2009-10-06  Ted Gould  <ted@canonical.com>
+
+	Moving arround the lock screen code so that it's in a helper.
+
+2009-10-06  Ted Gould  <ted@canonical.com>
+
+	Creating the lock helper files.
+
+2009-10-06  Ted Gould  <ted@canonical.com>
+
+	Fixing the window icon for the logout and shutdown dialogs.
+
+2009-10-05  Ted Gould  <ted@canonical.com>
+
+	Also setting the icon on property changed.
+
+2009-10-06  Ted Gould  <ted@canonical.com>
+
+	Fix for async menu creation which caused it to be scrambled.
+
+2009-10-04  Ted Gould  <ted@canonical.com>
+
+	Switching from positioning items to having a major resort function to reposition everything.  This should be a little overkill, but should work nicely with the new async startup.
+
+2009-10-05  Ted Gould  <ted@canonical.com>
+
+	Changing string from 'New Session' to 'Switch User'
+
+2009-10-05  Ted Gould  <ted@canonical.com>
+
+	Switching the string from 'New Session' to 'Switch User'
+
+2009-10-01  Ted Gould  <ted@canonical.com>
+
+	0.1.6
+
+2009-09-30  Cody Russell  <crussell@canonical.com>
+
+	Setting the user list to always overflow as additional API is required in GDM to make it work well.
+
+2009-09-29  Cody Russell  <crussell@canonical.com>
+
+	Set MAXIMUM_USERS from 7 or 1
+
+2009-09-30  Ted Gould  <ted@canonical.com>
+
+	Making the lock screen item insensitive for guest accounts.
+
+2009-09-29  Ted Gould  <ted@canonical.com>
+
+	Checking to see if we're the guest user.  No locking the guest.
+
+2009-09-29  Ted Gould  <ted@canonical.com>
+
+	Grabbing the lock insensitivity branch.
+
+2009-09-29  Ted Gould  <ted@canonical.com>
+
+	Merging in a branch to make the lock item insensitive if autologin is configured in GDM.
+
+2009-09-29  Ted Gould  <ted@canonical.com>
+
+	Making the locking menu item a global and make it sensitive based on whether there is autologin.
+
+2009-09-28  Ted Gould  <ted@canonical.com>
+
+	Changing the start up of the services to be asynchronous.
+
+2009-09-28  Ted Gould  <ted@canonical.com>
+
+	Commenting the changes.
+
+2009-09-28  Ted Gould  <ted@canonical.com>
+
+	Oops, forgot to choose a service.
+
+2009-09-28  Ted Gould  <ted@canonical.com>
+
+	Whew, okay now all startup is two phased, asyncronous and pulled into a set of common functions.
+
+2009-09-28  Ted Gould  <ted@canonical.com>
+
+	Criticalizing the other services as well.
+
+2009-09-28  Ted Gould  <ted@canonical.com>
+
+	Adding a check for null on the client in reorder and making it so that the inability to start a service is no longer an error.  Just a critical.
+
+2009-09-25  David Barth  <david.barth@canonical.com>
+
+	Merging in a branch to remove the close button on the logout confirmation dialogs.
+
+2009-09-25  David Barth  <david.barth@canonical.com>
+
+	remove superfluous window buttons
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Increasing to 0.1.5
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Adding a cast for one of the 64-bit pointers.  We shouldn't need that many users, and it would require lots of memory hacks to fit that in here.
+
+2009-09-24  Cody Russell  <crussell@canonical.com>
+
+	Merging in Cody's branch for fixing some user issues.
+
+2009-09-24  Cody Russell  <crussell@canonical.com>
+
+	Clear the menu
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Not checking with PK to see if we should show the dialog.  CK is broken.
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Disabing PK Check to whether the dialog shows
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Checking GDM to see whether we should lock on user switch.
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Updating to trunk
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Checking the gdm autologin setting to see if we should lock the screen on user switch or not.
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Merging lock on sleep branch
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Merging in all the user-service changes
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Merging in the lock on sleep branch.
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Ah, truth, you got me again!  Never will I trust you.
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Wrong string!  Oops.
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Setting up the signal handler to get changes to the value.
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Getting the basic grabbing of the proxy and getting the autologin value.
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Putting in the infrastructure to have GDM settings proxy
+
+2009-09-23  Ted Gould  <ted@canonical.com>
+
+	Stealing the lock screen function from the user-service and making it so that we lock on sleep.
+
+2009-09-24  Cody Russell  <crussell@canonical.com>
+
+	Merge lp:~bratsche/indicator-session/users-service for bug #422052
+
+2009-09-24  Cody Russell  <crussell@canonical.com>
+
+	Don't check range twice here
+
+2009-09-24  Cody Russell  <crussell@canonical.com>
+
+	only add menuitems if the current seat can activate new sessions
+
+2009-09-24  Cody Russell  <crussell@canonical.com>
+
+	Remove user_changed and users_icons_changed from the class
+
+2009-09-24  Cody Russell  <crussell@canonical.com>
+
+	sort users
+
+2009-09-24  Cody Russell  <crussell@canonical.com>
+
+	cleanup
+
+2009-09-24  Cody Russell  <crussell@canonical.com>
+
+	don't load all the users unless needed
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	expose users_service_dbus_can_activate_session()
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	use g_strcmp0
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	remove system proxy
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	remove the server code
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	remove session proxy fu
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	remove unnecessary stuff
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	don't need to dbus_g_object_type_install_info()
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	modify count in user_added()/user_removed()
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	add names
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	cleanup
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	add todo comment
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	move stuff around
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	merge up from trunk
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	cleanups and more session fu
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	session adding
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	user activation wip
+
+2009-09-23  Cody Russell  <crussell@canonical.com>
+
+	ck fu
+
+2009-09-22  Cody Russell  <crussell@canonical.com>
+
+	some refactoring
+
+2009-09-22  Cody Russell  <crussell@canonical.com>
+
+	cleanup
+
+2009-09-22  Cody Russell  <crussell@canonical.com>
+
+	fix dbus fu
+
+2009-09-22  Cody Russell  <crussell@canonical.com>
+
+	register marshallers
+
+2009-09-22  Cody Russell  <crussell@canonical.com>
+
+	dbus fu updates
+
+2009-09-10  Cody Russell  <crussell@canonical.com>
+
+	fixes for adding/removing users
+
+2009-09-10  Cody Russell  <crussell@canonical.com>
+
+	fix link problem
+
+2009-09-10  Cody Russell  <crussell@canonical.com>
+
+	work in progress
+
+2009-09-24  Ted Gould  <ted@canonical.com>
+
+	Merging in the MissionControl 5 branch to work with modern Empathy.
+
+2009-09-23  Ted Gould  <ted@canonical.com>
+
+	Don't set the status so that we notice when it comes back to us.
+
+2009-09-23  Ted Gould  <ted@canonical.com>
+
+	Bad string, should have been hidden.
+
+2009-09-22  Ted Gould  <ted@canonical.com>
+
+	Comments are good.
+
+2009-09-22  Ted Gould  <ted@canonical.com>
+
+	If the global status changes then we need to signal everyone else about it.
+
+2009-09-22  Ted Gould  <ted@canonical.com>
+
+	Putting in the TP Connection enum map
+
+2009-09-22  Ted Gould  <ted@canonical.com>
+
+	Connecting to change signal
+
+2009-09-22  Ted Gould  <ted@canonical.com>
+
+	Turning over to Empathy Account Manager.
+
+2009-09-21  Ted Gould  <ted@canonical.com>
+
+	Oh, got the header and it works too!  Nice.
+
+2009-09-21  Ted Gould  <ted@canonical.com>
+
+	Adding in a libempathy dependency.
+
+2009-09-17  Ted Gould  <ted@canonical.com>
+
+	Ignoring GConf schemas
+
+2009-09-16  Ted Gould  <ted@canonical.com>
+
+	Linking in the MC5 provider
+
+2009-09-16  Ted Gould  <ted@canonical.com>
+
+	Creating a status provider object for Mission Control 5 based on the Telepathy one.
+
+2009-09-22  Martin Pitt  <martin.pitt@ubuntu.com>
+
+	Patch from Martin to upgrade to the New PolicyKit API
+
+2009-09-22  Martin Pitt  <martin.pitt@canonical.com>
+
+	Port to polkit-1
+
+2009-09-17  Ted Gould  <ted@canonical.com>
+
+	Making a 0.1.4
+
+2009-09-17  Ted Gould  <ted@canonical.com>
+
+	Merging in the icon renaming fix branch
+
+2009-09-16  Ted Gould  <ted@canonical.com>
+
+	Using the right icon name.
+
+2009-09-16  Ted Gould  <ted@canonical.com>
+
+	Changing the icon names from online to available
+
+2009-09-16  Ted Gould  <ted@canonical.com>
+
+	Merging in design team requested fixes for labels and menu item placement.
+
+2009-09-15  Ted Gould  <ted@canonical.com>
+
+	Changing the menu item to be 'Set Status' instead of the current status.
+
+2009-09-14  Ted Gould  <ted@canonical.com>
+
+	Attaching bug
+
+2009-09-14  Ted Gould  <ted@canonical.com>
+
+	Moving lock screen from status to users service.
+
+2009-09-14  Ted Gould  <ted@canonical.com>
+
+	Changing label per design
+
+2009-09-14  Ted Gould  <ted@canonical.com>
+
+	Fixing shutdown text
+
+2009-09-16  Ted Gould  <ted@canonical.com>
+
+	Branch to init i18n in the various services
+
+2009-09-15  Ted Gould  <ted@canonical.com>
+
+	Adding bug in
+
+2009-09-15  Ted Gould  <ted@canonical.com>
+
+	Adding locale stuff in here too!  Fun.
+
+2009-09-15  Ted Gould  <ted@canonical.com>
+
+	Adding in gettext init stuff.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Making a 0.1.3
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Merging in branch to remove some spaces in the menu labels.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Removing the space on the elipsis
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Merging in the branch with icon fixes in it.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Setting the window icon now that we have the right path
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Grabbing the icons from the indicator dir where we install them.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Merging in a branch to detect IM clients coming on and off the bus.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Trying to unblock LP
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Adding in a debug message for Telepathy proxy.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Watching for Mission Control comming on the bus.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Checking to see if we have the proxy already.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Function to build the telepathy proxy.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Checking the global status on whether the menu items should be sensitive or not.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Watch dbus namechanges and see if Pidgin comes on the bus.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Splitting out the building of the Pidgin proxy into it's own function.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Adding disconnected to the telepathy handler.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Adding disconnected to the pidgin handler.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Adding in a disconnected status value and making it so that when it is the global status we should make the menu items to set status insensitive.
+
+2009-09-10  Ted Gould  <ted@canonical.com>
+
+	Merging branch by c-korn which adds a watcher for the GConf changes.
+
+2009-09-08  Christoph Korn  <c_korn@gmx.de>
+
+	The menu now immediately is updated when the gconf-key about the
+	logout/shutdown/restart confirmations is changed.
+
+2009-09-08  Ted Gould  <ted@canonical.com>
+
+	Turning into 0.1.2
+
+2009-09-08  Christoph Korn  <c_korn@gmx.de>
+
+	Adding a GConf key to suppress confirmation dialogs
+
+2009-09-02  Christoph Korn  <c_korn@gmx.de>
+
+	Added files which were missing in the previous commit.
+
+2009-09-02  Christoph Korn  <korn@ubuntu>
+
+	These patches introduce a gconf key whether the logout/restart/shutdown confirmations
+	should be shown or not.
+	Also the menu items should be suffixed by '...' accordingly.
+	However this only works after a restart.
+	
+	Bugs which get fixed are:
+	https://bugs.launchpad.net/indicator-session/+bug/422025
+	https://bugs.launchpad.net/ubuntu/+source/indicator-session/+bug/421693
+	https://bugs.launchpad.net/ubuntu/+source/indicator-session/+bug/419472
+
+2009-09-04  Ted Gould  <ted@canonical.com>
+
+	Removing the printing of the error messages as sometimes it doesn't exist.
+
+2009-09-01  Ted Gould  <ted@canonical.com>
+
+	Apparently the DBus interface will put a bad string in messages in some cases.  We don't really need it, so let's not risk it.
+
+2009-09-03  Ted Gould  <ted@canonical.com>
+
+	Bumping up number to 0.1.1 and fixing a couple depends.
+
+2009-09-03  Ted Gould  <ted@canonical.com>
+
+	Merging in fixes related to the dbusmenu 0.1.1 release
+
+2009-09-03  Ted Gould  <ted@canonical.com>
+
+	Set the type of the menuitem to be a image menuitem.
+
+2009-09-03  Ted Gould  <ted@canonical.com>
+
+	Switching to using the defines for all of the properties.
+
+2009-09-03  Ted Gould  <ted@canonical.com>
+
+	Switching to using the defines for the properties in the menus.
+
+2009-09-03  Ted Gould  <ted@canonical.com>
+
+	Have a quick check to see if we have something to put there.  If not, no menu item.
+
+2009-09-03  Ted Gould  <ted@canonical.com>
+
+	Needing dbusmenu 0.1.1
+
+2009-08-27  Ted Gould  <ted@canonical.com>
+
+	Merging in a branch to use the new dbusmenu API and make it more stable overall.
+
+2009-08-27  Ted Gould  <ted@canonical.com>
+
+	Updating to dbusmenu version 0.1.0
+
+2009-08-27  Ted Gould  <ted@canonical.com>
+
+	Instead of populating the menu on added, populate it on realization.
+
+2009-08-27  Ted Gould  <ted@canonical.com>
+
+	Bumping Dbusmenu version to 0.0.2
+
+2009-08-25  Ted Gould  <ted@canonical.com>
+
+	Merging in the more status branch that implements basic status for Pidgin and Telepathy.
+
+2009-08-25  Ted Gould  <ted@canonical.com>
+
+	Handling a missing session bus by displaying an error.
+
+2009-08-24  Ted Gould  <ted@canonical.com>
+
+	Should be starting with the least available and getting more so, instead of the other way around.
+
+2009-08-24  Ted Gould  <ted@canonical.com>
+
+	Didn't need that function.
+
+2009-08-24  Ted Gould  <ted@canonical.com>
+
+	At start up if we've got a proxy, let's start everything and get an initial status.
+
+2009-08-24  Ted Gould  <ted@canonical.com>
+
+	Support for setting status stollen from FUSA status manager (written by me) and signal handling
+
+2009-08-24  Ted Gould  <ted@canonical.com>
+
+	Connecting the telepathy stuff into the overall status service
+
+2009-08-24  Ted Gould  <ted@canonical.com>
+
+	Building up the proxy.  We need one, it's important.
+
+2009-08-24  Ted Gould  <ted@canonical.com>
+
+	Adding the basic status enums and maps in.
+
+2009-08-19  Ted Gould  <ted@canonical.com>
+
+	Using AM 1.11 silent mode
+
+2009-08-17  Ted Gould  <ted@canonical.com>
+
+	Getting more of a basis for Telepathy stuff
+
+2009-08-17  Ted Gould  <ted@canonical.com>
+
+	Some marshallers for the Telepathy status stuff.
+
+2009-08-17  Ted Gould  <ted@canonical.com>
+
+	Initially querying the status so that when we start, we get the right value.
+
+2009-08-17  Ted Gould  <ted@canonical.com>
+
+	Should update for local changes as well.
+
+2009-08-17  Ted Gould  <ted@canonical.com>
+
+	Now we can set the value in Pidgin and have it come back over the wire
+
+2009-08-17  Ted Gould  <ted@canonical.com>
+
+	Setting up a list of marshallers for the pidgin functionality
+
+2009-08-17  Ted Gould  <ted@canonical.com>
+
+	Pushing in Pidgin code, doesn't compile.
+
+2009-08-18  Ted Gould  <ted@canonical.com>
+
+	Merging in the rename from 'sus' to 'session'
+
+2009-08-18  Ted Gould  <ted@canonical.com>
+
+	Ignoring new build files
+
+2009-08-18  Ted Gould  <ted@canonical.com>
+
+	Changing the name from SUS to Session
+
+2009-08-17  Ted Gould  <ted@canonical.com>
+
+	Merging in the branch getting the status icons working.
+
+2009-08-12  Ted Gould  <ted@canonical.com>
+
+	Fixes from trunk
+
+2009-08-12  Ted Gould  <ted@canonical.com>
+
+	Failed logic
+
+2009-08-12  Ted Gould  <ted@canonical.com>
+
+	Oops, wrong signal name.  Now better.
+
+2009-08-12  Ted Gould  <ted@canonical.com>
+
+	Cleaning up the debug message.
+
+2009-08-12  Ted Gould  <ted@canonical.com>
+
+	Some debug messages
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Cleaning up icon code so that we save the current one incase someone askes.
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Shuffling around the DBus names so that everything is happier.
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Fixing the build system to build the DBus interface better.
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	I suck
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	API naming change
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	connecting to the signal
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Setting the icon from the callback of asking the value
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Oh, now signals and callbacks, oh, my
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Fixing a few things with the dbus stuff and starting to listen to the extra information on the service.
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Fixing the local install of the icons
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Switching icons directory to the one provided by package config
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Showing the icon.  Silly.
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Making dbus names valid, which is a little silly.
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Changing the signal prototype to be strings instead of pointers.
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Changing the icons to be singular for now.
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Unused variable
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Adding in -Wall and -Werror to things
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Adding unistd.h header
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Setting up signal handlers for the signal changing.  We still ask everyone, they better cache a value :)
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Global status being used and thrown over d' bus
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Brining in the concept of global status
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Handling the signal better.  Now in the header file as well.
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	Better displose to free the proxy and ensuring that statuc changes get noted.
+
+2009-08-12  Ted Gould  <ted@canonical.com>
+
+	Fixes by the distro team found in their packaging of indicator-sus
+
+2009-08-12  Ted Gould  <ted@canonical.com>
+
+	Merging in fixes from the distro team to make packaging actually good.
+
+2009-08-11  Alexander Sack  <asac@ubuntu.com>
+
+	(merge lp:~indicator-applet-developers/indicator-applet/sus-ubuntu)
+	* Fixed Vcs-Bzr location, part of the  indicator-applet project
+	* specify Vcs-Bzr-Browser
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	specify Vcs-Bzr-Browser
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	Fixed Vcs-Bzr location, part of the  indicator-applet project
+
+2009-08-11  Alexander Sack  <asac@ubuntu.com>
+
+	releasing version 0.1-0ubuntu1
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	Depend on indicator-applet >= 0.2
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	Changed conflicts for gdm to <= 2.27.4-0ubuntu9
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	Added debian/watch 
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	Cleaning up linitian
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	* debian/control
+	- Set Homepage and Vcs-Bzr
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	* Include icons in the tarball
+	* Added license files
+	* Corrected the FSF address
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	Bumped standards version
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	Added copyright and license information
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	Ken VanDine 2009-08-11 Added license files
+	Ken VanDine 2009-08-11 Include the icons in dist
+	Ken VanDine 2009-08-11 Set version 0.1
+	Ken VanDine 2009-08-11 Correct the FSF address
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	Added license files
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	Include the icons in dist
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	Set version 0.1
+
+2009-08-11  Ken VanDine  <ken.vandine@canonical.com>
+
+	Correct the FSF address
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa6
+
+2009-08-08  Ted Gould  <ted@canonical.com>
+
+	debian/control: Conflicting with gdm < 2.27.4-0ubuntu9 or
+	lower to stop people from having problems with the PPA.
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa5
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	Legal headers on the source files.
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa4
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	Merging in status shuffle branch.
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa4~statusshuffle2
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	Better usage of the names.
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa4~statusshuffle1
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	Merging in status shuffle branch to package it.
+
+2009-07-26  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa3
+
+2009-07-26  Ted Gould  <ted@canonical.com>
+
+	Making sure merging will be easy in the future.
+
+2009-07-26  Ted Gould  <ted@canonical.com>
+
+	Fleshing out significantly.  Inital rerelease.
+
+2009-07-26  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator9ubuntu9
+
+2009-07-26  Ted Gould  <ted@canonical.com>
+
+	* Lock screen works
+	* Pidgin proxy gets setup and doesn't crash
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator9ubuntu8
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	Ah, forgot the service files.
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator9ubuntu7
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	debian/control: Add binary dep on DeviceKit Power
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	* Adding in devkit power support for suspend/hibernate
+	* Changing namespace from com.ubuntu to org.ayatana
+
+2009-07-23  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator9ubuntu5
+
+2009-07-23  Ted Gould  <ted@canonical.com>
+
+	debian/control: Adding a dep on polkit-gnome-dev
+
+2009-07-23  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator9ubuntu4
+
+2009-07-23  Ted Gould  <ted@canonical.com>
+
+	Basically getting this session stuff working.  Well, all
+	the stuff that kills data.
+
+2009-07-22  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator9ubuntu3
+
+2009-07-22  Ted Gould  <ted@canonical.com>
+
+	Wrong function, building a path instead of a filename.  Err.
+
+2009-07-22  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator9ubuntu2
+
+2009-07-22  Ted Gould  <ted@canonical.com>
+
+	Adding a helper for the logout window.  And setting things
+	up to call it.
+
+2009-07-21  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator9ubuntu1
+
+2009-07-21  Ted Gould  <ted@canonical.com>
+
+	Adding in lots of fun menu items.  This way the menu looks
+	more complete than it really is :)
+
+2009-07-20  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator9
+
+2009-07-20  Ted Gould  <ted@canonical.com>
+
+	Updating the users daemon to have usable generic functions
+	but no dummy users.
+
+2009-07-17  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator8
+
+2009-07-17  Ted Gould  <ted@canonical.com>
+
+	Going Karmic
+
+2009-07-17  Ted Gould  <ted@canonical.com>
+
+	Ignoring build files
+
+2009-07-01  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator7
+
+2009-07-01  Ted Gould  <ted@canonical.com>
+
+	* Switching to DbusmenuGtkClient instead of DbusmenuGtkMenu
+	* Adding some dummy data to users.
+
+2009-06-22  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator6
+
+2009-06-22  Ted Gould  <ted@canonical.com>
+
+	* Removing the .so versions
+	* Using the new dbusmenu signals instead of the GtkContainer
+	ones that don't really signal.
+
+2009-06-19  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator5
+
+2009-06-19  Ted Gould  <ted@canonical.com>
+
+	Changing the signal names.
+
+2009-06-19  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator4
+
+2009-06-19  Ted Gould  <ted@canonical.com>
+
+	Code to start merging in menus.
+
+2009-06-19  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator3
+
+2009-06-19  Ted Gould  <ted@canonical.com>
+
+	debian/rules: Removing the .a/.la clutter in the install
+	directory.
+
+2009-06-19  Ted Gould  <ted@canonical.com>
+
+	Updating from branch, lazy loading the services.
+
+2009-06-16  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator2
+
+2009-06-16  Ted Gould  <ted@canonical.com>
+
+	Updating the build to make proper service files
+
+2009-06-15  Ted Gould  <ted@canonical.com>
+
+	releasing version 0.1~ppa2~indicator1
+
+2009-06-15  Ted Gould  <ted@canonical.com>
+
+	Changing package name to indicator-sus
+
+2009-06-15  Ted Gould  <ted@canonical.com>
+
+	debian/control: Adding build depends on libindicator-dev,
+	libdbusmenu-glib-dev and libdbusmenu-gtk-dev
+
+2009-06-15  Ted Gould  <ted@canonical.com>
+
+	Upstream from the indicator branch.
+
+2009-06-08  Ted Gould  <ted@canonical.com>
+
+	Removing the packaging from trunk
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	I forgot to put legal agreements on the top of all the C/H files.  Oops.
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	Merging the branch for better status service.
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	Put the user's real name in the menu item.
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	Getting an image built for offline
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	A whole bunch of icons that are from our previous FUSA patches
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	Clean it up.
+
+2009-08-07  Ted Gould  <ted@canonical.com>
+
+	Using the user name
+
+2009-08-06  Ted Gould  <ted@canonical.com>
+
+	Some dummy code to get a name
+
+2009-08-06  Ted Gould  <ted@canonical.com>
+
+	Now we have privates.
+
+2009-08-06  Ted Gould  <ted@canonical.com>
+
+	More and better prototypes
+
+2009-08-06  Ted Gould  <ted@canonical.com>
+
+	Getting a new object to remove an error.
+
+2009-08-06  Ted Gould  <ted@canonical.com>
+
+	Adding a couple of signals in here.
+
+2009-08-06  Ted Gould  <ted@canonical.com>
+
+	ayatana.org
+
+2009-08-06  Ted Gould  <ted@canonical.com>
+
+	Doing a registration and a connection to DBus
+
+2009-08-06  Ted Gould  <ted@canonical.com>
+
+	Something global to track all the DBus stuff.
+
+2009-08-06  Ted Gould  <ted@canonical.com>
+
+	Putting the user name in a menu label.
+
+2009-08-06  Ted Gould  <ted@canonical.com>
+
+	Status submenu
+
+2009-07-26  Ted Gould  <ted@canonical.com>
+
+	Merging in the branch to port everything to libindicator and fleshing thigns out.
+
+2009-07-26  Ted Gould  <ted@canonical.com>
+
+	Setting up the Pidgin proxy
+
+2009-07-26  Ted Gould  <ted@canonical.com>
+
+	A function to lock the saver
+
+2009-07-26  Ted Gould  <ted@canonical.com>
+
+	Debug message
+
+2009-07-26  Ted Gould  <ted@canonical.com>
+
+	Using GET_CLASS instead of CLASS.  Oops
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	Changing the names in the service files as well.
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	Adding a debug message
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	Changing to the ayatana.org namespace
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	Whitespace, who hoo, I'm earning karma for this
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	Setting the visiblity of the menu items based on whether DKP reports that we have the functionality.
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	Checking the suspend and hibernate properties
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	Setting up change, and issuing a response
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	TODO list
+
+2009-07-24  Ted Gould  <ted@canonical.com>
+
+	Comment update
+
+2009-07-23  Ted Gould  <ted@canonical.com>
+
+	Adding in the function to make the calls to DKP
+
+2009-07-23  Ted Gould  <ted@canonical.com>
+
+	Building the DKP proxies
+
+2009-07-23  Ted Gould  <ted@canonical.com>
+
+	Adding in some DKp defines.
+
+2009-07-23  Ted Gould  <ted@canonical.com>
+
+	Some comments are always good.
+
+2009-07-23  Ted Gould  <ted@canonical.com>
+
+	Adding in the action code from our previous patches to FUSA
+
+2009-07-23  Ted Gould  <ted@canonical.com>
+
+	Now check for the PK dialog and otherwise run ours.  If we get restart, restart
+
+2009-07-23  Ted Gould  <ted@canonical.com>
+
+	Getting all the parameters working so that we can set the dialog type
+
+2009-07-23  Ted Gould  <ted@canonical.com>
+
+	Basic command line parsing.  Not working 100% yet.
+
+2009-07-22  Ted Gould  <ted@canonical.com>
+
+	Damn it, wrong function
+
+2009-07-22  Ted Gould  <ted@canonical.com>
+
+	Executing the helper, but it needs to be the one in the libexec path.
+
+2009-07-22  Ted Gould  <ted@canonical.com>
+
+	Make a dialog pop up.  Not really the right one, but one.
+
+2009-07-22  Ted Gould  <ted@canonical.com>
+
+	Switching to having a single handler and then everyone calling it with a parameter.
+
+2009-07-21  Ted Gould  <ted@canonical.com>
+
+	ifdef protection
+
+2009-07-21  Ted Gould  <ted@canonical.com>
+
+	Whoo, hoo, it builds
+
+2009-07-21  Ted Gould  <ted@canonical.com>
+
+	Bringing in all the GTK includes and libraries
+
+2009-07-21  Ted Gould  <ted@canonical.com>
+
+	Building a little dialog.  Now it's kinda linked into the build system.
+
+2009-07-21  Ted Gould  <ted@canonical.com>
+
+	Adding in lock screen.  This is all the menu items now.
+
+2009-07-21  Ted Gould  <ted@canonical.com>
+
+	Adding menu items for session stuff
+
+2009-07-20  Ted Gould  <ted@canonical.com>
+
+	Expanding command line option to make it easier to read
+
+2009-07-20  Ted Gould  <ted@canonical.com>
+
+	Turning everythign into a check and a way to start a new fancy login session
+
+2009-07-20  Ted Gould  <ted@canonical.com>
+
+	Setting the menu item to activate the guest user session
+
+2009-07-20  Ted Gould  <ted@canonical.com>
+
+	Switching from dummy users to useful menuitems
+
+2009-06-30  Ted Gould  <ted@canonical.com>
+
+	Ignoring some autogenerated files.
+
+2009-06-30  Ted Gould  <ted@canonical.com>
+
+	Moving the server to after the items makes things work better, but I'm curious why it's failing.  This is more a test for dbusmenu though which'll have better debug.
+
+2009-06-30  Ted Gould  <ted@canonical.com>
+
+	Getting some menuitems
+
+2009-06-30  Ted Gould  <ted@canonical.com>
+
+	Some debugging info.
+
+2009-06-30  Ted Gould  <ted@canonical.com>
+
+	Showing the loading item.  Atleast that works now.
+
+2009-06-30  Ted Gould  <ted@canonical.com>
+
+	Bah, I hate pointers some days.
+
+2009-06-30  Ted Gould  <ted@canonical.com>
+
+	Trying to flesh out the add function some more, but this commit doesn't build as apparently switches have to have integers now.  This takes half of the fun out of C if you can't use crazy function pointers everywhere!  Where's the sport in readable code?
+
+2009-06-30  Ted Gould  <ted@canonical.com>
+
+	Switching over the status menu too.  Woot!
+
+2009-06-30  Ted Gould  <ted@canonical.com>
+
+	Adding in stuff for the users menu.  Getting better at this.
+
+2009-06-30  Ted Gould  <ted@canonical.com>
+
+	Working more on changing the style of how things work for clients.  This is the session based items.
+
+2009-06-26  Ted Gould  <ted@canonical.com>
+
+	Phase one switch to the client instead of the menu
+
+2009-06-22  Ted Gould  <ted@canonical.com>
+
+	Using the new dbusmenu signal for item added
+
+2009-06-22  Ted Gould  <ted@canonical.com>
+
+	Removing the .so* stuff
+
+2009-06-19  Ted Gould  <ted@canonical.com>
+
+	Showing the added menu and adding in a loading item.
+
+2009-06-19  Ted Gould  <ted@canonical.com>
+
+	Oh, the signal is 'add' not 'added'.  How I love to have random strings without checking, all the elegance of Python.
+
+2009-06-19  Ted Gould  <ted@canonical.com>
+
+	Fleshing out the insertion function.  Let's get some menus.
+
+2009-06-19  Ted Gould  <ted@canonical.com>
+
+	Bubbling up the position information to a final function to put things on the main menu.
+
+2009-06-19  Ted Gould  <ted@canonical.com>
+
+	Adding in separators
+
+2009-06-19  Ted Gould  <ted@canonical.com>
+
+	Splitting out the menu loading and process starting code to make it lazy and push it into the idle loop.  No blocking DBus on startup.
+
+2009-06-16  Ted Gould  <ted@canonical.com>
+
+	Building the service files more correctly.
+
+2009-06-12  Ted Gould  <ted@canonical.com>
+
+	Okay, we need functions as we want a list of icons.
+
+2009-06-12  Ted Gould  <ted@canonical.com>
+
+	A quickly little object to put itself on DBus.
+
+2009-06-12  Ted Gould  <ted@canonical.com>
+
+	Brining in the client side of the API
+
+2009-06-12  Ted Gould  <ted@canonical.com>
+
+	Actually the client is the indicator.  Silly to have one binary be both client and server, heh.
+
+2009-06-12  Ted Gould  <ted@canonical.com>
+
+	Adding a DBus interface for the status specific stuff
+
+2009-06-12  Ted Gould  <ted@canonical.com>
+
+	Some comments describing the intentions of the functions.
+
+2009-06-12  Ted Gould  <ted@canonical.com>
+
+	Putting in the status translation tables.
+
+2009-06-11  Ted Gould  <ted@canonical.com>
+
+	Adding in a proxy to start gettin' us some Pidgin
+
+2009-06-11  Ted Gould  <ted@canonical.com>
+
+	Oops, what a mess up. But this sure makes things unhappy.  Nasty to debug segfault.
+
+2009-06-11  Ted Gould  <ted@canonical.com>
+
+	Okay, let's use these providers.  We're 733t now.
+
+2009-06-11  Ted Gould  <ted@canonical.com>
+
+	Starting to connect things together.  Let's get some Pidgin in there.
+
+2009-06-11  Ted Gould  <ted@canonical.com>
+
+	Now we're setting the status provider functions of the StatusProvider interface.
+
+2009-06-11  Ted Gould  <ted@canonical.com>
+
+	Preliminary pidgin wrappers.
+
+2009-06-11  Ted Gould  <ted@canonical.com>
+
+	Adding in a good ol' signal handler and even emits this puppy.  Whew.
+
+2009-06-11  Ted Gould  <ted@canonical.com>
+
+	Some public funtions and now they can be subclassed
+
+2009-06-11  Ted Gould  <ted@canonical.com>
+
+	Don't need a private or dispose or finalize.  This class is more of an interface.
+
+2009-06-11  Ted Gould  <ted@canonical.com>
+
+	Moving the enum into the provider object and changing the name everywhere.
+
+2009-06-11  Ted Gould  <ted@canonical.com>
+
+	Providing the first hints at an API
+
+2009-06-11  Ted Gould  <ted@canonical.com>
+
+	Adding in the basic (generated) framework for the status provider object
+
+2009-06-10  Ted Gould  <ted@canonical.com>
+
+	Oops, forgot about invisible.  I guess that's kinda expected though, as it's invisible.
+
+2009-06-10  Ted Gould  <ted@canonical.com>
+
+	Connecting in a callback.
+
+2009-06-10  Ted Gould  <ted@canonical.com>
+
+	Building the menuitems
+
+2009-06-10  Ted Gould  <ted@canonical.com>
+
+	Using the defines and strings that were in our patches to FUSA.  I wrote the code, so it is like other things © Canonical so there is no issue there.  There is other code in FUSA that is not.
+
+2009-06-10  Ted Gould  <ted@canonical.com>
+
+	Making sure to clean up the generated service files.  Whew.  Pass distcheck.
+
+2009-06-10  Ted Gould  <ted@canonical.com>
+
+	Adding in the DBus services directory with localinstall support
+
+2009-06-10  Ted Gould  <ted@canonical.com>
+
+	Adding a configure flag so that indicators can be installed locally for distcheck purposes.
+
+2009-06-09  Ted Gould  <ted@canonical.com>
+
+	Copying that code into the other two services.  Now we're dbus-y.
+
+2009-06-09  Ted Gould  <ted@canonical.com>
+
+	Bringing up a dbusmenu item.
+
+2009-06-09  Ted Gould  <ted@canonical.com>
+
+	Adding more dependencies and cflags and stuff to make the builds of the services more complete
+
+2009-06-09  Ted Gould  <ted@canonical.com>
+
+	Oh, stealing the methods used in PolicyKit for building these.  I dislike calling sed directly, but the results are fantastic.
+
+2009-06-09  Ted Gould  <ted@canonical.com>
+
+	Adding in a bunch of service files.  We're hip now.
+
+2009-06-09  Ted Gould  <ted@canonical.com>
+
+	Now we're building services.  Snazy.
+
+2009-06-08  Ted Gould  <ted@canonical.com>
+
+	Renaming the C file as well.
+
+2009-06-08  Ted Gould  <ted@canonical.com>
+
+	Changing the name to get rid of FUSA, which doesn't really make sense anymore.
+
+2009-06-08  Ted Gould  <ted@canonical.com>
+
+	Making things into a set of three user-daemons.
+
+2009-06-08  Ted Gould  <ted@canonical.com>
+
+	Switching the pkgconfig based directory.
+
+2009-06-08  Ted Gould  <ted@canonical.com>
+
+	Changing the build stuff for ye ol' fusa indicator
+
+2009-06-08  Ted Gould  <ted@canonical.com>
+
+	Adding in new deps and a version bump
+
+2009-06-08  Ted Gould  <ted@canonical.com>
+
+	Merging from trunk.  Splitting out packaging and getting all the files.
+
+2009-06-08  Ted Gould  <ted@canonical.com>
+
+	Removing packaing from trunk
+
+2009-06-08  Ted Gould  <ted@canonical.com>
+
+	Heh, forgot to put that file in.
+
+2008-12-04  Ted Gould  <ted@canonical.com>
+
+	FUSA-fying it
+
+2008-12-04  Ted Gould  <ted@canonical.com>
+
+	Ignore stuff
+
+2008-12-04  Ted Gould  <ted@canonical.com>
+
+	Moving the directory
+
+2008-12-04  Ted Gould  <ted@canonical.com>
+
+	Starting Debian Packaging
+
+2008-12-04  Ted Gould  <ted@canonical.com>
+
+	Showing by default.
+
+2008-12-04  Ted Gould  <ted@canonical.com>
+
+	Making the directory the same as the applet.  Should have done that first, eh.
+
+2008-12-04  Ted Gould  <ted@canonical.com>
+
+	Ignoring
+
+2008-12-04  Ted Gould  <ted@canonical.com>
+
+	Actually getting this all to build reasonably.
+
+2008-12-04  Ted Gould  <ted@canonical.com>
+
+	Checkmark checkin
+
diff --git a/Makefile.am b/Makefile.am
index 39b5cdb..391ff49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,3 +8,28 @@ EXTRA_DIST = autogen.sh
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 
+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
diff --git a/Makefile.in b/Makefile.in
index 5db6d2a..40872db 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -534,6 +534,9 @@ distdir: $(DISTFILES)
 	      || 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 \
@@ -755,8 +758,8 @@ uninstall-am:
 .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 \
@@ -769,6 +772,32 @@ uninstall-am:
 	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:
diff --git a/configure b/configure
index bfa7582..99b1311 100755
--- a/configure
+++ b/configure
@@ -2882,7 +2882,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-session
- VERSION=0.2.11
+ VERSION=0.2.12
 
 
 cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index fe2e27f..0fd00e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c)
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.2.11)
+AM_INIT_AUTOMAKE(indicator-session, 0.2.12)
 
 AM_MAINTAINER_MODE
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 70ea880..f452897 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,8 +1,7 @@
 SUBDIRS = icons
 
 dbus_servicesdir = $(DBUSSERVICEDIR)
-service_in_files =  indicator-users.service.in \
-                    indicator-session.service.in
+service_in_files =  indicator-session.service.in
 dbus_services_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
diff --git a/data/Makefile.in b/data/Makefile.in
index 9bc8aee..6d78d27 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -278,9 +278,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = icons
 dbus_servicesdir = $(DBUSSERVICEDIR)
-service_in_files = indicator-users.service.in \
-                    indicator-session.service.in
-
+service_in_files = indicator-session.service.in
 dbus_services_DATA = $(service_in_files:.service.in=.service)
 
 ##############################
diff --git a/data/indicator-users.service.in b/data/indicator-users.service.in
deleted file mode 100644
index 8bb6819..0000000
--- a/data/indicator-users.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.users
-Exec=@libexecdir@/indicator-users-service
diff --git a/debian/changelog b/debian/changelog
index f4e8088..7877a34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+indicator-session (0.2.12-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    * Fix service file names
+    * Add log domain
+    * Fix dbusmenu prototypes
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 28 Jan 2011 11:18:10 -0600
+
 indicator-session (0.2.11-0ubuntu1) natty; urgency=low
 
   * New upstream release.
diff --git a/src/Makefile.am b/src/Makefile.am
index 190d012..4fa43b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,10 @@ libsession_la_SOURCES = \
 	dbus-shared-names.h \
 	dbusmenu-shared.h \
 	users-service-client.h
-libsession_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror
+libsession_la_CFLAGS = \
+	$(APPLET_CFLAGS) \
+	-Wall -Werror \
+	-DG_LOG_DOMAIN=\"Indicator-Session\"
 libsession_la_LIBADD = $(APPLET_LIBS)
 libsession_la_LDFLAGS = -module -avoid-version
 
@@ -90,8 +93,15 @@ indicator_session_service_SOURCES = \
 	users-service-dbus.h \
 	users-service-dbus.c \
 	users-service-marshal.c
-indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
-indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS)
+indicator_session_service_CFLAGS = \
+	$(SESSIONSERVICE_CFLAGS) \
+	$(GCONF_CFLAGS) \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
+	-Wall -Werror \
+	-DG_LOG_DOMAIN=\"Indicator-Session\"
+indicator_session_service_LDADD = \
+	$(SESSIONSERVICE_LIBS) \
+	$(GCONF_LIBS)
 
 #################
 # GTK Logout Stuff
diff --git a/src/Makefile.in b/src/Makefile.in
index 06ae3b0..b28fbce 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -314,7 +314,11 @@ libsession_la_SOURCES = \
 	dbusmenu-shared.h \
 	users-service-client.h
 
-libsession_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror
+libsession_la_CFLAGS = \
+	$(APPLET_CFLAGS) \
+	-Wall -Werror \
+	-DG_LOG_DOMAIN=\"Indicator-Session\"
+
 libsession_la_LIBADD = $(APPLET_LIBS)
 libsession_la_LDFLAGS = -module -avoid-version
 
@@ -334,8 +338,17 @@ indicator_session_service_SOURCES = \
 	users-service-dbus.c \
 	users-service-marshal.c
 
-indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
-indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS)
+indicator_session_service_CFLAGS = \
+	$(SESSIONSERVICE_CFLAGS) \
+	$(GCONF_CFLAGS) \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
+	-Wall -Werror \
+	-DG_LOG_DOMAIN=\"Indicator-Session\"
+
+indicator_session_service_LDADD = \
+	$(SESSIONSERVICE_LIBS) \
+	$(GCONF_LIBS)
+
 
 #################
 # GTK Logout Stuff
diff --git a/src/indicator-session.c b/src/indicator-session.c
index d2e679c..2104281 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -72,11 +72,11 @@ INDICATOR_SET_TYPE(INDICATOR_SESSION_TYPE)
 static GtkLabel * get_label (IndicatorObject * io);
 static GtkImage * get_icon (IndicatorObject * io);
 static GtkMenu * get_menu (IndicatorObject * io);
-static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
-static gboolean new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
+static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data);
+static gboolean new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data);
 static void icon_changed (IndicatorSession * session, const gchar * icon_name);
 static void service_connection_cb (IndicatorServiceManager * sm, gboolean connected, gpointer user_data);
-static gboolean build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
+static gboolean build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data);
 static void receive_signal (GDBusProxy * proxy, gchar * sender_name, gchar * signal_name, GVariant * parameters, gpointer user_data);
 static void service_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data);
 
@@ -298,7 +298,7 @@ user_property_change (DbusmenuMenuitem * item, const gchar * property, GVariant
 
 /* Builds an item with a hip little logged in icon. */
 static gboolean
-new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data)
 {
 	GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new());
 	gint padding = 0;
@@ -476,7 +476,7 @@ restart_property_change (DbusmenuMenuitem * item, const gchar * property, GVaria
 /* Builds the restart item which is a more traditional GTK image
    menu item that puts the graphic into the gutter. */
 static gboolean
-build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data)
 {
 	GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new());
 	if (gmi == NULL) {
@@ -519,7 +519,7 @@ switch_style_set (GtkWidget * widget, GtkStyle * prev_style, gpointer user_data)
    to not need ellipsing itself, or if, it will get ellipsed by
    the standard label processor. */
 static gboolean
-build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data)
 {
 	GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new());
 	if (gmi == NULL) {