# HG changeset patch
# User Richard Nelson <wabz@pidgin.im>
# Date 1184376504 0
# Node ID 79e27f0c6f05e2e9f24186b23a446bb930f1fc1f
# Parent  db00e554e7685db27a8fb509911141d063343de1# Parent  fbca9cd907a1ec18420dbc7007bf434c15b1cd98
merge of '2b537584bf70476b4ef78547c5000c361e9b7176'
     and 'e281de32313e50dbff5d4e48ff636a657de9a23e'

diff -r db00e554e768 -r 79e27f0c6f05 finch/libgnt/gntstyle.c
--- a/finch/libgnt/gntstyle.c	Sat Jul 14 01:32:45 2007 +0000
+++ b/finch/libgnt/gntstyle.c	Sat Jul 14 01:28:24 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