soc.2009.telepathy: 1097472c: Report RequestConnection errors to the u...

sttwister at soc.pidgin.im sttwister at soc.pidgin.im
Tue Jun 2 15:20:29 EDT 2009


-----------------------------------------------------------------
Revision: 1097472cda972a28742aeb51e9797c1a54bceb56
Ancestor: 128beb45ae6b7e842ceb9ba7eb1b2551bb96588c
Author: sttwister at soc.pidgin.im
Date: 2009-06-02T19:17:22
Branch: im.pidgin.soc.2009.telepathy
URL: http://d.pidgin.im/viewmtn/revision/info/1097472cda972a28742aeb51e9797c1a54bceb56

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

ChangeLog: 

Report RequestConnection errors to the user

-------------- next part --------------
============================================================
--- libpurple/protocols/telepathy/telepathy.c	827d2742a1d7d57c9b959b99488c662e1df97498
+++ libpurple/protocols/telepathy/telepathy.c	d3eba8fb63b51ce298bfb2ee5f23cf3925e65a7b
@@ -670,17 +670,19 @@ request_connection_cb (TpConnectionManag
                        gpointer user_data,
                        GObject *weak_object)
 {
+    	PurplePlugin* plugin = user_data;
+	telepathy_data* data = plugin->extra;
+
 	if (error != NULL)
 	{
 		purple_debug_info("telepathy", "RequestConnection error: %s\n", error->message);
+
+		purple_connection_error_reason(data->gc, PURPLE_CONNECTION_ERROR_OTHER_ERROR, error->message);
 	}
 	else
 	{
 		GError *error = NULL;
 
-		PurplePlugin* plugin = user_data;
-		telepathy_data* data = plugin->extra;
-
 		TpDBusDaemon *daemon = tp_dbus_daemon_dup(&error);
 		
 		if (error != NULL)


More information about the Commits mailing list