X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-protocol-registry.c;h=42ffcd69766ad2ce8b5c91f937fa0ae71410af29;hb=87d063a9af845ec8b688866384efbae346ee7f14;hp=dae386fa16a660166a8cc0b8d74272dceae881de;hpb=f61d3ccf2861071c4decef47db5140ddda7074f2;p=modest

diff --git a/src/modest-protocol-registry.c b/src/modest-protocol-registry.c
index dae386f..42ffcd6 100644
--- 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 {
@@ -322,12 +322,17 @@ find_protocol_by_name (ModestProtocolType type_id,
 }
 
 ModestProtocol *
-modest_protocol_registry_get_protocol_by_name (ModestProtocolRegistry *self, const gchar *tag, const gchar *name)
+modest_protocol_registry_get_protocol_by_name (ModestProtocolRegistry *self, 
+					       const gchar *tag, 
+					       const gchar *name)
 {
 	ModestProtocolRegistryPrivate *priv;
 	GHashTable *tag_table;
 
 	g_return_val_if_fail (MODEST_IS_PROTOCOL_REGISTRY (self), NULL);
+	g_return_val_if_fail (tag, NULL);
+	g_return_val_if_fail (name, NULL);
+
 	priv = MODEST_PROTOCOL_REGISTRY_GET_PRIVATE (self);
 
 	tag_table = g_hash_table_lookup (priv->tags_table, tag);
@@ -390,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;