[beryl-commits] r2259 - in trunk/beryl-core: libberylsettings settings-backends

[quinn at server.beryl-project.org]

Author: quinn
Date: 2007-01-02 09:25:28 +0000 (Tue, 02 Jan 2007)
New Revision: 2259

Modified:
   trunk/beryl-core/libberylsettings/main.c
   trunk/beryl-core/settings-backends/ini.c
Log:
libberylsettings:
* change Toys... to Extra
* fix ini get profile list function (missing if statement led to always return NULL)


Modified: trunk/beryl-core/libberylsettings/main.c
===================================================================
--- trunk/beryl-core/libberylsettings/main.c	2007-01-02 08:56:49 UTC (rev 2258)
+++ trunk/beryl-core/libberylsettings/main.c	2007-01-02 09:25:28 UTC (rev 2259)
@@ -28,7 +28,7 @@
 	{"desktop",			N_("Desktop"),				N_("Plugins related to the desktop in general"),						NULL},
 	{"effects",			N_("Visual Effects"),		N_("Plugins that provide visual effects"),								NULL},
 	{"accessibility",	N_("Accessibility"),		N_("Plugins that provide accessibility features"),						NULL},
-	{"misc",			N_("Toys and such"),		N_("Plugins with little utility but that are interesting and fun"),		NULL},
+	{"misc",			N_("Extras"),				N_("Plugins for less commonly used features"),							NULL},
 	{"devel",			N_("Development"),			N_("Plugins generally only useful to developers"),						NULL},
 	{"imageformat",		N_("Image Format"),			N_("Plugins that provide loading and saving for various image formats"),NULL},
 	{"settings",		N_("Settings Plugins"),		N_("These plugins provide settings management"),						NULL},

Modified: trunk/beryl-core/settings-backends/ini.c
===================================================================
--- trunk/beryl-core/settings-backends/ini.c	2007-01-02 08:56:49 UTC (rev 2258)
+++ trunk/beryl-core/settings-backends/ini.c	2007-01-02 09:25:28 UTC (rev 2259)
@@ -710,6 +710,7 @@
 	s = g_strconcat(g_get_home_dir(),"/.beryl/",NULL);
 	d = g_dir_open(s,0,NULL);
 	g_free(s);
+	if (!d)
 		return NULL;
 	while ((s=(gchar *)g_dir_read_name(d)))
 	{