[telepathy-mission-control/master] McdAccount: UpdateParameters: don't work around failure to set GError

Simon McVittie simon.mcvittie at collabora.co.uk
Tue Apr 28 07:54:47 PDT 2009


---
 src/mcd-account.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/mcd-account.c b/src/mcd-account.c
index 474093e..d95776e 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -1426,12 +1426,9 @@ account_update_parameters (McSvcAccount *self, GHashTable *set,
 
     if (!_mcd_account_set_parameters (account, set, unset, &error))
     {
-	if (!error)
-	    g_set_error (&error, TP_ERRORS, TP_ERROR_NOT_AVAILABLE,
-			 "Internal error");
-	dbus_g_method_return_error (context, error);
-	g_error_free (error);
-	return;
+        dbus_g_method_return_error (context, error);
+        g_error_free (error);
+        return;
     }
 
     /* emit the PropertiesChanged signal */
-- 
1.5.6.5




More information about the telepathy-commits mailing list