empathy r2474 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Mon Feb 16 21:24:19 2009
New Revision: 2474
URL: http://svn.gnome.org/viewvc/empathy?rev=2474&view=rev

Log:
empathy-dispatcher.c: Check arguments of non-static functions.

Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

Modified:
   trunk/libempathy/empathy-dispatcher.c

Modified: trunk/libempathy/empathy-dispatcher.c
==============================================================================
--- trunk/libempathy/empathy-dispatcher.c	(original)
+++ trunk/libempathy/empathy-dispatcher.c	Mon Feb 16 21:24:19 2009
@@ -1162,6 +1162,8 @@
   ConnectionData *cd;
   DispatcherRequestData *request_data;
 
+  g_return_if_fail (EMPATHY_IS_CONTACT (contact));
+
   account = empathy_contact_get_account (contact);
   connection = g_hash_table_lookup (priv->accounts, account);
 
@@ -1204,6 +1206,8 @@
   ConnectionData *connection_data;
   DispatcherRequestData *request_data;
 
+  g_return_if_fail (EMPATHY_IS_CONTACT (contact));
+
   dispatcher = empathy_dispatcher_dup_singleton();
   priv = GET_PRIV (dispatcher);
 
@@ -1236,6 +1240,9 @@
   EmpathyContactFactory *factory;
   EmpathyContact        *contact;
 
+  g_return_if_fail (MC_IS_ACCOUNT (account));
+  g_return_if_fail (!EMP_STR_EMPTY (contact_id));
+
   factory = empathy_contact_factory_dup_singleton ();
   contact = empathy_contact_factory_get_from_id (factory, account, contact_id);
 
@@ -1292,6 +1299,9 @@
   ConnectionData *connection_data;
   const gchar *names[] = { roomname, NULL };
 
+  g_return_if_fail (MC_IS_ACCOUNT (account));
+  g_return_if_fail (!EMP_STR_EMPTY (roomname));
+
   dispatcher = empathy_dispatcher_dup_singleton();
   priv = GET_PRIV (dispatcher);
 
@@ -1344,6 +1354,10 @@
   gboolean valid;
   TpConnection *connection;
 
+  g_return_if_fail (EMPATHY_IS_DISPATCHER (dispatcher));
+  g_return_if_fail (MC_IS_ACCOUNT (account));
+  g_return_if_fail (request != NULL);
+
   connection = g_hash_table_lookup (priv->accounts, account);
   g_assert (connection != NULL);
 
@@ -1442,6 +1456,10 @@
   GHashTable *request = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
       (GDestroyNotify) tp_g_value_slice_free);
 
+  g_return_if_fail (EMPATHY_IS_CONTACT (contact));
+  g_return_if_fail (!EMP_STR_EMPTY (filename));
+  g_return_if_fail (!EMP_STR_EMPTY (content_type));
+
   /* org.freedesktop.Telepathy.Channel.ChannelType */
   value = tp_g_value_slice_new (G_TYPE_STRING);
   g_value_set_string (value, EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER);