Translation handlers in ModestProtocolRegistry use va_list instead of ...

pmo-trunk-r6843

diff --git a/src/modest-protocol-registry.c b/src/modest-protocol-registry.c
index 26a6cfc..42ffcd6 100644 (file)
--- a/src/modest-protocol-registry.c
+++ b/src/modest-protocol-registry.c
@@ -80,7 +80,7 @@ static void   modest_protocol_registry_instance_init (ModestProtocolRegistry *ob
 static GHashTable *   modest_protocol_registry_create_tag (ModestProtocolRegistry *obj, const gchar *tag);
 
 /* translation handlers */
-static gchar * translation_is_userdata (gpointer userdata, ...);
+static gchar * translation_is_userdata (gpointer userdata, va_list args);
 
 typedef struct _ModestProtocolRegistryPrivate ModestProtocolRegistryPrivate;
 struct _ModestProtocolRegistryPrivate {
@@ -395,21 +395,20 @@ modest_protocol_registry_create_tag (ModestProtocolRegistry *self, const gchar *
 }
 
 static gchar * 
-translation_is_userdata (gpointer userdata, ...)
+translation_is_userdata (gpointer userdata, va_list args)
 {
-       va_list args, dest;
+       va_list dest;
        gchar *result;
 
-       va_start(args, userdata);
-       va_copy (dest, args);
-       result = g_strdup_printf (_(userdata), dest);
-       va_end (args);
+       G_VA_COPY (dest, args);
+       result = g_strdup_vprintf (_(userdata), dest);
+       va_end (dest);
 
        return result;
 }
 
 static gchar * 
-translation_is_userdata_no_param (gpointer userdata, ...)
+translation_is_userdata_no_param (gpointer userdata, va_list args)
 {
        gchar *result;
 

diff --git a/src/modest-protocol.h b/src/modest-protocol.h
index b8899d3..ce6e3cb 100644 (file)
--- a/src/modest-protocol.h
+++ b/src/modest-protocol.h
@@ -48,7 +48,7 @@ G_BEGIN_DECLS
 
 #define MODEST_PROTOCOL_TYPE_INVALID -1
 
-typedef gchar * (*TranslationFunc) (gpointer userdata, ...);
+typedef gchar * (*TranslationFunc) (gpointer userdata, va_list args);
 
 typedef struct _ModestProtocol      ModestProtocol;
 typedef struct _ModestProtocolClass ModestProtocolClass;