Author: jannis
Date: 2008-07-17 15:03:54 +0000 (Thu, 17 Jul 2008)
New Revision: 27328
Modified:
xfconf/trunk/xfconfd/main.c
xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
Log:
xfconfd/main.c, xfconfd/xfconf-backend-perchannel-xml.c: Fix a few
small memory leaks and add a comment about one I don't know how to fix.
Modified: xfconf/trunk/xfconfd/main.c
===================================================================
--- xfconf/trunk/xfconfd/main.c 2008-07-17 14:40:16 UTC (rev 27327)
+++ xfconf/trunk/xfconfd/main.c 2008-07-17 15:03:54 UTC (rev 27328)
@@ -161,8 +161,11 @@
g_option_context_add_main_entries(opt_ctx, options, PACKAGE);
if(!g_option_context_parse(opt_ctx, &argc, &argv, &error)) {
g_printerr("Error parsing options: %s\n", error->message);
+ g_error_free(error);
+ g_option_context_free(opt_ctx);
return 1;
}
+ g_option_context_free(opt_ctx);
if(print_version) {
g_print("Xfconfd version " VERSION "\n");
@@ -199,6 +202,7 @@
xfconfd = xfconf_daemon_new_unique(backends, &error);
if(!xfconfd) {
g_printerr("Xfconfd failed to start: %s\n", error->message);
+ g_error_free(error);
return 1;
}
g_strfreev(backends);
Modified: xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
===================================================================
--- xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c 2008-07-17
14:40:16 UTC (rev 27327)
+++ xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c 2008-07-17
15:03:54 UTC (rev 27328)
@@ -897,6 +897,7 @@
}
/* FIXME: validate name for valid chars */
+ /* FIXME: Is this used at all? Where does it need to be
free'd? */
state->channel_name = g_strdup(name);
if((locked && *locked) || (unlocked && *unlocked)) {
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
