soc.2009.telepathy: 5231888b: Fixed some error handling routines

sttwister at gmail.com sttwister at gmail.com
Sat Sep 12 09:36:26 EDT 2009


-----------------------------------------------------------------
Revision: 5231888b351ef595b3e38307a1e6df67bf922acb
Ancestor: e13e3904cf522e790638c3b59143d81a9eee5b51
Author: sttwister at gmail.com
Date: 2009-09-12T13:31:34
Branch: im.pidgin.soc.2009.telepathy
URL: http://d.pidgin.im/viewmtn/revision/info/5231888b351ef595b3e38307a1e6df67bf922acb

Modified files:
        libpurple/protocols/telepathy/telepathy_account.c
        libpurple/protocols/telepathy/telepathy_channel_text.c
        libpurple/protocols/telepathy/telepathy_connection.c

ChangeLog: 

Fixed some error handling routines

-------------- next part --------------
============================================================
--- libpurple/protocols/telepathy/telepathy_account.c	d5b09b366d300f926837ae326f3065e1c0913acc
+++ libpurple/protocols/telepathy/telepathy_account.c	d752df33a37f2dbeb5babb1b7636415c5179a58b
@@ -510,7 +510,8 @@ create_account_cb (TpAccountManager *pro
 	if (err != NULL)
 	{
 		purple_debug_error("telepathy", "Error dupping DBus daemon for new account:%s\n",
-				error->message);
+				err->message);
+		g_error_free(err);
 		return;
 	}
 
@@ -519,7 +520,8 @@ create_account_cb (TpAccountManager *pro
 	if (err != NULL)
 	{
 		purple_debug_error("telepathy", "Error creating proxy for new Account:%s\n",
-				error->message);
+				err->message);
+		g_error_free(err);
 		return;
 	}
 
@@ -531,6 +533,7 @@ create_account_cb (TpAccountManager *pro
 		purple_debug_error("telepathy", "Error connecting to Removed: %s\n",
 				err->message);
 		g_error_free(err);
+		return;
 	}
 
 	account_data->obj_Path = g_strdup((gchar *)out_Account);
@@ -549,7 +552,7 @@ create_account_cb (TpAccountManager *pro
 		purple_debug_error("telepathy", "Error connecting to"
 			" AccountPropertyChanged: %s\n", err->message);
 		g_error_free(err);
-		err = NULL;
+		return;
 	}
 
 	tp_cli_dbus_properties_call_get_all(tp_account, -1, 
@@ -746,7 +749,7 @@ get_valid_accounts_cb (TpProxy *proxy,
 			purple_debug_error("telepathy", "Error connecting to"
 				" AccountPropertyChanged: %s\n", err->message);
 			g_error_free(err);
-			err = NULL;
+			return;
 		}
 
 		tp_cli_dbus_properties_call_get_all(account, -1, TP_IFACE_ACCOUNT,
============================================================
--- libpurple/protocols/telepathy/telepathy_channel_text.c	1328f0c1425b65dabc97f32c77c058c7d72f2ca4
+++ libpurple/protocols/telepathy/telepathy_channel_text.c	779a1372a0f1401bfce8e32a7b1a25f1429c5c28
@@ -1107,6 +1107,8 @@ handle_room_text_channel (TpChannel *cha
 	{
 		purple_debug_error("telepathy", "Error connecting to MembersChanged signal: %s\n",
 				error->message);
+		g_error_free(error);
+		return;
 	}
 
 
@@ -1122,6 +1124,8 @@ handle_room_text_channel (TpChannel *cha
 	{
 		purple_debug_error("telepathy", "Error connecting to Received signal: %s\n",
 				error->message);
+		g_error_free(error);
+		return;
 	}
 
 
@@ -1134,6 +1138,7 @@ handle_room_text_channel (TpChannel *cha
 	{
 		purple_debug_error("telepathy", "Error connecting to SendError signal: %s\n", error->message);
 		g_error_free(error);
+		return;
 	}
 
 
@@ -1151,6 +1156,7 @@ handle_room_text_channel (TpChannel *cha
 		purple_debug_error("telepathy", "Error connecting to PropertyFlagsChanged signal: %s\n",
 				error->message);
 		g_error_free(error);
+		return;
 	}
 
 	tp_cli_properties_interface_connect_to_properties_changed(channel,
@@ -1162,6 +1168,7 @@ handle_room_text_channel (TpChannel *cha
 		purple_debug_error("telepathy", "Error connecting to PropertiesChanged signal: %s\n",
 				error->message);
 		g_error_free(error);
+		return;
 	}
 
 }
@@ -1511,6 +1518,8 @@ handle_im_text_channel (TpChannel *chann
 	if (error != NULL)
 	{
 		purple_debug_error("telepathy", "Error connecting to ChatStateChanged signal: %s\n", error->message);
+		g_error_free(error);
+		error = NULL;
 	}
 
 	tp_cli_channel_type_text_connect_to_received(channel, received_cb, data, NULL, NULL, &error);
@@ -1518,6 +1527,8 @@ handle_im_text_channel (TpChannel *chann
 	if (error != NULL)
 	{
 		purple_debug_error("telepathy", "Error connecting to Received signal: %s\n", error->message);
+		g_error_free(error);
+		return;
 	}
 
 	tp_channel->received_Pending_Messages = FALSE;
============================================================
--- libpurple/protocols/telepathy/telepathy_connection.c	69e3991c310c08d210181c50cb76cc41880f99e7
+++ libpurple/protocols/telepathy/telepathy_connection.c	1d8852eecde5d9dc3d0c3d9fc31865268e9df1c3
@@ -476,6 +476,7 @@ connection_ready_cb (TpConnection *conne
 		{
 			purple_debug_error("telepathy", "Error connecting to AvatarRetrieved signal: %s\n", error->message);
 			g_error_free(error);
+			error = NULL;
 		}
 
 		tp_cli_connection_interface_avatars_connect_to_avatar_updated(connection,


More information about the Commits mailing list