empathy r1797 - in trunk: libempathy libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Fri Nov 21 16:17:38 2008
New Revision: 1797
URL: http://svn.gnome.org/viewvc/empathy?rev=1797&view=rev

Log:
Add parameter checks to public functions. (Jonny Lamb)

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

Modified:
   trunk/libempathy-gtk/empathy-contact-menu.c
   trunk/libempathy-gtk/empathy-ui-utils.c
   trunk/libempathy/empathy-tp-file.c

Modified: trunk/libempathy-gtk/empathy-contact-menu.c
==============================================================================
--- trunk/libempathy-gtk/empathy-contact-menu.c	(original)
+++ trunk/libempathy-gtk/empathy-contact-menu.c	Fri Nov 21 16:17:38 2008
@@ -195,6 +195,7 @@
 static void
 contact_file_transfer_menu_item_activate_cb (EmpathyContact *contact)
 {
+	g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 	empathy_send_file_with_file_chooser_and_manager (contact);
 }
 

Modified: trunk/libempathy-gtk/empathy-ui-utils.c
==============================================================================
--- trunk/libempathy-gtk/empathy-ui-utils.c	(original)
+++ trunk/libempathy-gtk/empathy-ui-utils.c	Fri Nov 21 16:17:38 2008
@@ -1581,6 +1581,8 @@
 void
 empathy_send_file_with_file_chooser_and_manager (EmpathyContact   *contact)
 {
+	g_return_if_fail (EMPATHY_IS_CONTACT (contact));
+
 	empathy_send_file_with_file_chooser (contact,
 					     (EmpathyFileChooserCallback) add_file_to_manager,
 					     empathy_ft_manager_get_default ());

Modified: trunk/libempathy/empathy-tp-file.c
==============================================================================
--- trunk/libempathy/empathy-tp-file.c	(original)
+++ trunk/libempathy/empathy-tp-file.c	Fri Nov 21 16:17:38 2008
@@ -724,8 +724,11 @@
  */
 EmpathyTpFile *
 empathy_tp_file_new (McAccount *account,
-                  TpChannel *channel)
+                     TpChannel *channel)
 {
+  g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
+  g_return_val_if_fail (TP_IS_CHANNEL (chnanel), NULL);
+
   return g_object_new (EMPATHY_TYPE_TP_FILE,
       "account", account,
       "channel", channel,
@@ -841,42 +844,49 @@
 EmpathyContact *
 empathy_tp_file_get_contact (EmpathyTpFile *tp_file)
 {
+  g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
   return tp_file->priv->contact;
 }
 
 GInputStream *
 empathy_tp_file_get_input_stream (EmpathyTpFile *tp_file)
 {
+  g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
   return tp_file->priv->in_stream;
 }
 
 GOutputStream *
 empathy_tp_file_get_output_stream (EmpathyTpFile *tp_file)
 {
+  g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
   return tp_file->priv->out_stream;
 }
 
 const gchar *
 empathy_tp_file_get_filename (EmpathyTpFile *tp_file)
 {
+  g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
   return tp_file->priv->filename;
 }
 
 gboolean
 empathy_tp_file_get_incoming (EmpathyTpFile *tp_file)
 {
+  g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
   return tp_file->priv->incoming;
 }
 
 EmpFileTransferState
 empathy_tp_file_get_state (EmpathyTpFile *tp_file)
 {
+  g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
   return tp_file->priv->state;
 }
 
 EmpFileTransferStateChangeReason
 empathy_tp_file_get_state_change_reason (EmpathyTpFile *tp_file)
 {
+  g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
   g_return_val_if_fail (tp_file->priv->state_change_reason >= 0,
       EMP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
 
@@ -886,12 +896,14 @@
 guint64
 empathy_tp_file_get_size (EmpathyTpFile *tp_file)
 {
+  g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
   return tp_file->priv->size;
 }
 
 guint64
 empathy_tp_file_get_transferred_bytes (EmpathyTpFile *tp_file)
 {
+  g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
   return tp_file->priv->transferred_bytes;
 }
 
@@ -902,6 +914,8 @@
   gdouble time_per_byte;
   gdouble remaining_time;
 
+  g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
+
   if (tp_file->priv->size == EMPATHY_TP_FILE_UNKNOWN_SIZE)
     return -1;
 
@@ -921,6 +935,8 @@
 void
 empathy_tp_file_cancel (EmpathyTpFile *tp_file)
 {
+  g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
+
   tp_cli_channel_call_close (tp_file->priv->channel, -1, NULL, NULL, NULL, NULL);
 
   g_cancellable_cancel (tp_file->priv->cancellable);
@@ -930,6 +946,9 @@
 empathy_tp_file_set_input_stream (EmpathyTpFile *tp_file,
                                   GInputStream *in_stream)
 {
+  g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file));
+  g_return_if_fail (G_IS_INPUT_STREAM (in_stream));
+
   if (tp_file->priv->in_stream == in_stream)
     return;
 
@@ -952,6 +971,9 @@
 empathy_tp_file_set_output_stream (EmpathyTpFile *tp_file,
                                    GOutputStream *out_stream)
 {
+  g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file));
+  g_return_if_fail (G_IS_INPUT_STREAM (in_stream));
+
   if (tp_file->priv->out_stream == out_stream)
     return;
 
@@ -972,6 +994,7 @@
 empathy_tp_file_set_filename (EmpathyTpFile *tp_file,
                               const gchar *filename)
 {
+  g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file));
   g_return_if_fail (filename != NULL);
 
   if (tp_file->priv->filename && strcmp (filename,