From 742fa8cb32af80698ca9e03dafa10a2d9f1d4701 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 16 Mar 2012 15:39:11 -0500 Subject: fix minor memory leak when the proxy name changes --- libindicator/indicator-service-manager.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libindicator/indicator-service-manager.c b/libindicator/indicator-service-manager.c index f58c148..33b0557 100644 --- a/libindicator/indicator-service-manager.c +++ b/libindicator/indicator-service-manager.c @@ -536,8 +536,8 @@ service_proxy_name_changed (GDBusConnection * connection, const gchar * sender_n { IndicatorServiceManagerPrivate * priv = INDICATOR_SERVICE_MANAGER_GET_PRIVATE(user_data); - const gchar * new_name = NULL; - const gchar * prev_name = NULL; + gchar * new_name = NULL; + gchar * prev_name = NULL; g_variant_get(parameters, "(&s&s&s)", NULL, &prev_name, &new_name); if (new_name == NULL || new_name[0] == 0) { @@ -571,6 +571,9 @@ service_proxy_name_changed (GDBusConnection * connection, const gchar * sender_n } } + g_free (new_name); + g_free (prev_name); + return; } -- cgit v1.2.3 From 3440ebedbc55382f36b9b74eab08c98d99ba206d Mon Sep 17 00:00:00 2001 From: Hernando Torque Date: Mon, 26 Mar 2012 15:35:57 +0200 Subject: Free GError. --- libindicator/indicator-image-helper.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 23b08d0..5d2ff76 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -74,6 +74,9 @@ refresh_image (GtkImage * image) if (pixbuf == NULL) { g_warning("Unable to load icon from file '%s' because: %s", icon_filename, error == NULL ? "I don't know" : error->message); + if (error != NULL) { + g_error_free(error); + } gtk_image_clear(image); return; } -- cgit v1.2.3 From 922d781acee9d4d0210f66d3be5ad6b6620ed0da Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 28 Mar 2012 14:17:33 -0700 Subject: 0.4.94 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5bff63b..7f4c17c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([libindicator], - [0.4.93], + [0.4.94], [http://bugs.launchpad.net/libindicator], [libindicator], [http://launchpad.net/libindicator]) -- cgit v1.2.3 From 2eb70f478e64770084b2e5a1b05d0bbd4aeee7c5 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 29 Mar 2012 13:16:19 -0700 Subject: look for 'missing' in ac_aux_dir rather than top_srcdir. --- Makefile.am | 4 ++-- configure.ac | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 182cb2d..d8ec187 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,7 +24,7 @@ dist-hook: echo Creating ChangeLog && \ ( cd "$(top_srcdir)" && \ echo '# Generated by Makefile. Do not edit.'; echo; \ - $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \ + $(ac_aux_dir)/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 ); \ @@ -36,7 +36,7 @@ dist-hook: 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 \ + $(ac_aux_dir)/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 ); \ diff --git a/configure.ac b/configure.ac index 7f4c17c..21bcf67 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,7 @@ AC_PREREQ([2.64]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) +AC_SUBST([ac_aux_dir]) AM_INIT_AUTOMAKE([1.11 -Wall tar-pax]) -- cgit v1.2.3