Merge trunk

4 files changed, 28 insertions, 6 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 9da71ad..6617b49 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,6 +20,7 @@ libmessaging_la_SOURCES = \
 	dbus-data.h
 libmessaging_la_CFLAGS = \
 	$(APPLET_CFLAGS) \
+	$(COVERAGE_CFLAGS) \
 	-Wall \
 	-Wl,-Bsymbolic-functions \
 	-Wl,-z,defs \
@@ -27,7 +28,9 @@ libmessaging_la_CFLAGS = \
 	-Werror \
 	-DG_LOG_DOMAIN=\"Indicator-Messages\"
 libmessaging_la_LIBADD = $(APPLET_LIBS) -lm
-libmessaging_la_LDFLAGS = -module -avoid-version
+libmessaging_la_LDFLAGS = \
+	$(COVERAGE_LDFLAGS) \
+	-module -avoid-version
 
 ######################################
 # Building the messages service
@@ -57,6 +60,7 @@ indicator_messages_service_SOURCES = \
 
 indicator_messages_service_CFLAGS = \
 	$(APPLET_CFLAGS) \
+	$(COVERAGE_CFLAGS) \
 	-Wall \
 	-Wl,-Bsymbolic-functions \
 	-Wl,-z,defs \
@@ -69,6 +73,9 @@ indicator_messages_service_LDADD = \
 	$(APPLET_LIBS) \
 	libindicator-messages-status-provider.la
 
+indicator_messages_service_LDFLAGS = \
+	$(COVERAGE_LDFLAGS)
+
 gen-%.xml.h: %.xml
 	@echo "Building $@ from $<"
 	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
diff --git a/src/indicator-messages.c b/src/indicator-messages.c
index f5f2fe0..197d55a 100644
--- a/src/indicator-messages.c
+++ b/src/indicator-messages.c
@@ -701,7 +701,11 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm
 	gint font_size = gtk_widget_get_font_size (GTK_WIDGET (gmi));
 	gtk_widget_style_get(GTK_WIDGET(gmi), "toggle-spacing", &padding, NULL);
 
+#if GTK_CHECK_VERSION(3, 0, 0)
 	GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, padding);
+#else
+	GtkWidget * hbox = gtk_hbox_new(FALSE, padding);
+#endif
 
 	/* Icon, probably someone's face or avatar on an IM */
 	mi_data->icon = gtk_image_new();
diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c
index e01806e..91cbbb8 100644
--- a/src/launcher-menu-item.c
+++ b/src/launcher-menu-item.c
@@ -211,7 +211,10 @@ launcher_menu_item_new (const gchar * desktop_file)
 			dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_TYPE, APPLICATION_MENUITEM_TYPE);
 			g_object_set_data(G_OBJECT(mi), NICK_DATA, (gpointer)nicks[i]);
 
-			dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, indicator_desktop_shortcuts_nick_get_name(priv->ids, nicks[i]));
+			gchar *name = indicator_desktop_shortcuts_nick_get_name(priv->ids, nicks[i]);
+			dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, name);
+			g_free(name);
+
 			g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(nick_activate_cb), self);
 
 			priv->shortcuts = g_list_append(priv->shortcuts, mi);
diff --git a/src/messages-service.c b/src/messages-service.c
index e8fe576..a21435c 100644
--- a/src/messages-service.c
+++ b/src/messages-service.c
@@ -104,10 +104,15 @@ serverList_equal (gconstpointer a, gconstpointer b)
 	pa = (serverList_t *)a;
 	pb = (serverList_t *)b;
 
-	const gchar * pas = INDICATE_LISTENER_SERVER_DBUS_NAME(pa->server);
-	const gchar * pbs = INDICATE_LISTENER_SERVER_DBUS_NAME(pb->server);
-
-	return g_strcmp0(pas, pbs);
+	const gchar * pan = INDICATE_LISTENER_SERVER_DBUS_NAME(pa->server);
+	const gchar * pbn = INDICATE_LISTENER_SERVER_DBUS_NAME(pb->server);
+	const gchar * pap = indicate_listener_server_get_dbuspath(pa->server);
+	const gchar * pbp = indicate_listener_server_get_dbuspath(pb->server);
+
+	if (g_strcmp0(pan, pbn) == 0)
+	  return g_strcmp0(pap, pbp);
+	else
+	  return 1;
 }
 
 static gint
@@ -1296,6 +1301,7 @@ build_launcher (gpointer data)
 	g_file_get_contents(path, &desktop, NULL, NULL);
 
 	if (desktop == NULL) {
+		g_free(path);
 		return FALSE;
 	}
 
@@ -1305,6 +1311,7 @@ build_launcher (gpointer data)
 
 	build_launcher_core(trimdesktop);
 	g_free(trimdesktop);
+	g_free(path);
 	return FALSE;
 }
 
@@ -1318,6 +1325,7 @@ build_launcher_keyfile (gpointer data)
 		build_launcher_core(desktop);
 		g_free(desktop);
 	}
+	g_free(path);
 	return FALSE;
 }