Mercurial > pidgin3 / file diff

--- a/finch/libgnt/gntstyle.c	Fri Jul 13 19:40:39 2007 +0000
+++ b/finch/libgnt/gntstyle.c	Sat Jul 14 01:23:56 2007 +0000
@@ -48,11 +48,11 @@
 char *gnt_style_get_from_name(const char *group, const char *key)
 {
 #if GLIB_CHECK_VERSION(2,6,0)
-	if (group == NULL && (group = g_get_prgname()) != NULL && *group != '\0') {
-		return g_key_file_get_value(gkfile, group, key, NULL);
-	}
-
-	if (!group || !*group)
+	const char *prg = g_get_prgname();
+	if ((group == NULL || *group != '\0') && prg &&
+			g_key_file_has_group(gkfile, prg))
+		group = prg;
+	if (!group)
 		group = "general";
 	return g_key_file_get_value(gkfile, group, key, NULL);
 #endif