ui-utils: port to TP coding style

Half of this file was already using the new style.

1 files changed, 90 insertions, 85 deletions

diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 804df37eb..e690f11ab 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2002-2007 Imendio AB
  * Copyright (C) 2007-2010 Collabora Ltd.
@@ -43,112 +42,118 @@
 G_BEGIN_DECLS
 
 #define EMPATHY_RECT_IS_ON_SCREEN(x,y,w,h) ((x) + (w) > 0 && \
-					    (y) + (h) > 0 && \
-					    (x) < gdk_screen_width () && \
-					    (y) < gdk_screen_height ())
+              (y) + (h) > 0 && \
+              (x) < gdk_screen_width () && \
+              (y) < gdk_screen_height ())
 
-typedef void (*EmpathyPixbufAvatarFromIndividualCb) (FolksIndividual *individual,
-		GdkPixbuf *pixbuf,
-		gpointer user_data);
+typedef void (*EmpathyPixbufAvatarFromIndividualCb) (
+    FolksIndividual *individual,
+    GdkPixbuf *pixbuf,
+    gpointer user_data);
 
-void            empathy_gtk_init                        (void);
+void empathy_gtk_init (void);
 
 /* Glade */
-GtkBuilder *    empathy_builder_get_file                (const gchar      *filename,
-							 const gchar      *first_object,
-							 ...);
-void            empathy_builder_connect                 (GtkBuilder       *gui,
-							 gpointer          user_data,
-							 const gchar      *first_object,
-							 ...);
-GtkWidget     *empathy_builder_unref_and_keep_widget    (GtkBuilder       *gui,
-							 GtkWidget        *root);
+GtkBuilder * empathy_builder_get_file (const gchar *filename,
+    const gchar *first_object,
+    ...);
+void empathy_builder_connect (GtkBuilder *gui,
+    gpointer user_data,
+    const gchar *first_object,
+    ...);
+GtkWidget * empathy_builder_unref_and_keep_widget (GtkBuilder *gui,
+    GtkWidget *root);
 
 /* Pixbufs */
-const gchar * empathy_icon_name_for_presence            (TpConnectionPresenceType  presence);
-const gchar * empathy_icon_name_for_contact             (EmpathyContact   *contact);
-const gchar * empathy_icon_name_for_individual          (FolksIndividual  *individual);
-const gchar * empathy_protocol_name_for_contact         (EmpathyContact   *contact);
-GdkPixbuf *   empathy_pixbuf_from_data                  (gchar            *data,
-							 gsize             data_size);
-GdkPixbuf *   empathy_pixbuf_from_data_and_mime         (gchar            *data,
-							 gsize             data_size,
-							 gchar           **mime_type);
-void empathy_pixbuf_avatar_from_individual_scaled_async (FolksIndividual     *individual,
-							 gint                 width,
-							 gint                 height,
-							 GCancellable        *cancellable,
-							 GAsyncReadyCallback  callback,
-							 gpointer             user_data);
+const gchar * empathy_icon_name_for_presence (
+    TpConnectionPresenceType presence);
+const gchar * empathy_icon_name_for_contact (EmpathyContact *contact);
+const gchar * empathy_icon_name_for_individual (FolksIndividual *individual);
+const gchar * empathy_protocol_name_for_contact (EmpathyContact *contact);
+GdkPixbuf * empathy_pixbuf_from_data (gchar *data,
+    gsize data_size);
+GdkPixbuf * empathy_pixbuf_from_data_and_mime (gchar *data,
+    gsize data_size,
+    gchar **mime_type);
+void empathy_pixbuf_avatar_from_individual_scaled_async (
+    FolksIndividual *individual,
+    gint width,
+    gint height,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data);
 GdkPixbuf * empathy_pixbuf_avatar_from_individual_scaled_finish (
-							 FolksIndividual  *individual,
-							 GAsyncResult     *result,
-							 GError          **error);
-GdkPixbuf *   empathy_pixbuf_from_avatar_scaled         (EmpathyAvatar    *avatar,
-							 gint              width,
-							 gint              height);
-GdkPixbuf *   empathy_pixbuf_avatar_from_contact_scaled (EmpathyContact   *contact,
-							 gint              width,
-							 gint              height);
-GdkPixbuf *   empathy_pixbuf_protocol_from_contact_scaled (EmpathyContact   *contact,
-							 gint              width,
-							 gint              height);
-GdkPixbuf *   empathy_pixbuf_contact_status_icon (EmpathyContact   *contact,
-							 gboolean          show_protocol);
-GdkPixbuf *   empathy_pixbuf_contact_status_icon_with_icon_name (EmpathyContact   *contact,
-							 const gchar       *icon_name,
-							 gboolean          show_protocol);
-GdkPixbuf *   empathy_pixbuf_scale_down_if_necessary    (GdkPixbuf        *pixbuf,
-							 gint              max_size);
-GdkPixbuf *   empathy_pixbuf_from_icon_name             (const gchar      *icon_name,
-							 GtkIconSize       icon_size);
-GdkPixbuf *   empathy_pixbuf_from_icon_name_sized       (const gchar      *icon_name,
-							 gint              size);
-gchar *       empathy_filename_from_icon_name           (const gchar      *icon_name,
-							 GtkIconSize       icon_size);
+    FolksIndividual *individual,
+    GAsyncResult *result,
+    GError **error);
+GdkPixbuf * empathy_pixbuf_from_avatar_scaled (EmpathyAvatar *avatar,
+    gint width,
+    gint height);
+GdkPixbuf * empathy_pixbuf_avatar_from_contact_scaled (EmpathyContact *contact,
+    gint width,
+    gint height);
+GdkPixbuf * empathy_pixbuf_protocol_from_contact_scaled (
+    EmpathyContact *contact,
+    gint width,
+    gint height);
+GdkPixbuf * empathy_pixbuf_contact_status_icon (EmpathyContact *contact,
+    gboolean show_protocol);
+GdkPixbuf * empathy_pixbuf_contact_status_icon_with_icon_name (
+    EmpathyContact *contact,
+    const gchar *icon_name,
+    gboolean show_protocol);
+GdkPixbuf * empathy_pixbuf_scale_down_if_necessary (GdkPixbuf *pixbuf,
+    gint max_size);
+GdkPixbuf * empathy_pixbuf_from_icon_name (const gchar *icon_name,
+    GtkIconSize icon_size);
+GdkPixbuf * empathy_pixbuf_from_icon_name_sized (const gchar *icon_name,
+    gint size);
+gchar * empathy_filename_from_icon_name (const gchar *icon_name,
+    GtkIconSize icon_size);
 
 /* Text view */
-gboolean    empathy_text_iter_forward_search            (const GtkTextIter*iter,
-							 const gchar      *str,
-							 GtkTextIter      *match_start,
-							 GtkTextIter      *match_end,
-							 const GtkTextIter*limit);
-gboolean    empathy_text_iter_backward_search           (const GtkTextIter*iter,
-							 const gchar      *str,
-							 GtkTextIter      *match_start,
-							 GtkTextIter      *match_end,
-							 const GtkTextIter*limit);
+gboolean empathy_text_iter_forward_search (const GtkTextIter*iter,
+    const gchar *str,
+    GtkTextIter *match_start,
+    GtkTextIter *match_end,
+    const GtkTextIter*limit);
+gboolean empathy_text_iter_backward_search (const GtkTextIter*iter,
+    const gchar *str,
+    GtkTextIter *match_start,
+    GtkTextIter *match_end,
+    const GtkTextIter *limit);
+
 /* Windows */
-void        empathy_window_present                      (GtkWindow *window);
-void        empathy_window_present_with_time            (GtkWindow        *window,
-							 guint32 timestamp);
-GtkWindow * empathy_get_toplevel_window                 (GtkWidget        *widget);
+void empathy_window_present (GtkWindow *window);
+void empathy_window_present_with_time (GtkWindow *window,
+    guint32 timestamp);
+GtkWindow * empathy_get_toplevel_window (GtkWidget *widget);
 
 void empathy_move_to_window_desktop (GtkWindow *window,
     guint32 timestamp);
 
 /* URL */
-gchar *     empathy_make_absolute_url                   (const gchar      *url);
+gchar * empathy_make_absolute_url (const gchar *url);
 
-gchar *     empathy_make_absolute_url_len               (const gchar      *url,
-							 guint             len);
-void        empathy_url_show                            (GtkWidget        *parent,
-							 const char       *url);
+gchar * empathy_make_absolute_url_len (const gchar *url,
+    guint len);
+void empathy_url_show (GtkWidget *parent,
+    const char *url);
 
 /* File transfer */
-void        empathy_send_file                           (EmpathyContact   *contact,
-							 GFile            *file);
-void        empathy_send_file_from_uri_list             (EmpathyContact   *contact,
-							 const gchar      *uri_list);
-void        empathy_send_file_with_file_chooser         (EmpathyContact   *contact);
-void        empathy_receive_file_with_file_chooser      (EmpathyFTHandler *handler);
+void empathy_send_file (EmpathyContact *contact,
+    GFile *file);
+void empathy_send_file_from_uri_list (EmpathyContact *contact,
+    const gchar *uri_list);
+void empathy_send_file_with_file_chooser (EmpathyContact *contact);
+void empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler);
 
 /* Misc */
-void        empathy_make_color_whiter                   (GdkRGBA *color);
+void  empathy_make_color_whiter (GdkRGBA *color);
 
-GtkWidget * empathy_context_menu_new                    (GtkWidget *attach_to);
+GtkWidget * empathy_context_menu_new (GtkWidget *attach_to);
 
-gint64      empathy_get_current_action_time             (void);
+gint64 empathy_get_current_action_time (void);
 
 gboolean empathy_individual_match_string (
     FolksIndividual *individual,