soc.2009.telepathy: cd7c1486: Include optional message when someone re...

[sttwister at soc.pidgin.im]

-----------------------------------------------------------------
Revision: cd7c148608605667653b6ad197498de6ccdd31e1
Ancestor: d1a77787fb6cd0882bd5ba8f4619df02bacb9cba
Author: sttwister at soc.pidgin.im
Date: 2009-07-07T23:28:55
Branch: im.pidgin.soc.2009.telepathy
URL: http://d.pidgin.im/viewmtn/revision/info/cd7c148608605667653b6ad197498de6ccdd31e1

Modified files:
        libpurple/protocols/telepathy/telepathy_channel_list.c
        libpurple/protocols/telepathy/telepathy_channel_list.h

ChangeLog: 

Include optional message when someone requests authorization

-------------- next part --------------
============================================================
--- libpurple/protocols/telepathy/telepathy_channel_list.c	aa2d7123e6527ff9e8be61df89dc9c070716bad1
+++ libpurple/protocols/telepathy/telepathy_channel_list.c	e8fb56172c408c679aa5fc403e6b4d42751879ce
@@ -159,12 +159,15 @@ request_authorization_cb (TpConnection *
 
 		purple_account_request_authorization(data->connection_data->acct,
 				tp_contact_get_identifier(contacts[i]), NULL,
-				tp_contact_get_alias(contacts[i]), NULL,
+				tp_contact_get_alias(contacts[i]), request->message,
 				FALSE, 
 				request_authorization_auth_cb,
 				request_authorization_deny_cb,
 				request);
 	}
+
+	g_free((gpointer)data->message);
+	g_free(data);
 }
 
 static void
@@ -221,11 +224,12 @@ members_changed_cb (TpChannel *proxy,
 
 		request->connection_data = data;
 		request->channel = proxy;
+		request->message = g_strdup(arg_Message);
 
 		tp_connection_get_contacts_by_handle(data->connection,
 				arg_Local_Pending->len, (const TpHandle*)arg_Local_Pending->data,
 				G_N_ELEMENTS (features), features,
-				request_authorization_cb, request, g_free, NULL);
+				request_authorization_cb, request, NULL, NULL);
 	}
 }
 
@@ -284,11 +288,12 @@ get_local_pending_members_with_info_cb (
 
 		request->connection_data = data;
 		request->channel = proxy;
+		request->message = g_strdup(message);
 
 		tp_connection_get_contacts_by_handle(data->connection,
 				1, &handle,
 				G_N_ELEMENTS (features), features,
-				request_authorization_cb, request, g_free, NULL);
+				request_authorization_cb, request, NULL, NULL);
 	}
 }
 
============================================================
--- libpurple/protocols/telepathy/telepathy_channel_list.h	a771a4511c83f7e26e67f230da34cbd58491beaa
+++ libpurple/protocols/telepathy/telepathy_channel_list.h	46e660896f8b1bf76a8b0d1f75325918a785fc10
@@ -30,6 +30,7 @@ typedef struct
 	telepathy_connection *connection_data;
 	TpChannel *channel;
 	TpHandle handle;
+	const gchar *message;
 
 } telepathy_authorization_request;