# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1109738179 0
# Node ID 7d13c04387adf50be9cf95dcb2ed1bb3fc4d272d
# Parent  6a618db0a4044c2a37df4772da4285c97f92fb88
[gaim-migrate @ 12163]
These got committed to oldstatus, but not to HEAD

committer: Tailor Script <tailor@pidgin.im>

diff -r 6a618db0a404 -r 7d13c04387ad src/protocols/msn/notification.c
--- a/src/protocols/msn/notification.c	Tue Mar 01 21:15:58 2005 +0000
+++ b/src/protocols/msn/notification.c	Wed Mar 02 04:36:19 2005 +0000
@@ -972,9 +972,10 @@
 			g_free(session->passport_info.file);
 			session->passport_info.file = NULL;
 		}
+#ifdef _WIN32
 		else
 		{
-			/* 
+			/*
 			 * Renaming file with .html extension, so that the
 			 * win32 open_url will work.
 			 */
@@ -989,11 +990,12 @@
 				{
 					g_free(session->passport_info.file);
 					session->passport_info.file = tmp;
-				} 
+				}
 				else
 					g_free(tmp);
 			}
 		}
+#endif
 	}
 }
 /**************************************************************************
diff -r 6a618db0a404 -r 7d13c04387ad src/protocols/yahoo/yahoochat.c
--- a/src/protocols/yahoo/yahoochat.c	Tue Mar 01 21:15:58 2005 +0000
+++ b/src/protocols/yahoo/yahoochat.c	Wed Mar 02 04:36:19 2005 +0000
@@ -1391,7 +1391,7 @@
 
 	for (; l; l = l->next) {
 		yahoo_roomlist_destroy(l->data);
-		gaim_roomlist_unref(l->data);
+		gaim_roomlist_unref(list);
 	}
 	g_list_free(k);
 }
@@ -1431,6 +1431,7 @@
 	{
 		gaim_notify_error(gaim_account_get_connection(list->account),
 		                  NULL, _("Connection problem"), _("Unable to fetch room list."));
+		gaim_roomlist_ref(list);
 		yahoo_roomlist_cleanup(list, yrl);
 		return;
 	}