aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2012-06-20 18:14:39 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-07-02 16:03:22 +0800
commit10fc10c0be71a31064298776b7d1abc412157dc8 (patch)
tree7148fede2e4dcd44ab493e042d42551761fb6657
parenta743a48fa1d0f21882d6274f157310614182a431 (diff)
downloadgsoc2013-empathy-10fc10c0be71a31064298776b7d1abc412157dc8.tar
gsoc2013-empathy-10fc10c0be71a31064298776b7d1abc412157dc8.tar.gz
gsoc2013-empathy-10fc10c0be71a31064298776b7d1abc412157dc8.tar.bz2
gsoc2013-empathy-10fc10c0be71a31064298776b7d1abc412157dc8.tar.lz
gsoc2013-empathy-10fc10c0be71a31064298776b7d1abc412157dc8.tar.xz
gsoc2013-empathy-10fc10c0be71a31064298776b7d1abc412157dc8.tar.zst
gsoc2013-empathy-10fc10c0be71a31064298776b7d1abc412157dc8.zip
theme-manager: clean up memory releasing
-rw-r--r--libempathy-gtk/empathy-theme-manager.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index a04a43a05..ff53c9594 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -161,15 +161,13 @@ theme_manager_notify_adium_path_cb (GSettings *gsettings_chat,
/* If path did not really changed, ignore */
if (!tp_strdiff (current_path, new_path)) {
- g_free (new_path);
- return;
+ goto finally;
}
/* If path does not really contains an adium path, ignore */
if (!empathy_adium_path_is_valid (new_path)) {
DEBUG ("Invalid theme path set: %s", new_path);
- g_free (new_path);
- return;
+ goto finally;
}
/* Load new theme data, we can stop tracking existing views since we
@@ -180,6 +178,7 @@ theme_manager_notify_adium_path_cb (GSettings *gsettings_chat,
theme_manager_emit_changed (manager);
+finally:
g_free (new_path);
}