From dc5302fcdcfb8eb5c54092107c49e3cc3a9deeea Mon Sep 17 00:00:00 2001
From: Cody Russell <crussell@canonical.com>
Date: Wed, 10 Mar 2010 17:33:32 -0600
Subject: Use gint64, not UserData*, for the callback to user-added signal.

---
 src/session-service.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/session-service.c b/src/session-service.c
index a6c3fc3..febf007 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -586,7 +586,7 @@ rebuild_items (DbusmenuMenuitem *root,
    rebuilds the menu */
 static void
 user_change (UsersServiceDbus *service,
-             UserData         *user,
+             gint64            user,
              gpointer          user_data)
 {
 	DbusmenuMenuitem *root = (DbusmenuMenuitem *)user_data;
-- 
cgit v1.2.3


From 91a59d5405f998627cc94d14a8c8501aee797e14 Mon Sep 17 00:00:00 2001
From: Sebastien Bacher <seb128@ubuntu.com>
Date: Mon, 15 Mar 2010 12:03:59 +0100
Subject: releasing version 0.2.5-0ubuntu3

---
 src/indicator-session.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/indicator-session.c b/src/indicator-session.c
index a815e40..54431ee 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -20,9 +20,13 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <glib.h>
 #include <glib-object.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <libdbusmenu-gtk/menu.h>
 
-- 
cgit v1.2.3