[Telepathy-commits] [telepathy-haze/master] Correctly type iface lists as const char * const *

Will Thompson will.thompson at collabora.co.uk
Wed Aug 27 07:52:13 PDT 2008


(and cast back to (const char **) for the sake of
tp_svc_channel_return_from_get_interfaces)
---
 src/im-channel.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/im-channel.c b/src/im-channel.c
index 05342b7..0d5f43e 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -118,11 +118,11 @@ _chat_state_available (HazeIMChannel *chan)
     return (prpl_info->send_typing != NULL);
 }
 
-static const char **
+static const char * const*
 _haze_im_channel_interfaces (HazeIMChannel *chan)
 {
-    static const char *no_interfaces[] = { NULL };
-    static const char *chat_state_ifaces[] = {
+    static const char * const no_interfaces[] = { NULL };
+    static const char * const chat_state_ifaces[] = {
         TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE,
         NULL
     };
@@ -138,7 +138,7 @@ haze_im_channel_get_interfaces (TpSvcChannel *iface,
                                 DBusGMethodInvocation *context)
 {
     tp_svc_channel_return_from_get_interfaces (context,
-        _haze_im_channel_interfaces (HAZE_IM_CHANNEL (iface)));
+        (const char **)_haze_im_channel_interfaces (HAZE_IM_CHANNEL (iface)));
 }
 
 static void
-- 
1.5.6.3



More information about the Telepathy-commits mailing list