[Galago-commits] r2500 - in trunk/libgalago: . libgalago

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2006-01-25 23:08:20 -0800 (Wed, 25 Jan 2006)
New Revision: 2500

Modified:
   trunk/libgalago/AUTHORS
   trunk/libgalago/ChangeLog
   trunk/libgalago/libgalago/galago-person.c
Log:
Patch by Jorn Baayen to prevent an infinite loop caused sometimes when setting a photo. This closes bugzilla bug #5636.


Modified: trunk/libgalago/AUTHORS
===================================================================
--- trunk/libgalago/AUTHORS	2006-01-26 07:06:25 UTC (rev 2499)
+++ trunk/libgalago/AUTHORS	2006-01-26 07:08:20 UTC (rev 2500)
@@ -11,5 +11,6 @@
 
 Contributors:
 
+	Jorn Baayen - <jorn at openedhand.com>
 	Ricardo Kekki - <ricardo.kekki at movial.fi>
 	Ross Burton - <ross at burtonini.com>

Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog	2006-01-26 07:06:25 UTC (rev 2499)
+++ trunk/libgalago/ChangeLog	2006-01-26 07:08:20 UTC (rev 2500)
@@ -1,3 +1,9 @@
+Wed Jan 25 23:07:17 PST 2006  Christian Hammond <chipx86 at chipx86.com>
+
+	* libgalago/galago-person.c:
+	  - Patch by Jorn Baayen to prevent an infinite loop caused sometimes
+	    when setting a photo. This closes bugzilla bug #5636.
+
 Wed Jan 25 22:59:31 PST 2006  Christian Hammond <chipx86 at chipx86.com>
 
 	* libgalago/galago-account.c:

Modified: trunk/libgalago/libgalago/galago-person.c
===================================================================
--- trunk/libgalago/libgalago/galago-person.c	2006-01-26 07:06:25 UTC (rev 2499)
+++ trunk/libgalago/libgalago/galago-person.c	2006-01-26 07:08:20 UTC (rev 2500)
@@ -702,6 +702,9 @@
 static void
 _galago_dbus_person_set_photo(GalagoPerson *person, GalagoImage *photo)
 {
+	if (!galago_is_connected() || !galago_is_feed())
+		return;
+
 	if (photo == NULL)
 	{
 		galago_dbus_send_message(GALAGO_OBJECT(person), "UnsetPhoto", NULL);