changeset 15143:4b319b19aa24

[gaim-migrate @ 17928] Get rid of a few small compile warnings committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 09 Dec 2006 20:20:17 +0000
parents 66c857a355b4
children b81e4e44b509
files libgaim/protocols/msn/userlist.c libgaim/protocols/oscar/oscar.c libgaim/protocols/yahoo/yahoo.c
diffstat 3 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libgaim/protocols/msn/userlist.c	Sat Dec 09 20:11:43 2006 +0000
+++ b/libgaim/protocols/msn/userlist.c	Sat Dec 09 20:20:17 2006 +0000
@@ -74,7 +74,7 @@
 	pa->gc = gc;
 	
 	gaim_account_request_authorization(gaim_connection_get_account(gc), passport, NULL, friendly, NULL,
-					   gaim_find_buddy(gaim_connection_get_account(gc), passport),
+					   gaim_find_buddy(gaim_connection_get_account(gc), passport) != NULL,
 					   G_CALLBACK(msn_accept_add_cb), G_CALLBACK(msn_cancel_add_cb), pa);
 }
 
--- a/libgaim/protocols/oscar/oscar.c	Sat Dec 09 20:11:43 2006 +0000
+++ b/libgaim/protocols/oscar/oscar.c	Sat Dec 09 20:20:17 2006 +0000
@@ -2330,8 +2330,9 @@
 				data->name = sn;
 				data->nick = NULL;
 
-				gaim_account_request_authorization(account, sn,
-						NULL, NULL, reason, gaim_find_buddy(account, sn), G_CALLBACK(gaim_auth_grant),
+				gaim_account_request_authorization(account, sn, NULL, NULL,
+						reason, gaim_find_buddy(account, sn) != NULL,
+						G_CALLBACK(gaim_auth_grant),
 						G_CALLBACK(gaim_auth_dontgrant_msgprompt), data);
 				g_free(reason);
 			}
@@ -5042,8 +5043,8 @@
 	data->name = g_strdup(sn);
 	data->nick = NULL;
 
-	gaim_account_request_authorization(account, nombre,
-			NULL, NULL, reason, buddy, G_CALLBACK(gaim_auth_grant),
+	gaim_account_request_authorization(account, nombre, NULL, NULL,
+			reason, buddy != NULL, G_CALLBACK(gaim_auth_grant),
 			G_CALLBACK(gaim_auth_dontgrant_msgprompt), data);
 	g_free(nombre);
 	g_free(reason);
--- a/libgaim/protocols/yahoo/yahoo.c	Sat Dec 09 20:11:43 2006 +0000
+++ b/libgaim/protocols/yahoo/yahoo.c	Sat Dec 09 20:20:17 2006 +0000
@@ -996,7 +996,7 @@
 		 * this should probably be moved to the core.
 		 */
 		 gaim_account_request_authorization(gaim_connection_get_account(gc), add_req->who, add_req->id,
-                                                    NULL, add_req->msg, gaim_find_buddy(gaim_connection_get_account(gc),add_req->who),
+                                                    NULL, add_req->msg, gaim_find_buddy(gaim_connection_get_account(gc),add_req->who) != NULL,
 						    G_CALLBACK(yahoo_buddy_add_authorize_cb), 
 						    G_CALLBACK(yahoo_buddy_add_deny_reason_cb),
                                                     add_req);