[Telepathy-commits] [telepathy-haze/master] connection-aliasing: improve const-correctness

[Simon McVittie]

"Nobody really understands const in C", chapter 73 in an ongoing series.
---
 src/connection-aliasing.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/connection-aliasing.c b/src/connection-aliasing.c
index 241e720..dd6f3e0 100644
--- a/src/connection-aliasing.c
+++ b/src/connection-aliasing.c
@@ -71,7 +71,7 @@ haze_connection_request_aliases (TpSvcConnectionInterfaceAliasing *self,
         tp_base_connection_get_handles (base, TP_HANDLE_TYPE_CONTACT);
     guint i;
     GError *error = NULL;
-    gchar **aliases = g_new0 (gchar *, contacts->len + 1);
+    const gchar **aliases = g_new0 (const gchar *, contacts->len + 1);
 
     if (!tp_handles_are_valid (contact_handles, contacts, FALSE, &error))
     {
@@ -114,8 +114,7 @@ haze_connection_request_aliases (TpSvcConnectionInterfaceAliasing *self,
         }
         DEBUG ("%s has alias \"%s\"", bname, alias);
 
-        /* They'll be made const again shortly */
-        aliases[i] = (gchar *) alias;
+        aliases[i] = alias;
     }
 
     if (error)
@@ -125,9 +124,8 @@ haze_connection_request_aliases (TpSvcConnectionInterfaceAliasing *self,
     }
     else
     {
-        /* Hrm, why do I need to cast up to const? */
         tp_svc_connection_interface_aliasing_return_from_request_aliases (
-            context, (const gchar **)aliases);
+            context, aliases);
     }
     g_free (aliases);
 }
-- 
1.5.6.5