pidgin.2.6.5: 98c35486: *** Plucked rev 0707f870a510922ae86ef379...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 98c35486daa7e04b3b15978d3da85e4a38b0ad06
Ancestor: 545b0231b60f11482e2b146a4f5a5e140bc06691
Author: datallah at pidgin.im
Date: 2010-01-07T23:48:32
Branch: im.pidgin.pidgin.2.6.5
URL: http://d.pidgin.im/viewmtn/revision/info/98c35486daa7e04b3b15978d3da85e4a38b0ad06

Modified files:
        libpurple/account.c

ChangeLog: 

*** Plucked rev 0707f870a510922ae86ef379b5f01efa76d01402 (8e1d807c1aadfb510e14f047d2cf00e0c06be465):
purple_account_request_authorization() does not require non-NULL auth and
deny callbacks, so let's not crash if it is not given them. This should fix
Fedora bug https://bugzilla.redhat.com/show_bug.cgi?id=552607 which I'm
guessing is caused by a 3rd party prpl


-------------- next part --------------
============================================================
--- libpurple/account.c	950f40cde484859bc975cf3ffdd1b2bc7b21324c
+++ libpurple/account.c	89770d2948f7fd7b8753705f7c56822ee4a4a548
@@ -1341,7 +1341,8 @@ request_auth_cb(void *data)
 
 	handles = g_list_remove(handles, info);
 
-	info->auth_cb(info->userdata);
+	if (info->auth_cb != NULL)
+		info->auth_cb(info->userdata);
 
 	purple_signal_emit(purple_accounts_get_handle(),
 			"account-authorization-granted", info->account, info->user);
@@ -1356,7 +1357,8 @@ request_deny_cb(void *data)
 
 	handles = g_list_remove(handles, info);
 
-	info->deny_cb(info->userdata);
+	if (info->deny_cb != NULL)
+		info->deny_cb(info->userdata);
 
 	purple_signal_emit(purple_accounts_get_handle(),
 			"account-authorization-denied", info->account, info->user);
@@ -1383,10 +1385,12 @@ purple_account_request_authorization(Pur
 				"account-authorization-requested", account, remote_user));
 
 	if (plugin_return > 0) {
-		auth_cb(user_data);
+		if (auth_cb != NULL)
+			auth_cb(user_data);
 		return NULL;
 	} else if (plugin_return < 0) {
-		deny_cb(user_data);
+		if (deny_cb != NULL)
+			deny_cb(user_data);
 		return NULL;
 	}