Mercurial > pidgin3 / changeset

• changeset
• raw

changeset

Allow empty GNOME_DESKTOP_SESSION_ID to "fail" the running_gnome check as

Sat, 17 Nov 2007 20:58:56 +0000

author

Stu Tomlinson <nosnilmot@pidgin.im>

date

Sat, 17 Nov 2007 20:58:56 +0000

changeset 21665

a1a724a89a03

parent 21664

9acf8cecfd90

child 21666

70025aa3e74c

Allow empty GNOME_DESKTOP_SESSION_ID to "fail" the running_gnome check as
well as it being completely unset. This allows testing non-GNOME
functionality under GNOME by running
GNOME_DESKTOP_SESSION_ID= pidgin
instead of having to actually unset it.

--- a/libpurple/util.c	Sat Nov 17 20:09:15 2007 +0000
+++ b/libpurple/util.c	Sat Nov 17 20:58:56 2007 +0000
@@ -2937,7 +2937,9 @@
 		return FALSE;
 	g_free(tmp);
 
-	return (g_getenv("GNOME_DESKTOP_SESSION_ID") != NULL);
+	tmp = (gchar *)g_getenv("GNOME_DESKTOP_SESSION_ID");
+
+	return ((tmp != NULL) && (*tmp != '\0'));
 #else
 	return FALSE;
 #endif