empathy r1772 - in trunk: libempathy libempathy-gtk

[xclaesse svn gnome org]

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

Log:
Fixed function declaration style. (Jonny Lamb)

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

Modified:
   trunk/libempathy-gtk/empathy-ft-manager.c
   trunk/libempathy/empathy-file.c

Modified: trunk/libempathy-gtk/empathy-ft-manager.c
==============================================================================
--- trunk/libempathy-gtk/empathy-ft-manager.c	(original)
+++ trunk/libempathy-gtk/empathy-ft-manager.c	Fri Nov 21 16:16:02 2008
@@ -186,7 +186,8 @@
  * @ft.
  */
 void
-empathy_ft_manager_add_file (EmpathyFTManager *ft_manager, EmpathyFile *file)
+empathy_ft_manager_add_file (EmpathyFTManager *ft_manager,
+                             EmpathyFile *file)
 {
   EmpFileTransferState state;
 
@@ -243,7 +244,8 @@
 }
 
 static GtkTreeRowReference *
-get_row_from_file (EmpathyFTManager *ft_manager, EmpathyFile *file)
+get_row_from_file (EmpathyFTManager *ft_manager,
+                   EmpathyFile *file)
 {
   EmpathyFTManagerPriv *priv;
 
@@ -322,7 +324,8 @@
 }
 
 static void
-update_ft_row (EmpathyFTManager *ft_manager, EmpathyFile *file)
+update_ft_row (EmpathyFTManager *ft_manager,
+               EmpathyFile *file)
 {
   EmpathyFTManagerPriv *priv;
   GtkTreeRowReference  *row_ref;
@@ -488,15 +491,17 @@
 }
 
 static void
-transferred_bytes_changed_cb (EmpathyFile *file, GParamSpec *pspec,
-    EmpathyFTManager *ft_manager)
+transferred_bytes_changed_cb (EmpathyFile *file,
+                              GParamSpec *pspec,
+                              EmpathyFTManager *ft_manager)
 {
   update_ft_row (ft_manager, file);
 }
 
 static void
-state_changed_cb (EmpathyFile *file, GParamSpec *pspec,
-    EmpathyFTManager *ft_manager)
+state_changed_cb (EmpathyFile *file,
+                  GParamSpec *pspec,
+                  EmpathyFTManager *ft_manager)
 {
   EmpathyFTManagerPriv *priv;
   gboolean remove;
@@ -537,7 +542,8 @@
 }
 
 static void
-ft_manager_add_file_to_list (EmpathyFTManager *ft_manager, EmpathyFile *file)
+ft_manager_add_file_to_list (EmpathyFTManager *ft_manager,
+                             EmpathyFile *file)
 {
   EmpathyFTManagerPriv *priv;
   GtkTreeRowReference  *row_ref;
@@ -607,14 +613,18 @@
 }
 
 static void
-selection_changed (GtkTreeSelection *selection, EmpathyFTManager *ft_manager)
+selection_changed (GtkTreeSelection *selection,
+                   EmpathyFTManager *ft_manager)
 {
   update_buttons (ft_manager);
 }
 
 static void
-progress_cell_data_func (GtkTreeViewColumn *col, GtkCellRenderer *renderer,
-    GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
+progress_cell_data_func (GtkTreeViewColumn *col,
+                         GtkCellRenderer *renderer,
+                         GtkTreeModel *model,
+                         GtkTreeIter *iter,
+                         gpointer user_data)
 {
   const gchar *text = NULL;
   gint percent;
@@ -634,7 +644,9 @@
 }
 
 static void
-ft_manager_clear_foreach_cb (gpointer key, gpointer value, gpointer user_data)
+ft_manager_clear_foreach_cb (gpointer key,
+                             gpointer value,
+                             gpointer user_data)
 {
   GSList **list = user_data;
   EmpathyFile *file = key;
@@ -673,8 +685,9 @@
 }
 
 static gboolean
-ft_manager_delete_event_cb (GtkWidget *widget, GdkEvent *event,
-    EmpathyFTManager *ft_manager)
+ft_manager_delete_event_cb (GtkWidget *widget,
+                            GdkEvent *event,
+                            EmpathyFTManager *ft_manager)
 {
   EmpathyFTManagerPriv *priv;
 
@@ -715,8 +728,9 @@
 }
 
 static gboolean
-ft_manager_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event,
-    EmpathyFTManager *ft_manager)
+ft_manager_configure_event_cb (GtkWidget *widget,
+                               GdkEventConfigure *event,
+                               EmpathyFTManager *ft_manager)
 {
   EmpathyFTManagerPriv *priv;
 
@@ -854,7 +868,7 @@
 
 static void
 ft_manager_remove_file_from_list (EmpathyFTManager *ft_manager,
-    EmpathyFile *file)
+                                  EmpathyFile *file)
 {
   EmpathyFTManagerPriv *priv;
   GtkTreeRowReference *row_ref;
@@ -977,8 +991,9 @@
 }
 
 static void
-ft_manager_response_cb (GtkWidget *dialog, gint response,
-    EmpathyFTManager *ft_manager)
+ft_manager_response_cb (GtkWidget *dialog,
+                        gint response,
+                        EmpathyFTManager *ft_manager)
 {
   switch (response)
     {
@@ -1015,8 +1030,9 @@
 }
 
 static void
-ft_manager_save_dialog_response_cb (GtkDialog *widget, gint response_id,
-    ReceiveResponseData *response_data)
+ft_manager_save_dialog_response_cb (GtkDialog *widget,
+                                    gint response_id,
+                                    ReceiveResponseData *response_data)
 {
   if (response_id == GTK_RESPONSE_OK)
     {
@@ -1127,8 +1143,9 @@
 }
 
 static void
-ft_manager_receive_file_response_cb (GtkWidget *dialog, gint response,
-    ReceiveResponseData *response_data)
+ft_manager_receive_file_response_cb (GtkWidget *dialog,
+                                     gint response,
+                                     ReceiveResponseData *response_data)
 {
   TpChannel *channel;
 
@@ -1146,7 +1163,7 @@
 
 void
 ft_manager_display_accept_dialog (EmpathyFTManager *ft_manager,
-    EmpathyFile *file)
+                                  EmpathyFile *file)
 {
   GtkWidget *dialog;
   GtkWidget *image;

Modified: trunk/libempathy/empathy-file.c
==============================================================================
--- trunk/libempathy/empathy-file.c	(original)
+++ trunk/libempathy/empathy-file.c	Fri Nov 21 16:16:02 2008
@@ -297,7 +297,9 @@
 }
 
 static GObject *
-file_constructor (GType type, guint n_props, GObjectConstructParam *props)
+file_constructor (GType type,
+                  guint n_props,
+                  GObjectConstructParam *props)
 {
   GObject *file;
   EmpathyFilePriv *priv;
@@ -379,8 +381,10 @@
 }
 
 static void
-file_get_property (GObject *object, guint param_id, GValue *value,
-    GParamSpec *pspec)
+file_get_property (GObject *object,
+                   guint param_id,
+                   GValue *value,
+                   GParamSpec *pspec)
 {
   EmpathyFilePriv *priv;
   EmpathyFile *file;
@@ -403,8 +407,9 @@
 }
 
 static void
-file_channel_set_dbus_property (gpointer proxy, const gchar *property,
-    const GValue *value)
+file_channel_set_dbus_property (gpointer proxy,
+                                const gchar *property,
+                                const GValue *value)
 {
         DEBUG ("Setting %s property", property);
         tp_cli_dbus_properties_run_set (TP_PROXY (proxy),
@@ -418,8 +423,10 @@
 
 
 static void
-file_set_property (GObject *object, guint param_id, const GValue *value,
-    GParamSpec *pspec)
+file_set_property (GObject *object,
+                   guint param_id,
+                   const GValue *value,
+                   GParamSpec *pspec)
 {
   EmpathyFilePriv *priv;
 
@@ -479,7 +486,8 @@
  * Returns: a new #EmpathyFile
  */
 EmpathyFile *
-empathy_file_new (McAccount *account, TpChannel *channel)
+empathy_file_new (McAccount *account,
+                  TpChannel *channel)
 {
   return g_object_new (EMPATHY_TYPE_FILE,
       "account", account,
@@ -528,7 +536,8 @@
 }
 
 static void
-file_destroy_cb (TpChannel *file_channel, EmpathyFile *file)
+file_destroy_cb (TpChannel *file_channel,
+                 EmpathyFile *file)
 {
   EmpathyFilePriv *priv;
 
@@ -541,7 +550,9 @@
 }
 
 static void
-file_closed_cb (TpChannel *file_channel, EmpathyFile *file, GObject *weak_object)
+file_closed_cb (TpChannel *file_channel,
+                EmpathyFile *file,
+                GObject *weak_object)
 {
   EmpathyFilePriv *priv;
 
@@ -710,8 +721,10 @@
 }
 
 static void
-file_state_changed_cb (DBusGProxy *file_iface, EmpFileTransferState state,
-    EmpFileTransferStateChangeReason reason, EmpathyFile *file)
+file_state_changed_cb (DBusGProxy *file_iface,
+                       EmpFileTransferState state,
+                       EmpFileTransferStateChangeReason reason,
+                       EmpathyFile *file)
 {
   EmpathyFilePriv *priv;
 
@@ -746,7 +759,9 @@
 
 static void
 file_transferred_bytes_changed_cb (TpProxy *proxy,
-    guint64 count, EmpathyFile *file, GObject *weak_object)
+                                   guint64 count,
+                                   EmpathyFile *file, 
+                                   GObject *weak_object)
 {
   EmpathyFilePriv *priv;
 
@@ -891,7 +906,7 @@
 
 void
 empathy_file_set_input_stream (EmpathyFile *file,
-    GInputStream *in_stream)
+                               GInputStream *in_stream)
 {
   EmpathyFilePriv *priv;
 
@@ -916,7 +931,8 @@
 }
 
 void
-empathy_file_set_output_stream (EmpathyFile *file, GOutputStream *out_stream)
+empathy_file_set_output_stream (EmpathyFile *file,
+                                GOutputStream *out_stream)
 {
   EmpathyFilePriv *priv;
 
@@ -940,7 +956,7 @@
 
 void
 empathy_file_set_filename (EmpathyFile *file,
-    const gchar *filename)
+                           const gchar *filename)
 {
   EmpathyFilePriv *priv;
 
@@ -1003,7 +1019,8 @@
 }
 
 static void
-io_error (CopyData *copy, GError *error)
+io_error (CopyData *copy,
+          GError *error)
 {
   g_cancellable_cancel (copy->cancellable);
 
@@ -1024,7 +1041,9 @@
 }
 
 static void
-close_done (GObject *source_object, GAsyncResult *res, gpointer user_data)
+close_done (GObject *source_object,
+            GAsyncResult *res,
+            gpointer user_data)
 {
   CopyData *copy = user_data;
 
@@ -1033,7 +1052,9 @@
 }
 
 static void
-write_done_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
+write_done_cb (GObject *source_object,
+               GAsyncResult *res,
+               gpointer user_data)
 {
   CopyData *copy = user_data;
   gssize count_write;
@@ -1056,7 +1077,9 @@
 }
 
 static void
-read_done_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
+read_done_cb (GObject *source_object,
+              GAsyncResult *res,
+              gpointer user_data)
 {
   CopyData *copy = user_data;
   gssize count_read;
@@ -1129,7 +1152,9 @@
 }
 
 static void
-copy_stream (GInputStream *in, GOutputStream *out, GCancellable *cancellable)
+copy_stream (GInputStream *in,
+             GOutputStream *out,
+             GCancellable *cancellable)
 {
   CopyData *copy;
   gint i;