Mercurial > pidgin
changeset 21581:5b97451dade2
merge of '16aac1f231cfcd086d52cb58b975ea2d01399cb1'
and '845de91fd376d47dc9892baa4506c0519234a536'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sun, 18 Nov 2007 01:00:09 +0000 |
| parents | e26890a63ff6 (current diff) 07588cb48434 (diff) |
| children | b00659aa0acf 28824f9f8e47 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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