r7115 - in dumbhippo/trunk/client/linux: . src

[commits mugshot org]

Author: walters
Date: 2007-12-21 13:18:21 -0600 (Fri, 21 Dec 2007)
New Revision: 7115

Modified:
   dumbhippo/trunk/client/linux/configure.ac
   dumbhippo/trunk/client/linux/src/hippo-dbus-im-client.c
Log:
Release 1.1.57 and a bugfix.

Add Owen's suggested workaround for pidgin related crash.

http://mail.gnome.org/archives/online-desktop-list/2007-October/msg00056.html



Modified: dumbhippo/trunk/client/linux/configure.ac
===================================================================
--- dumbhippo/trunk/client/linux/configure.ac	2007-12-21 19:03:34 UTC (rev 7114)
+++ dumbhippo/trunk/client/linux/configure.ac	2007-12-21 19:18:21 UTC (rev 7115)
@@ -6,7 +6,7 @@
 
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE(mugshot, 1.1.56)
+AM_INIT_AUTOMAKE(mugshot, 1.1.57)
 
 AM_CONFIG_HEADER(config/config.h)
 

Modified: dumbhippo/trunk/client/linux/src/hippo-dbus-im-client.c
===================================================================
--- dumbhippo/trunk/client/linux/src/hippo-dbus-im-client.c	2007-12-21 19:03:34 UTC (rev 7114)
+++ dumbhippo/trunk/client/linux/src/hippo-dbus-im-client.c	2007-12-21 19:18:21 UTC (rev 7115)
@@ -196,7 +196,8 @@
      * matching hash of NULL
      */
     if (!hippo_im_has_icon_hash(resource_id, icon)) {
-        make_icon_request(id, icon, resource_id);
+    	if (icon != NULL)
+    		make_icon_request(id, icon, resource_id);
     } else {
         g_debug("It looks like we already have icon %s", icon ? icon : "(none)");
     }