Author: kelnos
Date: 2008-11-03 04:48:56 +0000 (Mon, 03 Nov 2008)
New Revision: 28596
Modified:
xfconf/trunk/xfconf-query/main.c
Log:
check xfconf_init() retval for errors, properly check retval of
xfconf_list_channels() for null pointer
Modified: xfconf/trunk/xfconf-query/main.c
===================================================================
--- xfconf/trunk/xfconf-query/main.c 2008-11-02 23:38:43 UTC (rev 28595)
+++ xfconf/trunk/xfconf-query/main.c 2008-11-03 04:48:56 UTC (rev 28596)
@@ -245,7 +245,12 @@
gint fd = -1;
g_type_init();
- xfconf_init(NULL);
+ if(!xfconf_init(&error))
+ {
+ g_critical("Failed to init libxfconf: %s\n", error->message);
+ g_error_free(error);
+ return 1;
+ }
GOptionContext *context = g_option_context_new("- xfconf commandline
utility");
@@ -272,9 +277,12 @@
g_print("Channels:\n");
channels = xfconf_list_channels();
- for(i = 0; channels[i]; ++i)
- g_print(" %s\n", channels[i]);
- g_strfreev(channels);
+ if(G_LIKELY(channels)) {
+ for(i = 0; channels[i]; ++i)
+ g_print(" %s\n", channels[i]);
+ g_strfreev(channels);
+ } else
+ return 1;
return 0;
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
