pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [17147] trunk/libgaim/protocols/msn/slp.c

[<the...@us...>]

Revision: 17147
          http://svn.sourceforge.net/gaim/?rev=17147&view=rev
Author:   thekingant
Date:     2006-09-03 16:30:06 -0700 (Sun, 03 Sep 2006)

Log Message:
-----------
Get rid of an assertion failure.  As far as I can tell there
is no benefit to calling got_sessionreq() if context is NULL

Modified Paths:
--------------
    trunk/libgaim/protocols/msn/slp.c

Modified: trunk/libgaim/protocols/msn/slp.c
===================================================================
--- trunk/libgaim/protocols/msn/slp.c	2006-09-03 21:42:52 UTC (rev 17146)
+++ trunk/libgaim/protocols/msn/slp.c	2006-09-03 23:30:06 UTC (rev 17147)
@@ -422,7 +422,8 @@
 
 		context = get_token(content, "Context: ", "\r\n");
 
-		got_sessionreq(slpcall, branch, euf_guid, context);
+		if (context != NULL)
+			got_sessionreq(slpcall, branch, euf_guid, context);
 
 		g_free(context);
 		g_free(euf_guid);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17205] trunk/libgaim/protocols/msn/slp.c

[<rl...@us...>]

Revision: 17205
          http://svn.sourceforge.net/gaim/?rev=17205&view=rev
Author:   rlaager
Date:     2006-09-09 13:47:12 -0700 (Sat, 09 Sep 2006)

Log Message:
-----------
Rest of SF Patch #1554627 from Richard Nelson (wabz)

"a user without an msnobject was having icon_checksum
 removed on each status change"

Modified Paths:
--------------
    trunk/libgaim/protocols/msn/slp.c

Modified: trunk/libgaim/protocols/msn/slp.c
===================================================================
--- trunk/libgaim/protocols/msn/slp.c	2006-09-09 20:40:12 UTC (rev 17204)
+++ trunk/libgaim/protocols/msn/slp.c	2006-09-09 20:47:12 UTC (rev 17205)
@@ -954,18 +954,19 @@
 		/* It seems the user has not set a msnobject */
 		GSList *sl, *list;
 
-		/* TODO: I think we need better buddy icon core functions. */
-		gaim_buddy_icons_set_for_user(account, user->passport, NULL, -1);
-
 		list = gaim_find_buddies(account, user->passport);
 
 		for (sl = list; sl != NULL; sl = sl->next)
 		{
 			GaimBuddy *buddy = (GaimBuddy *)sl->data;
-			gaim_blist_node_remove_setting((GaimBlistNode*)buddy, "icon_checksum");
+			if (buddy->icon)
+				gaim_blist_node_remove_setting((GaimBlistNode*)buddy, "icon_checksum");
 		}
 		g_slist_free(list);
 
+		/* TODO: I think we need better buddy icon core functions. */
+		gaim_buddy_icons_set_for_user(account, user->passport, NULL, 0);
+
 		return;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.