# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1195347609 0
# Node ID 5b97451dade2f3948b494d78391b16e1e7342ab5
# Parent  e26890a63ff63fa9ecdfe325650d3e2b2ecbac32# Parent  07588cb4843424a2bae8e93acd6039ffb3964c91
merge of '16aac1f231cfcd086d52cb58b975ea2d01399cb1'
     and '845de91fd376d47dc9892baa4506c0519234a536'

diff -r e26890a63ff6 -r 5b97451dade2 ChangeLog
--- a/ChangeLog	Sat Nov 17 20:00:25 2007 +0000
+++ b/ChangeLog	Sun Nov 18 01:00:09 2007 +0000
@@ -26,6 +26,9 @@
 	  list, rather than as buttons in the buddy list and with dialog
 	  boxes.  If several accounts are disabled when you sign on elsewhere,
 	  you can now re-enable them all with a single click.
+	* Added tooltips to the Room List window to show full topics
+	* Added buttons in preferences to access GNOME network and browser
+	  preferences configuration dialogs when running under GNOME
 	* If you alias a buddy to an alias that is already present within
 	  a particular group, we now offer to merge the buddies into the
 	  same contact.
diff -r e26890a63ff6 -r 5b97451dade2 libpurple/util.c
--- a/libpurple/util.c	Sat Nov 17 20:00:25 2007 +0000
+++ b/libpurple/util.c	Sun Nov 18 01:00:09 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