From 6467734c50eb71e59bbacfa2baf5b9ccfa3e1c2b Mon Sep 17 00:00:00 2001 From: Robert Carr Date: Thu, 1 Dec 2011 11:54:16 -0500 Subject: serverList_equal: We have to compare IndicateListenerServers by DBus path instead of just name. This fixes issues where one client (DBus name) will create two or more indicate servers. --- src/messages-service.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/messages-service.c b/src/messages-service.c index e8fe576..44e922e 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 -- cgit v1.2.3 From 4f5f1e3ea9317f37e55028631f493f4a709cd8a5 Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Tue, 6 Dec 2011 18:51:58 -0600 Subject: Added coverage reporting via gcov config and targets. --- src/Makefile.am | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index c631436..33473db 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) -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 $<))));" > $@ -- cgit v1.2.3 From 6de22d3836fd5e193433c5ed28136c101ddc48e4 Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Mon, 23 Jan 2012 13:58:33 -0600 Subject: Fix for gtk_hbox_new, werror on deprecated. --- src/indicator-messages.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/indicator-messages.c b/src/indicator-messages.c index d13de56..82fcfaf 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -695,7 +695,7 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm gint font_size = RIGHT_LABEL_FONT_SIZE; gtk_widget_style_get(GTK_WIDGET(gmi), "toggle-spacing", &padding, NULL); - GtkWidget * hbox = gtk_hbox_new(FALSE, padding); + GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, padding); /* Icon, probably someone's face or avatar on an IM */ mi_data->icon = gtk_image_new(); -- cgit v1.2.3 From fa3ed93da2ae4c79fed88fb005e8564076e41c8d Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Mon, 23 Jan 2012 15:16:17 -0600 Subject: Added macro to gtk_hbox_new fix per charles' advice (and fixed tabination). --- src/indicator-messages.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/indicator-messages.c b/src/indicator-messages.c index 82fcfaf..5a96cb9 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -695,7 +695,11 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm gint font_size = RIGHT_LABEL_FONT_SIZE; 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(); -- cgit v1.2.3 From cb9291c80d32b4463dd1dc47d3a912ac4166f06d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 31 Jan 2012 21:25:17 -0600 Subject: Fixing dbusmenu-gtk include paths --- src/indicator-messages.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src') diff --git a/src/indicator-messages.c b/src/indicator-messages.c index 5a96cb9..c75b49c 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -28,13 +28,8 @@ with this program. If not, see . #include #include -#if GTK_CHECK_VERSION(3, 0, 0) -#include -#include -#else #include #include -#endif #include #include -- cgit v1.2.3 From 817be57dddbcc9e9b8935bb65e95b91dd6ca03f0 Mon Sep 17 00:00:00 2001 From: Daniel d'Andrada Date: Wed, 8 Feb 2012 18:42:36 -0200 Subject: Fix memory leak: Free path string. The path was being created in build_launchers (line 1427) but never freed. --- src/messages-service.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/messages-service.c b/src/messages-service.c index 44e922e..a21435c 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -1301,6 +1301,7 @@ build_launcher (gpointer data) g_file_get_contents(path, &desktop, NULL, NULL); if (desktop == NULL) { + g_free(path); return FALSE; } @@ -1310,6 +1311,7 @@ build_launcher (gpointer data) build_launcher_core(trimdesktop); g_free(trimdesktop); + g_free(path); return FALSE; } @@ -1323,6 +1325,7 @@ build_launcher_keyfile (gpointer data) build_launcher_core(desktop); g_free(desktop); } + g_free(path); return FALSE; } -- cgit v1.2.3 From 484c86d10f4295fd13248bafdf0862bc51c51b5b Mon Sep 17 00:00:00 2001 From: Daniel d'Andrada Date: Thu, 9 Feb 2012 15:09:50 -0200 Subject: Plug leak in launcher_menu_item_new Memory returned by indicator_desktop_shortcuts_nick_get_name has to be freed. --- src/launcher-menu-item.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') 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); -- cgit v1.2.3