Import upstream version 0.2.12

3 files changed, 35 insertions, 12 deletions

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) {