[Telepathy-commits] [telepathy-salut/master] Handle error messages with printf format strings in.

[Jonny Lamb]

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 lib/gibber/gibber-oob-file-transfer.c |    4 ++--
 lib/gibber/gibber-resolver.c          |    5 +++--
 lib/gibber/gibber-xmpp-error.c        |    5 ++---
 src/salut-connection.c                |    3 ++-
 src/salut-muc-manager.c               |    4 ++--
 src/salut-self.c                      |    6 ++++--
 src/write-mgr-file.c                  |    2 +-
 7 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/lib/gibber/gibber-oob-file-transfer.c b/lib/gibber/gibber-oob-file-transfer.c
index e299c9e..1cfa861 100644
--- a/lib/gibber/gibber-oob-file-transfer.c
+++ b/lib/gibber/gibber-oob-file-transfer.c
@@ -290,8 +290,8 @@ http_client_finished_chunks_cb (SoupMessage *msg,
         reason_phrase = msg->reason_phrase;
       else
         reason_phrase = "Unknown HTTP error";
-      g_set_error (&error, GIBBER_FILE_TRANSFER_ERROR,
-          GIBBER_FILE_TRANSFER_ERROR_NOT_FOUND, reason_phrase);
+      error = g_error_new_literal (GIBBER_FILE_TRANSFER_ERROR,
+        GIBBER_FILE_TRANSFER_ERROR_NOT_FOUND, reason_phrase);
       gibber_file_transfer_emit_error (GIBBER_FILE_TRANSFER (self), error);
       return;
     }
diff --git a/lib/gibber/gibber-resolver.c b/lib/gibber/gibber-resolver.c
index f7de36e..10910e1 100644
--- a/lib/gibber/gibber-resolver.c
+++ b/lib/gibber/gibber-resolver.c
@@ -744,7 +744,8 @@ gibber_resolver_gai_error_to_g_error (int error)
       code = GIBBER_RESOLVER_ERROR_UNKNOWN;
   }
 
-  return g_error_new (GIBBER_RESOLVER_ERROR, code, gai_strerror (error));
+  return g_error_new_literal (GIBBER_RESOLVER_ERROR, code,
+      gai_strerror (error));
 }
 
 GError *
@@ -775,7 +776,7 @@ gibber_resolver_h_error_to_g_error (int error)
       message = "Unknown error";
   }
 
-  return g_error_new (GIBBER_RESOLVER_ERROR, code, message);
+  return g_error_new_literal (GIBBER_RESOLVER_ERROR, code, message);
 }
 
 
diff --git a/lib/gibber/gibber-xmpp-error.c b/lib/gibber/gibber-xmpp-error.c
index ba30bae..e7823d4 100644
--- a/lib/gibber/gibber-xmpp-error.c
+++ b/lib/gibber/gibber-xmpp-error.c
@@ -375,9 +375,8 @@ gibber_xmpp_error_to_g_error (GibberXmppError error)
       return g_error_new (GIBBER_XMPP_ERROR, XMPP_ERROR_UNDEFINED_CONDITION,
           "Unknown or invalid XMPP error");
 
-  return g_error_new (GIBBER_XMPP_ERROR,
-                      error,
-                      xmpp_errors[error].description);
+  return g_error_new_literal (GIBBER_XMPP_ERROR, error,
+      xmpp_errors[error].description);
 }
 
 /*
diff --git a/src/salut-connection.c b/src/salut-connection.c
index 84244b2..4c2ecb9 100644
--- a/src/salut-connection.c
+++ b/src/salut-connection.c
@@ -581,7 +581,8 @@ set_own_status (GObject *obj,
     }
   else
     {
-      g_set_error (error, TP_ERRORS, TP_ERROR_NETWORK_ERROR, err->message);
+      *error = g_error_new_literal (TP_ERRORS, TP_ERROR_NETWORK_ERROR,
+          err->message);
     }
 
   return TRUE;
diff --git a/src/salut-muc-manager.c b/src/salut-muc-manager.c
index 48cf390..5766a1d 100644
--- a/src/salut-muc-manager.c
+++ b/src/salut-muc-manager.c
@@ -569,7 +569,7 @@ salut_muc_manager_request_new_muc_channel (SalutMucManager *mgr,
   if (connection == NULL)
     {
       DEBUG ("get connection failed: %s", connection_error->message);
-      g_set_error (error, TP_ERRORS, TP_ERROR_NETWORK_ERROR,
+      *error = g_error_new_literal (TP_ERRORS, TP_ERROR_NETWORK_ERROR,
           connection_error->message);
       g_error_free (connection_error);
       return NULL;
@@ -579,7 +579,7 @@ salut_muc_manager_request_new_muc_channel (SalutMucManager *mgr,
   if (!gibber_muc_connection_connect (connection, &connection_error))
     {
       DEBUG ("Connect failed: %s", connection_error->message);
-      g_set_error (error, TP_ERRORS, TP_ERROR_NETWORK_ERROR,
+      *error = g_error_new_literal (TP_ERRORS, TP_ERROR_NETWORK_ERROR,
           connection_error->message);
       g_error_free (connection_error);
       g_object_unref (connection);
diff --git a/src/salut-self.c b/src/salut-self.c
index 3e1cfe8..8ffbc55 100644
--- a/src/salut-self.c
+++ b/src/salut-self.c
@@ -578,7 +578,8 @@ salut_self_set_alias (SalutSelf *self, const gchar *alias, GError **error)
   ret = SALUT_SELF_GET_CLASS (self)->set_alias (self, &err);
   if (!ret)
     {
-      g_set_error (error, TP_ERRORS, TP_ERROR_NETWORK_ERROR, err->message);
+      *error = g_error_new_literal (TP_ERRORS, TP_ERROR_NETWORK_ERROR,
+          err->message);
       g_error_free (err);
     }
   return ret;
@@ -619,7 +620,8 @@ salut_self_set_avatar (SalutSelf *self, guint8 *data,
   if (!ret)
     {
       salut_self_remove_avatar (self);
-      g_set_error (error, TP_ERRORS, TP_ERROR_NETWORK_ERROR, err->message);
+      *error = g_error_new_literal (TP_ERRORS, TP_ERROR_NETWORK_ERROR,
+          err->message);
       g_error_free (err);
     }
 
diff --git a/src/write-mgr-file.c b/src/write-mgr-file.c
index de984d7..728fdc7 100644
--- a/src/write-mgr-file.c
+++ b/src/write-mgr-file.c
@@ -93,7 +93,7 @@ main (void)
                                 salut_protocols, &error);
   if (!s)
     {
-      fprintf (stderr, error->message);
+      fprintf (stderr, "%s", error->message);
       g_error_free (error);
       return 1;
     }
-- 
1.5.6.5