ui-utils: port to TP coding style

Half of this file was already using the new style.

2 files changed, 1646 insertions, 1584 deletions

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 507f92336..798817ef1 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -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.
@@ -55,921 +54,957 @@
 void
 empathy_gtk_init (void)
 {
-	static gboolean initialized = FALSE;
+  static gboolean initialized = FALSE;
 
-	if (initialized)
-		return;
+  if (initialized)
+    return;
 
-	empathy_init ();
-	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-					   PKGDATADIR G_DIR_SEPARATOR_S "icons");
+  empathy_init ();
 
-	/* Add icons from source dir if available */
-	if (g_getenv ("EMPATHY_SRCDIR") != NULL) {
-		gchar *path;
+  gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+      PKGDATADIR G_DIR_SEPARATOR_S "icons");
 
-		path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "data",
-				"icons", "local-copy", NULL);
-		if (g_file_test (path, G_FILE_TEST_EXISTS)) {
-			gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), path);
-		}
+  /* Add icons from source dir if available */
+  if (g_getenv ("EMPATHY_SRCDIR") != NULL)
+    {
+      gchar *path;
+
+      path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "data",
+          "icons", "local-copy", NULL);
+
+      if (g_file_test (path, G_FILE_TEST_EXISTS))
+        gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), path);
 
-		g_free (path);
-	}
+      g_free (path);
+    }
 
-	initialized = TRUE;
+  initialized = TRUE;
 }
 
 static GtkBuilder *
 builder_get_file_valist (const gchar *filename,
-			 const gchar *first_object,
-			 va_list      args)
+    const gchar *first_object,
+    va_list args)
 {
-	GtkBuilder  *gui;
-	const gchar *name;
-	GObject    **object_ptr;
-	GError      *error = NULL;
+  GtkBuilder *gui;
+  const gchar *name;
+  GObject **object_ptr;
+  GError *error = NULL;
 
-	DEBUG ("Loading file %s", filename);
+  DEBUG ("Loading file %s", filename);
 
-	gui = gtk_builder_new ();
-	gtk_builder_set_translation_domain (gui, GETTEXT_PACKAGE);
-	if (!gtk_builder_add_from_file (gui, filename, &error)) {
-		g_critical ("GtkBuilder Error (%s): %s",
-				filename, error->message);
-		g_clear_error (&error);
-		g_object_unref (gui);
+  gui = gtk_builder_new ();
+  gtk_builder_set_translation_domain (gui, GETTEXT_PACKAGE);
 
-		/* we need to iterate and set all of the pointers to NULL */
-		for (name = first_object; name;
-		     name = va_arg (args, const gchar *)) {
-			object_ptr = va_arg (args, GObject**);
+  if (!gtk_builder_add_from_file (gui, filename, &error))
+    {
+      g_critical ("GtkBuilder Error (%s): %s",
+          filename, error->message);
+
+      g_clear_error (&error);
+      g_object_unref (gui);
 
-			*object_ptr = NULL;
-		}
+      /* we need to iterate and set all of the pointers to NULL */
+      for (name = first_object; name; name = va_arg (args, const gchar *))
+        {
+          object_ptr = va_arg (args, GObject**);
+
+          *object_ptr = NULL;
+        }
 
-		return NULL;
-	}
+      return NULL;
+    }
 
-	for (name = first_object; name; name = va_arg (args, const gchar *)) {
-		object_ptr = va_arg (args, GObject**);
+  for (name = first_object; name; name = va_arg (args, const gchar *))
+    {
+      object_ptr = va_arg (args, GObject**);
 
-		*object_ptr = gtk_builder_get_object (gui, name);
+      *object_ptr = gtk_builder_get_object (gui, name);
 
-		if (!*object_ptr) {
-			g_warning ("File is missing object '%s'.", name);
-			continue;
-		}
-	}
+      if (!*object_ptr)
+        {
+          g_warning ("File is missing object '%s'.", name);
+          continue;
+        }
+    }
 
-	return gui;
+  return gui;
 }
 
 GtkBuilder *
 empathy_builder_get_file (const gchar *filename,
-			  const gchar *first_object,
-			  ...)
+    const gchar *first_object,
+    ...)
 {
-	GtkBuilder *gui;
-	va_list     args;
+  GtkBuilder *gui;
+  va_list args;
 
-	va_start (args, first_object);
-	gui = builder_get_file_valist (filename, first_object, args);
-	va_end (args);
+  va_start (args, first_object);
+  gui = builder_get_file_valist (filename, first_object, args);
+  va_end (args);
 
-	return gui;
+  return gui;
 }
 
 void
-empathy_builder_connect (GtkBuilder  *gui,
-			 gpointer     user_data,
-			 const gchar *first_object,
-			 ...)
-{
-	va_list      args;
-	const gchar *name;
-	const gchar *sig;
-	GObject     *object;
-	GCallback    callback;
-
-	va_start (args, first_object);
-	for (name = first_object; name; name = va_arg (args, const gchar *)) {
-		sig = va_arg (args, const gchar *);
-		callback = va_arg (args, GCallback);
+empathy_builder_connect (GtkBuilder *gui,
+    gpointer user_data,
+    const gchar *first_object,
+    ...)
+{
+  va_list args;
+  const gchar *name;
+  const gchar *sig;
+  GObject *object;
+  GCallback callback;
+
+  va_start (args, first_object);
+  for (name = first_object; name; name = va_arg (args, const gchar *))
+    {
+      sig = va_arg (args, const gchar *);
+      callback = va_arg (args, GCallback);
 
-		object = gtk_builder_get_object (gui, name);
-		if (!object) {
-			g_warning ("File is missing object '%s'.", name);
-			continue;
-		}
+      object = gtk_builder_get_object (gui, name);
+      if (!object)
+        {
+          g_warning ("File is missing object '%s'.", name);
+          continue;
+        }
 
-		g_signal_connect (object, sig, callback, user_data);
-	}
+      g_signal_connect (object, sig, callback, user_data);
+    }
 
-	va_end (args);
+  va_end (args);
 }
 
 GtkWidget *
 empathy_builder_unref_and_keep_widget (GtkBuilder *gui,
-				       GtkWidget  *widget)
+    GtkWidget *widget)
 {
-	/* On construction gui sinks the initial reference to widget. When gui
-	 * is finalized it will drop its ref to widget. We take our own ref to
-	 * prevent widget being finalised. The widget is forced to have a
-	 * floating reference, like when it was initially unowned so that it can
-	 * be used like any other GtkWidget. */
+  /* On construction gui sinks the initial reference to widget. When gui
+   * is finalized it will drop its ref to widget. We take our own ref to
+   * prevent widget being finalised. The widget is forced to have a
+   * floating reference, like when it was initially unowned so that it can
+   * be used like any other GtkWidget. */
 
-	g_object_ref (widget);
-	g_object_force_floating (G_OBJECT (widget));
-	g_object_unref (gui);
+  g_object_ref (widget);
+  g_object_force_floating (G_OBJECT (widget));
+  g_object_unref (gui);
 
-	return widget;
+  return widget;
 }
 
 const gchar *
 empathy_icon_name_for_presence (TpConnectionPresenceType presence)
 {
-	switch (presence) {
-	case TP_CONNECTION_PRESENCE_TYPE_AVAILABLE:
-		return EMPATHY_IMAGE_AVAILABLE;
-	case TP_CONNECTION_PRESENCE_TYPE_BUSY:
-		return EMPATHY_IMAGE_BUSY;
-	case TP_CONNECTION_PRESENCE_TYPE_AWAY:
-		return EMPATHY_IMAGE_AWAY;
-	case TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY:
-		if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (),
-					     EMPATHY_IMAGE_EXT_AWAY))
-			return EMPATHY_IMAGE_EXT_AWAY;
-
-		/* The 'extended-away' icon is not an official one so we fallback to idle if
-		 * it's not implemented */
-		return EMPATHY_IMAGE_IDLE;
-	case TP_CONNECTION_PRESENCE_TYPE_HIDDEN:
-		if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (),
-					     EMPATHY_IMAGE_HIDDEN))
-			return EMPATHY_IMAGE_HIDDEN;
-
-		/* The 'hidden' icon is not an official one so we fallback to offline if
-		 * it's not implemented */
-		return EMPATHY_IMAGE_OFFLINE;
-	case TP_CONNECTION_PRESENCE_TYPE_OFFLINE:
-	case TP_CONNECTION_PRESENCE_TYPE_ERROR:
-		return EMPATHY_IMAGE_OFFLINE;
-	case TP_CONNECTION_PRESENCE_TYPE_UNKNOWN:
-		return EMPATHY_IMAGE_PENDING;
-	case TP_CONNECTION_PRESENCE_TYPE_UNSET:
-	default:
-		return NULL;
-	}
-
-	return NULL;
+  switch (presence)
+    {
+      case TP_CONNECTION_PRESENCE_TYPE_AVAILABLE:
+        return EMPATHY_IMAGE_AVAILABLE;
+      case TP_CONNECTION_PRESENCE_TYPE_BUSY:
+        return EMPATHY_IMAGE_BUSY;
+      case TP_CONNECTION_PRESENCE_TYPE_AWAY:
+        return EMPATHY_IMAGE_AWAY;
+      case TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY:
+        if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (),
+                   EMPATHY_IMAGE_EXT_AWAY))
+          return EMPATHY_IMAGE_EXT_AWAY;
+
+        /* The 'extended-away' icon is not an official one so we fallback to
+         * idle if it's not implemented */
+        return EMPATHY_IMAGE_IDLE;
+      case TP_CONNECTION_PRESENCE_TYPE_HIDDEN:
+        if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (),
+                   EMPATHY_IMAGE_HIDDEN))
+          return EMPATHY_IMAGE_HIDDEN;
+
+        /* The 'hidden' icon is not an official one so we fallback to offline if
+         * it's not implemented */
+        return EMPATHY_IMAGE_OFFLINE;
+      case TP_CONNECTION_PRESENCE_TYPE_OFFLINE:
+      case TP_CONNECTION_PRESENCE_TYPE_ERROR:
+        return EMPATHY_IMAGE_OFFLINE;
+      case TP_CONNECTION_PRESENCE_TYPE_UNKNOWN:
+        return EMPATHY_IMAGE_PENDING;
+      case TP_CONNECTION_PRESENCE_TYPE_UNSET:
+      default:
+        return NULL;
+    }
+
+  return NULL;
 }
 
 const gchar *
 empathy_icon_name_for_contact (EmpathyContact *contact)
 {
-	TpConnectionPresenceType presence;
+  TpConnectionPresenceType presence;
 
-	g_return_val_if_fail (EMPATHY_IS_CONTACT (contact),
-			      EMPATHY_IMAGE_OFFLINE);
+  g_return_val_if_fail (EMPATHY_IS_CONTACT (contact),
+      EMPATHY_IMAGE_OFFLINE);
 
-	presence = empathy_contact_get_presence (contact);
-	return empathy_icon_name_for_presence (presence);
+  presence = empathy_contact_get_presence (contact);
+  return empathy_icon_name_for_presence (presence);
 }
 
 const gchar *
 empathy_icon_name_for_individual (FolksIndividual *individual)
 {
-	FolksPresenceType folks_presence;
-	TpConnectionPresenceType presence;
+  FolksPresenceType folks_presence;
+  TpConnectionPresenceType presence;
 
-	folks_presence =
-	    folks_presence_details_get_presence_type (
-	        FOLKS_PRESENCE_DETAILS (individual));
-	presence = empathy_folks_presence_type_to_tp (folks_presence);
+  folks_presence = folks_presence_details_get_presence_type (
+      FOLKS_PRESENCE_DETAILS (individual));
+  presence = empathy_folks_presence_type_to_tp (folks_presence);
 
-	return empathy_icon_name_for_presence (presence);
+  return empathy_icon_name_for_presence (presence);
 }
 
 const gchar *
-empathy_protocol_name_for_contact (EmpathyContact   *contact)
+empathy_protocol_name_for_contact (EmpathyContact *contact)
 {
-	TpAccount     *account;
+  TpAccount *account;
 
-	g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+  g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
-	account = empathy_contact_get_account (contact);
-	if (account == NULL) {
-		return NULL;
-	}
+  account = empathy_contact_get_account (contact);
+  if (account == NULL)
+    return NULL;
 
-	return tp_account_get_icon_name (account);
+  return tp_account_get_icon_name (account);
 }
 
 GdkPixbuf *
 empathy_pixbuf_from_data (gchar *data,
-			  gsize  data_size)
+    gsize data_size)
 {
-	return empathy_pixbuf_from_data_and_mime (data, data_size, NULL);
+  return empathy_pixbuf_from_data_and_mime (data, data_size, NULL);
 }
 
 GdkPixbuf *
-empathy_pixbuf_from_data_and_mime (gchar  *data,
-				   gsize   data_size,
-				   gchar **mime_type)
-{
-	GdkPixbufLoader *loader;
-	GdkPixbufFormat *format;
-	GdkPixbuf       *pixbuf = NULL;
-	gchar          **mime_types;
-	GError          *error = NULL;
-
-	if (!data) {
-		return NULL;
-	}
-
-	loader = gdk_pixbuf_loader_new ();
-	if (!gdk_pixbuf_loader_write (loader, (guchar *) data, data_size, &error)) {
-		DEBUG ("Failed to write to pixbuf loader: %s",
-			error ? error->message : "No error given");
-		goto out;
-	}
-	if (!gdk_pixbuf_loader_close (loader, &error)) {
-		DEBUG ("Failed to close pixbuf loader: %s",
-			error ? error->message : "No error given");
-		goto out;
-	}
-
-	pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-	if (pixbuf) {
-		g_object_ref (pixbuf);
-
-		if (mime_type != NULL) {
-			format = gdk_pixbuf_loader_get_format (loader);
-			mime_types = gdk_pixbuf_format_get_mime_types (format);
-
-			*mime_type = g_strdup (*mime_types);
-			if (mime_types[1] != NULL) {
-				DEBUG ("Loader supports more than one mime "
-					"type! Picking the first one, %s",
-					*mime_type);
-			}
-			g_strfreev (mime_types);
-		}
-	}
+empathy_pixbuf_from_data_and_mime (gchar *data,
+           gsize data_size,
+           gchar **mime_type)
+{
+  GdkPixbufLoader *loader;
+  GdkPixbufFormat *format;
+  GdkPixbuf *pixbuf = NULL;
+  gchar **mime_types;
+  GError *error = NULL;
+
+  if (!data)
+    return NULL;
+
+  loader = gdk_pixbuf_loader_new ();
+  if (!gdk_pixbuf_loader_write (loader, (guchar *) data, data_size, &error))
+    {
+      DEBUG ("Failed to write to pixbuf loader: %s",
+        error ? error->message : "No error given");
+      goto out;
+    }
+
+  if (!gdk_pixbuf_loader_close (loader, &error))
+    {
+      DEBUG ("Failed to close pixbuf loader: %s",
+        error ? error->message : "No error given");
+      goto out;
+    }
+
+  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+  if (pixbuf)
+    {
+      g_object_ref (pixbuf);
+
+      if (mime_type != NULL)
+        {
+          format = gdk_pixbuf_loader_get_format (loader);
+          mime_types = gdk_pixbuf_format_get_mime_types (format);
+
+          *mime_type = g_strdup (*mime_types);
+          if (mime_types[1] != NULL)
+            DEBUG ("Loader supports more than one mime "
+              "type! Picking the first one, %s",
+              *mime_type);
+
+          g_strfreev (mime_types);
+        }
+    }
 
 out:
-	g_clear_error (&error);
-	g_object_unref (loader);
+  g_clear_error (&error);
+  g_object_unref (loader);
 
-	return pixbuf;
+  return pixbuf;
 }
 
-struct SizeData {
-	gint     width;
-	gint     height;
-	gboolean preserve_aspect_ratio;
+struct SizeData
+{
+  gint width;
+  gint height;
+  gboolean preserve_aspect_ratio;
 };
 
 static void
 pixbuf_from_avatar_size_prepared_cb (GdkPixbufLoader *loader,
-				     int              width,
-				     int              height,
-				     struct SizeData *data)
-{
-	g_return_if_fail (width > 0 && height > 0);
-
-	if (data->preserve_aspect_ratio && (data->width > 0 || data->height > 0)) {
-		if (width < data->width && height < data->height) {
-			width = width;
-			height = height;
-		}
-
-		if (data->width < 0) {
-			width = width * (double) data->height / (gdouble) height;
-			height = data->height;
-		} else if (data->height < 0) {
-			height = height * (double) data->width / (double) width;
-			width = data->width;
-		} else if ((double) height * (double) data->width >
-			   (double) width * (double) data->height) {
-			width = 0.5 + (double) width * (double) data->height / (double) height;
-			height = data->height;
-		} else {
-			height = 0.5 + (double) height * (double) data->width / (double) width;
-			width = data->width;
-		}
-	} else {
-		if (data->width > 0) {
-			width = data->width;
-		}
-
-		if (data->height > 0) {
-			height = data->height;
-		}
-	}
-
-	gdk_pixbuf_loader_set_size (loader, width, height);
+    int width,
+    int height,
+    struct SizeData *data)
+{
+  g_return_if_fail (width > 0 && height > 0);
+
+  if (data->preserve_aspect_ratio && (data->width > 0 || data->height > 0))
+    {
+      if (width < data->width && height < data->height)
+        {
+          width = width;
+          height = height;
+        }
+
+      if (data->width < 0)
+        {
+          width = width * (double) data->height / (gdouble) height;
+          height = data->height;
+        }
+      else if (data->height < 0)
+        {
+          height = height * (double) data->width / (double) width;
+          width = data->width;
+        }
+      else if ((double) height * (double) data->width >
+           (double) width * (double) data->height)
+        {
+          width = 0.5 + (double) width * (double) data->height / (double) height;
+          height = data->height;
+        }
+      else
+        {
+          height = 0.5 + (double) height * (double) data->width / (double) width;
+          width = data->width;
+        }
+    }
+  else
+    {
+      if (data->width > 0)
+        width = data->width;
+
+      if (data->height > 0)
+        height = data->height;
+    }
+
+  gdk_pixbuf_loader_set_size (loader, width, height);
 }
 
 static void
 empathy_avatar_pixbuf_roundify (GdkPixbuf *pixbuf)
 {
-	gint width, height, rowstride;
-	guchar *pixels;
-
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
-	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-	pixels = gdk_pixbuf_get_pixels (pixbuf);
-
-	if (width < 6 || height < 6) {
-		return;
-	}
-
-	/* Top left */
-	pixels[3] = 0;
-	pixels[7] = 0x80;
-	pixels[11] = 0xC0;
-	pixels[rowstride + 3] = 0x80;
-	pixels[rowstride * 2 + 3] = 0xC0;
-
-	/* Top right */
-	pixels[width * 4 - 1] = 0;
-	pixels[width * 4 - 5] = 0x80;
-	pixels[width * 4 - 9] = 0xC0;
-	pixels[rowstride + (width * 4) - 1] = 0x80;
-	pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
-
-	/* Bottom left */
-	pixels[(height - 1) * rowstride + 3] = 0;
-	pixels[(height - 1) * rowstride + 7] = 0x80;
-	pixels[(height - 1) * rowstride + 11] = 0xC0;
-	pixels[(height - 2) * rowstride + 3] = 0x80;
-	pixels[(height - 3) * rowstride + 3] = 0xC0;
-
-	/* Bottom right */
-	pixels[height * rowstride - 1] = 0;
-	pixels[(height - 1) * rowstride - 1] = 0x80;
-	pixels[(height - 2) * rowstride - 1] = 0xC0;
-	pixels[height * rowstride - 5] = 0x80;
-	pixels[height * rowstride - 9] = 0xC0;
+  gint width, height, rowstride;
+  guchar *pixels;
+
+  width = gdk_pixbuf_get_width (pixbuf);
+  height = gdk_pixbuf_get_height (pixbuf);
+  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+  pixels = gdk_pixbuf_get_pixels (pixbuf);
+
+  if (width < 6 || height < 6)
+    return;
+
+  /* Top left */
+  pixels[3] = 0;
+  pixels[7] = 0x80;
+  pixels[11] = 0xC0;
+  pixels[rowstride + 3] = 0x80;
+  pixels[rowstride * 2 + 3] = 0xC0;
+
+  /* Top right */
+  pixels[width * 4 - 1] = 0;
+  pixels[width * 4 - 5] = 0x80;
+  pixels[width * 4 - 9] = 0xC0;
+  pixels[rowstride + (width * 4) - 1] = 0x80;
+  pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
+
+  /* Bottom left */
+  pixels[(height - 1) * rowstride + 3] = 0;
+  pixels[(height - 1) * rowstride + 7] = 0x80;
+  pixels[(height - 1) * rowstride + 11] = 0xC0;
+  pixels[(height - 2) * rowstride + 3] = 0x80;
+  pixels[(height - 3) * rowstride + 3] = 0xC0;
+
+  /* Bottom right */
+  pixels[height * rowstride - 1] = 0;
+  pixels[(height - 1) * rowstride - 1] = 0x80;
+  pixels[(height - 2) * rowstride - 1] = 0xC0;
+  pixels[height * rowstride - 5] = 0x80;
+  pixels[height * rowstride - 9] = 0xC0;
 }
 
 static gboolean
 empathy_gdk_pixbuf_is_opaque (GdkPixbuf *pixbuf)
 {
-	gint height, rowstride, i;
-	guchar *pixels;
-	guchar *row;
+  gint height, rowstride, i;
+  guchar *pixels;
+  guchar *row;
 
-	height = gdk_pixbuf_get_height (pixbuf);
-	rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-	pixels = gdk_pixbuf_get_pixels (pixbuf);
+  height = gdk_pixbuf_get_height (pixbuf);
+  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+  pixels = gdk_pixbuf_get_pixels (pixbuf);
 
-	row = pixels;
-	for (i = 3; i < rowstride; i+=4) {
-		if (row[i] < 0xfe) {
-			return FALSE;
-		}
-	}
+  row = pixels;
+  for (i = 3; i < rowstride; i+=4)
+    if (row[i] < 0xfe)
+      return FALSE;
 
-	for (i = 1; i < height - 1; i++) {
-		row = pixels + (i*rowstride);
-		if (row[3] < 0xfe || row[rowstride-1] < 0xfe) {
-			return FALSE;
-		}
-	}
+  for (i = 1; i < height - 1; i++)
+    {
+      row = pixels + (i*rowstride);
+      if (row[3] < 0xfe || row[rowstride-1] < 0xfe)
+        return FALSE;
+    }
 
-	row = pixels + ((height-1) * rowstride);
-	for (i = 3; i < rowstride; i+=4) {
-		if (row[i] < 0xfe) {
-			return FALSE;
-		}
-	}
+  row = pixels + ((height-1) * rowstride);
+  for (i = 3; i < rowstride; i+=4)
+    if (row[i] < 0xfe)
+      return FALSE;
 
-	return TRUE;
+  return TRUE;
 }
 
 static GdkPixbuf *
 avatar_pixbuf_from_loader (GdkPixbufLoader *loader)
 {
-	GdkPixbuf *pixbuf;
+  GdkPixbuf *pixbuf;
+
+  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
 
-	pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-	if (!gdk_pixbuf_get_has_alpha (pixbuf)) {
-		GdkPixbuf *rounded_pixbuf;
+  if (!gdk_pixbuf_get_has_alpha (pixbuf))
+    {
+      GdkPixbuf *rounded_pixbuf;
 
-		rounded_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
-						 gdk_pixbuf_get_width (pixbuf),
-						 gdk_pixbuf_get_height (pixbuf));
-		gdk_pixbuf_copy_area (pixbuf, 0, 0,
-				      gdk_pixbuf_get_width (pixbuf),
-				      gdk_pixbuf_get_height (pixbuf),
-				      rounded_pixbuf,
-				      0, 0);
-		pixbuf = rounded_pixbuf;
-	} else {
-		g_object_ref (pixbuf);
-	}
+      rounded_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+          gdk_pixbuf_get_width (pixbuf),
+          gdk_pixbuf_get_height (pixbuf));
 
-	if (empathy_gdk_pixbuf_is_opaque (pixbuf)) {
-		empathy_avatar_pixbuf_roundify (pixbuf);
-	}
+      gdk_pixbuf_copy_area (pixbuf, 0, 0,
+          gdk_pixbuf_get_width (pixbuf),
+          gdk_pixbuf_get_height (pixbuf),
+          rounded_pixbuf,
+          0, 0);
+
+      pixbuf = rounded_pixbuf;
+    }
+  else
+    {
+      g_object_ref (pixbuf);
+    }
 
-	return pixbuf;
+  if (empathy_gdk_pixbuf_is_opaque (pixbuf))
+    empathy_avatar_pixbuf_roundify (pixbuf);
+
+  return pixbuf;
 }
 
 GdkPixbuf *
 empathy_pixbuf_from_avatar_scaled (EmpathyAvatar *avatar,
-				  gint          width,
-				  gint          height)
+    gint width,
+    gint height)
 {
-	GdkPixbuf        *pixbuf;
-	GdkPixbufLoader	 *loader;
-	struct SizeData   data;
-	GError           *error = NULL;
+  GdkPixbuf *pixbuf;
+  GdkPixbufLoader *loader;
+  struct SizeData data;
+  GError *error = NULL;
+
+  if (!avatar)
+    return NULL;
 
-	if (!avatar) {
-		return NULL;
-	}
+  data.width = width;
+  data.height = height;
+  data.preserve_aspect_ratio = TRUE;
 
-	data.width = width;
-	data.height = height;
-	data.preserve_aspect_ratio = TRUE;
+  loader = gdk_pixbuf_loader_new ();
 
-	loader = gdk_pixbuf_loader_new ();
+  g_signal_connect (loader, "size-prepared",
+      G_CALLBACK (pixbuf_from_avatar_size_prepared_cb), &data);
 
-	g_signal_connect (loader, "size-prepared",
-			  G_CALLBACK (pixbuf_from_avatar_size_prepared_cb),
-			  &data);
+  if (avatar->len == 0)
+    {
+      g_warning ("Avatar has 0 length");
+      return NULL;
+    }
+  else if (!gdk_pixbuf_loader_write (loader, avatar->data, avatar->len, &error))
+    {
+      g_warning ("Couldn't write avatar image:%p with "
+          "length:%" G_GSIZE_FORMAT " to pixbuf loader: %s",
+          avatar->data, avatar->len, error->message);
 
-	if (avatar->len == 0) {
-		g_warning ("Avatar has 0 length");
-		return NULL;
-	} else if (!gdk_pixbuf_loader_write (loader, avatar->data, avatar->len, &error)) {
-		g_warning ("Couldn't write avatar image:%p with "
-			   "length:%" G_GSIZE_FORMAT " to pixbuf loader: %s",
-			   avatar->data, avatar->len, error->message);
-		g_error_free (error);
-		return NULL;
-	}
+      g_error_free (error);
+      return NULL;
+    }
 
-	gdk_pixbuf_loader_close (loader, NULL);
-	pixbuf = avatar_pixbuf_from_loader (loader);
+  gdk_pixbuf_loader_close (loader, NULL);
+  pixbuf = avatar_pixbuf_from_loader (loader);
 
-	g_object_unref (loader);
+  g_object_unref (loader);
 
-	return pixbuf;
+  return pixbuf;
 }
 
 GdkPixbuf *
 empathy_pixbuf_avatar_from_contact_scaled (EmpathyContact *contact,
-					  gint           width,
-					  gint           height)
+    gint width,
+    gint height)
 {
-	EmpathyAvatar *avatar;
+  EmpathyAvatar *avatar;
 
-	g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+  g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
-	avatar = empathy_contact_get_avatar (contact);
+  avatar = empathy_contact_get_avatar (contact);
 
-	return empathy_pixbuf_from_avatar_scaled (avatar, width, height);
+  return empathy_pixbuf_from_avatar_scaled (avatar, width, height);
 }
 
-typedef struct {
-	FolksIndividual *individual;
-	GSimpleAsyncResult *result;
-	guint width;
-	guint height;
-	struct SizeData size_data;
-	GdkPixbufLoader *loader;
-	GCancellable *cancellable;
-	guint8 data[512];
+typedef struct
+{
+  FolksIndividual *individual;
+  GSimpleAsyncResult *result;
+  guint width;
+  guint height;
+  struct SizeData size_data;
+  GdkPixbufLoader *loader;
+  GCancellable *cancellable;
+  guint8 data[512];
 } PixbufAvatarFromIndividualClosure;
 
 static PixbufAvatarFromIndividualClosure *
-pixbuf_avatar_from_individual_closure_new (FolksIndividual    *individual,
-					   GSimpleAsyncResult *result,
-					   gint                width,
-					   gint                height,
-					   GCancellable       *cancellable)
+pixbuf_avatar_from_individual_closure_new (FolksIndividual *individual,
+    GSimpleAsyncResult *result,
+    gint width,
+    gint height,
+    GCancellable *cancellable)
 {
-	PixbufAvatarFromIndividualClosure *closure;
+  PixbufAvatarFromIndividualClosure *closure;
+
+  g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
+  g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL);
 
-	g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
-	g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL);
+  closure = g_new0 (PixbufAvatarFromIndividualClosure, 1);
+  closure->individual = g_object_ref (individual);
+  closure->result = g_object_ref (result);
+  closure->width = width;
+  closure->height = height;
 
-	closure = g_new0 (PixbufAvatarFromIndividualClosure, 1);
-	closure->individual = g_object_ref (individual);
-	closure->result = g_object_ref (result);
-	closure->width = width;
-	closure->height = height;
-	if (cancellable != NULL)
-		closure->cancellable = g_object_ref (cancellable);
+  if (cancellable != NULL)
+    closure->cancellable = g_object_ref (cancellable);
 
-	return closure;
+  return closure;
 }
 
 static void
 pixbuf_avatar_from_individual_closure_free (
-		PixbufAvatarFromIndividualClosure *closure)
+    PixbufAvatarFromIndividualClosure *closure)
 {
-	g_clear_object (&closure->cancellable);
-	tp_clear_object (&closure->loader);
-	g_object_unref (closure->individual);
-	g_object_unref (closure->result);
-	g_free (closure);
+  g_clear_object (&closure->cancellable);
+  tp_clear_object (&closure->loader);
+  g_object_unref (closure->individual);
+  g_object_unref (closure->result);
+  g_free (closure);
 }
 
 static void
-avatar_icon_load_close_cb (GObject      *object,
-                           GAsyncResult *result,
-                           gpointer      user_data)
+avatar_icon_load_close_cb (GObject *object,
+    GAsyncResult *result,
+    gpointer user_data)
 {
-	GError *error = NULL;
+  GError *error = NULL;
 
-	g_input_stream_close_finish (G_INPUT_STREAM (object), result, &error);
+  g_input_stream_close_finish (G_INPUT_STREAM (object), result, &error);
 
-	if (error != NULL) {
-		DEBUG ("Failed to close pixbuf stream: %s", error->message);
-		g_error_free (error);
-	}
+  if (error != NULL)
+    {
+      DEBUG ("Failed to close pixbuf stream: %s", error->message);
+      g_error_free (error);
+    }
 }
 
 static void
-avatar_icon_load_read_cb (GObject      *object,
-                          GAsyncResult *result,
-                          gpointer      user_data)
-{
-	GInputStream *stream = G_INPUT_STREAM (object);
-	PixbufAvatarFromIndividualClosure *closure = user_data;
-	gssize n_read;
-	GError *error = NULL;
-
-	/* Finish reading this chunk from the stream */
-	n_read = g_input_stream_read_finish (stream, result, &error);
-	if (error != NULL) {
-		DEBUG ("Failed to finish read from pixbuf stream: %s",
-			error->message);
-		g_simple_async_result_set_from_error (closure->result, error);
-		goto out_close;
-	}
-
-	/* Write the chunk to the pixbuf loader */
-	if (!gdk_pixbuf_loader_write (closure->loader, (guchar *) closure->data,
-			n_read, &error)) {
-		DEBUG ("Failed to write to pixbuf loader: %s",
-			error ? error->message : "No error given");
-		g_simple_async_result_set_from_error (closure->result, error);
-		goto out_close;
-	}
-
-	if (n_read == 0) {
-		/* EOF? */
-		if (!gdk_pixbuf_loader_close (closure->loader, &error)) {
-			DEBUG ("Failed to close pixbuf loader: %s",
-				error ? error->message : "No error given");
-			g_simple_async_result_set_from_error (closure->result, error);
-			goto out;
-		}
-
-		/* We're done. */
-		g_simple_async_result_set_op_res_gpointer (closure->result,
-			avatar_pixbuf_from_loader (closure->loader),
-			g_object_unref);
-
-		goto out;
-	} else {
-		/* Loop round and read another chunk. */
-		g_input_stream_read_async (stream, closure->data,
-			G_N_ELEMENTS (closure->data),
-			G_PRIORITY_DEFAULT, closure->cancellable,
-			avatar_icon_load_read_cb, closure);
-
-		return;
-	}
+avatar_icon_load_read_cb (GObject *object,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GInputStream *stream = G_INPUT_STREAM (object);
+  PixbufAvatarFromIndividualClosure *closure = user_data;
+  gssize n_read;
+  GError *error = NULL;
+
+  /* Finish reading this chunk from the stream */
+  n_read = g_input_stream_read_finish (stream, result, &error);
+  if (error != NULL)
+    {
+      DEBUG ("Failed to finish read from pixbuf stream: %s",
+        error->message);
+
+      g_simple_async_result_set_from_error (closure->result, error);
+      goto out_close;
+    }
+
+  /* Write the chunk to the pixbuf loader */
+  if (!gdk_pixbuf_loader_write (closure->loader, (guchar *) closure->data,
+      n_read, &error))
+    {
+      DEBUG ("Failed to write to pixbuf loader: %s",
+        error ? error->message : "No error given");
+
+      g_simple_async_result_set_from_error (closure->result, error);
+      goto out_close;
+    }
+
+  if (n_read == 0)
+    {
+      /* EOF? */
+      if (!gdk_pixbuf_loader_close (closure->loader, &error))
+        {
+          DEBUG ("Failed to close pixbuf loader: %s",
+              error ? error->message : "No error given");
+
+          g_simple_async_result_set_from_error (closure->result, error);
+          goto out;
+        }
+
+      /* We're done. */
+      g_simple_async_result_set_op_res_gpointer (closure->result,
+          avatar_pixbuf_from_loader (closure->loader),
+          g_object_unref);
+
+      goto out;
+    }
+  else
+    {
+      /* Loop round and read another chunk. */
+      g_input_stream_read_async (stream, closure->data,
+        G_N_ELEMENTS (closure->data),
+        G_PRIORITY_DEFAULT, closure->cancellable,
+        avatar_icon_load_read_cb, closure);
+
+      return;
+  }
 
 out_close:
-	/* We must close the pixbuf loader before unreffing it. */
-	gdk_pixbuf_loader_close (closure->loader, NULL);
+  /* We must close the pixbuf loader before unreffing it. */
+  gdk_pixbuf_loader_close (closure->loader, NULL);
 
 out:
-	/* Close the file for safety (even though it should be
-	 * automatically closed when the stream is finalised). */
-	g_input_stream_close_async (stream, G_PRIORITY_DEFAULT, NULL,
-		(GAsyncReadyCallback) avatar_icon_load_close_cb, NULL);
+  /* Close the file for safety (even though it should be
+   * automatically closed when the stream is finalised). */
+  g_input_stream_close_async (stream, G_PRIORITY_DEFAULT, NULL,
+      (GAsyncReadyCallback) avatar_icon_load_close_cb, NULL);
 
-	g_simple_async_result_complete (closure->result);
+  g_simple_async_result_complete (closure->result);
 
-	g_clear_error (&error);
-	pixbuf_avatar_from_individual_closure_free (closure);
+  g_clear_error (&error);
+  pixbuf_avatar_from_individual_closure_free (closure);
 }
 
 static void
-avatar_icon_load_cb (GObject      *object,
-                     GAsyncResult *result,
-                     gpointer      user_data)
+avatar_icon_load_cb (GObject *object,
+    GAsyncResult *result,
+    gpointer user_data)
 {
-	GLoadableIcon *icon = G_LOADABLE_ICON (object);
-	PixbufAvatarFromIndividualClosure *closure = user_data;
-	GInputStream *stream;
-	GError *error = NULL;
+  GLoadableIcon *icon = G_LOADABLE_ICON (object);
+  PixbufAvatarFromIndividualClosure *closure = user_data;
+  GInputStream *stream;
+  GError *error = NULL;
 
-	stream = g_loadable_icon_load_finish (icon, result, NULL, &error);
-	if (error != NULL) {
-		DEBUG ("Failed to open avatar stream: %s", error->message);
-		g_simple_async_result_set_from_error (closure->result, error);
-		goto out;
-	}
+  stream = g_loadable_icon_load_finish (icon, result, NULL, &error);
+  if (error != NULL)
+    {
+      DEBUG ("Failed to open avatar stream: %s", error->message);
+      g_simple_async_result_set_from_error (closure->result, error);
+      goto out;
+    }
 
-	closure->size_data.width = closure->width;
-	closure->size_data.height = closure->height;
-	closure->size_data.preserve_aspect_ratio = TRUE;
+  closure->size_data.width = closure->width;
+  closure->size_data.height = closure->height;
+  closure->size_data.preserve_aspect_ratio = TRUE;
 
-	/* Load the data into a pixbuf loader in chunks. */
-	closure->loader = gdk_pixbuf_loader_new ();
+  /* Load the data into a pixbuf loader in chunks. */
+  closure->loader = gdk_pixbuf_loader_new ();
 
-	g_signal_connect (closure->loader, "size-prepared",
-			  G_CALLBACK (pixbuf_from_avatar_size_prepared_cb),
-	                  &(closure->size_data));
+  g_signal_connect (closure->loader, "size-prepared",
+      G_CALLBACK (pixbuf_from_avatar_size_prepared_cb),
+      &(closure->size_data));
 
-	/* Begin to read the first chunk. */
-	g_input_stream_read_async (stream, closure->data,
-			G_N_ELEMENTS (closure->data),
-			G_PRIORITY_DEFAULT, closure->cancellable,
-			avatar_icon_load_read_cb, closure);
+  /* Begin to read the first chunk. */
+  g_input_stream_read_async (stream, closure->data,
+      G_N_ELEMENTS (closure->data),
+      G_PRIORITY_DEFAULT, closure->cancellable,
+      avatar_icon_load_read_cb, closure);
 
-	g_object_unref (stream);
+  g_object_unref (stream);
 
-	return;
+  return;
 
 out:
-	g_simple_async_result_complete (closure->result);
+  g_simple_async_result_complete (closure->result);
 
-	g_clear_error (&error);
-	tp_clear_object (&stream);
-	pixbuf_avatar_from_individual_closure_free (closure);
+  g_clear_error (&error);
+  tp_clear_object (&stream);
+  pixbuf_avatar_from_individual_closure_free (closure);
 }
 
 void
 empathy_pixbuf_avatar_from_individual_scaled_async (
-		FolksIndividual     *individual,
-		gint                 width,
-		gint                 height,
-		GCancellable        *cancellable,
-		GAsyncReadyCallback  callback,
-		gpointer             user_data)
+    FolksIndividual *individual,
+    gint width,
+    gint height,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
 {
-	GLoadableIcon *avatar_icon;
-	GSimpleAsyncResult *result;
-	PixbufAvatarFromIndividualClosure *closure;
+  GLoadableIcon *avatar_icon;
+  GSimpleAsyncResult *result;
+  PixbufAvatarFromIndividualClosure *closure;
 
-	result = g_simple_async_result_new (G_OBJECT (individual),
-			callback, user_data,
-			empathy_pixbuf_avatar_from_individual_scaled_async);
+  result = g_simple_async_result_new (G_OBJECT (individual),
+      callback, user_data, empathy_pixbuf_avatar_from_individual_scaled_async);
 
-	avatar_icon =
-		folks_avatar_details_get_avatar (FOLKS_AVATAR_DETAILS (individual));
-	if (avatar_icon == NULL) {
-		g_simple_async_result_set_error (result, G_IO_ERROR,
-			G_IO_ERROR_NOT_FOUND, "no avatar found");
+  avatar_icon = folks_avatar_details_get_avatar (
+      FOLKS_AVATAR_DETAILS (individual));
 
-		g_simple_async_result_complete (result);
-		g_object_unref (result);
-		return;
-	}
+  if (avatar_icon == NULL)
+    {
+      g_simple_async_result_set_error (result, G_IO_ERROR,
+        G_IO_ERROR_NOT_FOUND, "no avatar found");
+
+      g_simple_async_result_complete (result);
+      g_object_unref (result);
+      return;
+    }
 
-	closure = pixbuf_avatar_from_individual_closure_new (individual, result,
-							     width, height,
-							     cancellable);
+  closure = pixbuf_avatar_from_individual_closure_new (individual, result,
+      width, height, cancellable);
 
-	g_return_if_fail (closure != NULL);
+  g_return_if_fail (closure != NULL);
 
-	g_loadable_icon_load_async (avatar_icon, width, cancellable,
-			avatar_icon_load_cb, closure);
+  g_loadable_icon_load_async (avatar_icon, width, cancellable,
+      avatar_icon_load_cb, closure);
 
-	g_object_unref (result);
+  g_object_unref (result);
 }
 
 /* Return a ref on the GdkPixbuf */
 GdkPixbuf *
 empathy_pixbuf_avatar_from_individual_scaled_finish (
-		FolksIndividual *individual,
-		GAsyncResult *result,
-		GError **error)
+    FolksIndividual *individual,
+    GAsyncResult *result,
+    GError **error)
 {
-	GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-	gboolean result_valid;
-	GdkPixbuf *pixbuf;
+  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
+  gboolean result_valid;
+  GdkPixbuf *pixbuf;
 
-	g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
-	g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (simple), NULL);
+  g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
+  g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (simple), NULL);
 
-	if (g_simple_async_result_propagate_error (simple, error))
-		return NULL;
+  if (g_simple_async_result_propagate_error (simple, error))
+    return NULL;
 
-	result_valid = g_simple_async_result_is_valid (result,
-			G_OBJECT (individual),
-			empathy_pixbuf_avatar_from_individual_scaled_async);
-	g_return_val_if_fail (result_valid, NULL);
+  result_valid = g_simple_async_result_is_valid (result,
+      G_OBJECT (individual),
+      empathy_pixbuf_avatar_from_individual_scaled_async);
 
-	pixbuf = g_simple_async_result_get_op_res_gpointer (simple);
-	return pixbuf != NULL ? g_object_ref (pixbuf) : NULL;
+  g_return_val_if_fail (result_valid, NULL);
+
+  pixbuf = g_simple_async_result_get_op_res_gpointer (simple);
+  return pixbuf != NULL ? g_object_ref (pixbuf) : NULL;
 }
 
 GdkPixbuf *
 empathy_pixbuf_contact_status_icon (EmpathyContact *contact,
-				   gboolean       show_protocol)
+    gboolean show_protocol)
 {
-	const gchar *icon_name;
+  const gchar *icon_name;
+
+  g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
-	g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+  icon_name = empathy_icon_name_for_contact (contact);
 
-	icon_name = empathy_icon_name_for_contact (contact);
+  if (icon_name == NULL)
+    return NULL;
 
-	if (icon_name == NULL) {
-		return NULL;
-	}
-	return empathy_pixbuf_contact_status_icon_with_icon_name (contact,
-	    icon_name,
-	    show_protocol);
+  return empathy_pixbuf_contact_status_icon_with_icon_name (contact,
+      icon_name, show_protocol);
 }
 
 GdkPixbuf *
 empathy_pixbuf_contact_status_icon_with_icon_name (EmpathyContact *contact,
-					  const gchar    *icon_name,
-					  gboolean       show_protocol)
+    const gchar *icon_name,
+    gboolean show_protocol)
 {
-	GdkPixbuf *pix_status;
-	GdkPixbuf *pix_protocol;
-	gchar     *icon_filename;
-	gint       height, width;
-	gint       numerator, denominator;
+  GdkPixbuf *pix_status;
+  GdkPixbuf *pix_protocol;
+  gchar *icon_filename;
+  gint height, width;
+  gint numerator, denominator;
+
+  g_return_val_if_fail (EMPATHY_IS_CONTACT (contact) ||
+      (show_protocol == FALSE), NULL);
+  g_return_val_if_fail (icon_name != NULL, NULL);
 
-	g_return_val_if_fail (EMPATHY_IS_CONTACT (contact) ||
-			(show_protocol == FALSE), NULL);
-	g_return_val_if_fail (icon_name != NULL, NULL);
+  numerator = 3;
+  denominator = 4;
 
-	numerator = 3;
-	denominator = 4;
+  icon_filename = empathy_filename_from_icon_name (icon_name,
+      GTK_ICON_SIZE_MENU);
+
+  if (icon_filename == NULL)
+    {
+      DEBUG ("icon name: %s could not be found\n", icon_name);
+      return NULL;
+    }
 
-	icon_filename = empathy_filename_from_icon_name (icon_name,
-							 GTK_ICON_SIZE_MENU);
-	if (icon_filename == NULL) {
-		DEBUG ("icon name: %s could not be found\n", icon_name);
-		return NULL;
-	}
+  pix_status = gdk_pixbuf_new_from_file (icon_filename, NULL);
 
-	pix_status = gdk_pixbuf_new_from_file (icon_filename, NULL);
+  if (pix_status == NULL)
+    {
+      DEBUG ("Could not open icon %s\n", icon_filename);
+      g_free (icon_filename);
+      return NULL;
+    }
 
-	if (pix_status == NULL) {
-		DEBUG ("Could not open icon %s\n", icon_filename);
-		g_free (icon_filename);
-		return NULL;
-	}
+  g_free (icon_filename);
 
-	g_free (icon_filename);
+  if (!show_protocol)
+    return pix_status;
 
-	if (!show_protocol)
-		return pix_status;
+  height = gdk_pixbuf_get_height (pix_status);
+  width = gdk_pixbuf_get_width (pix_status);
 
-	height = gdk_pixbuf_get_height (pix_status);
-	width = gdk_pixbuf_get_width (pix_status);
+  pix_protocol = empathy_pixbuf_protocol_from_contact_scaled (contact,
+      width * numerator / denominator,
+      height * numerator / denominator);
 
-	pix_protocol = empathy_pixbuf_protocol_from_contact_scaled (contact,
-								    width * numerator / denominator,
-								    height * numerator / denominator);
+  if (pix_protocol == NULL)
+    return pix_status;
 
-	if (pix_protocol == NULL) {
-		return pix_status;
-	}
-	gdk_pixbuf_composite (pix_protocol, pix_status,
-	    0, height - height * numerator / denominator,
-	    width * numerator / denominator, height * numerator / denominator,
-	    0, height - height * numerator / denominator,
-	    1, 1,
-	    GDK_INTERP_BILINEAR, 255);
+  gdk_pixbuf_composite (pix_protocol, pix_status,
+      0, height - height * numerator / denominator,
+      width * numerator / denominator, height * numerator / denominator,
+      0, height - height * numerator / denominator,
+      1, 1,
+      GDK_INTERP_BILINEAR, 255);
 
-	g_object_unref (pix_protocol);
+  g_object_unref (pix_protocol);
 
-	return pix_status;
+  return pix_status;
 }
 
 GdkPixbuf *
 empathy_pixbuf_protocol_from_contact_scaled (EmpathyContact *contact,
-					  gint           width,
-					  gint           height)
+    gint width,
+    gint height)
 {
-	TpAccount *account;
-	gchar     *filename;
-	GdkPixbuf *pixbuf = NULL;
+  TpAccount *account;
+  gchar *filename;
+  GdkPixbuf *pixbuf = NULL;
 
-	g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
+  g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
-	account = empathy_contact_get_account (contact);
-	filename = empathy_filename_from_icon_name (tp_account_get_icon_name (account),
-						    GTK_ICON_SIZE_MENU);
-	if (filename != NULL) {
-		pixbuf = gdk_pixbuf_new_from_file_at_size (filename, width, height, NULL);
-		g_free (filename);
-	}
+  account = empathy_contact_get_account (contact);
+  filename = empathy_filename_from_icon_name (
+      tp_account_get_icon_name (account), GTK_ICON_SIZE_MENU);
 
-	return pixbuf;
+  if (filename != NULL)
+    {
+      pixbuf = gdk_pixbuf_new_from_file_at_size (filename, width, height, NULL);
+      g_free (filename);
+    }
+
+  return pixbuf;
 }
 
 GdkPixbuf *
-empathy_pixbuf_scale_down_if_necessary (GdkPixbuf *pixbuf, gint max_size)
+empathy_pixbuf_scale_down_if_necessary (GdkPixbuf *pixbuf,
+    gint max_size)
 {
-	gint      width, height;
-	gdouble   factor;
+  gint width, height;
+  gdouble factor;
 
-	width = gdk_pixbuf_get_width (pixbuf);
-	height = gdk_pixbuf_get_height (pixbuf);
+  width = gdk_pixbuf_get_width (pixbuf);
+  height = gdk_pixbuf_get_height (pixbuf);
 
-	if (width > 0 && (width > max_size || height > max_size)) {
-		factor = (gdouble) max_size / MAX (width, height);
+  if (width > 0 && (width > max_size || height > max_size))
+    {
+      factor = (gdouble) max_size / MAX (width, height);
 
-		width = width * factor;
-		height = height * factor;
+      width = width * factor;
+      height = height * factor;
 
-		return gdk_pixbuf_scale_simple (pixbuf,
-						width, height,
-						GDK_INTERP_HYPER);
-	}
+      return gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_HYPER);
+    }
 
-	return g_object_ref (pixbuf);
+  return g_object_ref (pixbuf);
 }
 
 GdkPixbuf *
 empathy_pixbuf_from_icon_name_sized (const gchar *icon_name,
-				     gint size)
+    gint size)
 {
-	GtkIconTheme *theme;
-	GdkPixbuf *pixbuf;
-	GError *error = NULL;
+  GtkIconTheme *theme;
+  GdkPixbuf *pixbuf;
+  GError *error = NULL;
 
-	if (!icon_name) {
-		return NULL;
-	}
+  if (!icon_name)
+    return NULL;
 
-	theme = gtk_icon_theme_get_default ();
+  theme = gtk_icon_theme_get_default ();
 
-	pixbuf = gtk_icon_theme_load_icon (theme,
-					   icon_name,
-					   size,
-					   0,
-					   &error);
-	if (error) {
-		DEBUG ("Error loading icon: %s", error->message);
-		g_clear_error (&error);
-	}
+  pixbuf = gtk_icon_theme_load_icon (theme, icon_name, size, 0, &error);
 
-	return pixbuf;
+  if (error)
+    {
+      DEBUG ("Error loading icon: %s", error->message);
+      g_clear_error (&error);
+    }
+
+  return pixbuf;
 }
 
 GdkPixbuf *
 empathy_pixbuf_from_icon_name (const gchar *icon_name,
-			       GtkIconSize  icon_size)
+    GtkIconSize  icon_size)
 {
-	gint  w, h;
-	gint  size = 48;
+  gint w, h;
+  gint size = 48;
 
-	if (!icon_name) {
-		return NULL;
-	}
+  if (!icon_name)
+    return NULL;
 
-	if (gtk_icon_size_lookup (icon_size, &w, &h)) {
-		size = (w + h) / 2;
-	}
+  if (gtk_icon_size_lookup (icon_size, &w, &h))
+    size = (w + h) / 2;
 
-	return empathy_pixbuf_from_icon_name_sized (icon_name, size);
+  return empathy_pixbuf_from_icon_name_sized (icon_name, size);
 }
 
 gchar *
 empathy_filename_from_icon_name (const gchar *icon_name,
-				 GtkIconSize  icon_size)
+    GtkIconSize icon_size)
 {
-	GtkIconTheme *icon_theme;
-	GtkIconInfo  *icon_info;
-	gint          w, h;
-	gint          size = 48;
-	gchar        *ret;
+  GtkIconTheme *icon_theme;
+  GtkIconInfo *icon_info;
+  gint w, h;
+  gint size = 48;
+  gchar *ret;
 
-	icon_theme = gtk_icon_theme_get_default ();
+  icon_theme = gtk_icon_theme_get_default ();
 
-	if (gtk_icon_size_lookup (icon_size, &w, &h)) {
-		size = (w + h) / 2;
-	}
+  if (gtk_icon_size_lookup (icon_size, &w, &h))
+    size = (w + h) / 2;
 
-	icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size, 0);
-	if (icon_info == NULL)
-		return NULL;
+  icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size, 0);
+  if (icon_info == NULL)
+    return NULL;
 
-	ret = g_strdup (gtk_icon_info_get_filename (icon_info));
-	gtk_icon_info_free (icon_info);
+  ret = g_strdup (gtk_icon_info_get_filename (icon_info));
+  gtk_icon_info_free (icon_info);
 
-	return ret;
+  return ret;
 }
 
 /* Stolen from GtkSourceView, hence the weird intendation. Please keep it like
@@ -979,692 +1014,710 @@ empathy_filename_from_icon_name (const gchar *icon_name,
 
 /* this function acts like g_utf8_offset_to_pointer() except that if it finds a
  * decomposable character it consumes the decomposition length from the given
- * offset.  So it's useful when the offset was calculated for the normalized
+ * offset. So it's useful when the offset was calculated for the normalized
  * version of str, but we need a pointer to str itself. */
 static const gchar *
-pointer_from_offset_skipping_decomp (const gchar *str, gint offset)
+pointer_from_offset_skipping_decomp (const gchar *str,
+    gint offset)
 {
-	gchar *casefold, *normal;
-	const gchar *p, *q;
+  gchar *casefold, *normal;
+  const gchar *p, *q;
+
+  p = str;
+  while (offset > 0)
+  {
+    q = g_utf8_next_char (p);
+    casefold = g_utf8_casefold (p, q - p);
+    normal = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
+    offset -= g_utf8_strlen (normal, -1);
+    g_free (casefold);
+    g_free (normal);
+    p = q;
+  }
 
-	p = str;
-	while (offset > 0)
-	{
-		q = g_utf8_next_char (p);
-		casefold = g_utf8_casefold (p, q - p);
-		normal = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
-		offset -= g_utf8_strlen (normal, -1);
-		g_free (casefold);
-		g_free (normal);
-		p = q;
-	}
-	return p;
+  return p;
 }
 
 static const gchar *
-g_utf8_strcasestr (const gchar *haystack, const gchar *needle)
-{
-	gsize needle_len;
-	gsize haystack_len;
-	const gchar *ret = NULL;
-	gchar *p;
-	gchar *casefold;
-	gchar *caseless_haystack;
-	gint i;
-
-	g_return_val_if_fail (haystack != NULL, NULL);
-	g_return_val_if_fail (needle != NULL, NULL);
-
-	casefold = g_utf8_casefold (haystack, -1);
-	caseless_haystack = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
-	g_free (casefold);
-
-	needle_len = g_utf8_strlen (needle, -1);
-	haystack_len = g_utf8_strlen (caseless_haystack, -1);
-
-	if (needle_len == 0)
-	{
-		ret = (gchar *) haystack;
-		goto finally_1;
-	}
-
-	if (haystack_len < needle_len)
-	{
-		ret = NULL;
-		goto finally_1;
-	}
-
-	p = (gchar *) caseless_haystack;
-	needle_len = strlen (needle);
-	i = 0;
-
-	while (*p)
-	{
-		if ((strncmp (p, needle, needle_len) == 0))
-		{
-			ret = pointer_from_offset_skipping_decomp (haystack, i);
-			goto finally_1;
-		}
-
-		p = g_utf8_next_char (p);
-		i++;
-	}
+g_utf8_strcasestr (const gchar *haystack,
+    const gchar *needle)
+{
+  gsize needle_len;
+  gsize haystack_len;
+  const gchar *ret = NULL;
+  gchar *p;
+  gchar *casefold;
+  gchar *caseless_haystack;
+  gint i;
+
+  g_return_val_if_fail (haystack != NULL, NULL);
+  g_return_val_if_fail (needle != NULL, NULL);
+
+  casefold = g_utf8_casefold (haystack, -1);
+  caseless_haystack = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
+  g_free (casefold);
+
+  needle_len = g_utf8_strlen (needle, -1);
+  haystack_len = g_utf8_strlen (caseless_haystack, -1);
+
+  if (needle_len == 0)
+    {
+      ret = (gchar *) haystack;
+      goto finally_1;
+    }
+
+  if (haystack_len < needle_len)
+    {
+      ret = NULL;
+      goto finally_1;
+    }
+
+  p = (gchar *) caseless_haystack;
+  needle_len = strlen (needle);
+  i = 0;
+
+  while (*p)
+  {
+    if ((strncmp (p, needle, needle_len) == 0))
+      {
+        ret = pointer_from_offset_skipping_decomp (haystack, i);
+        goto finally_1;
+      }
+
+    p = g_utf8_next_char (p);
+    i++;
+  }
 
 finally_1:
-	g_free (caseless_haystack);
+  g_free (caseless_haystack);
 
-	return ret;
+  return ret;
 }
 
 static gboolean
-g_utf8_caselessnmatch (const char *s1, const char *s2,
-		       gssize n1, gssize n2)
+g_utf8_caselessnmatch (const char *s1,
+    const char *s2,
+    gssize n1,
+    gssize n2)
 {
-	gchar *casefold;
-	gchar *normalized_s1;
-	gchar *normalized_s2;
-	gint len_s1;
-	gint len_s2;
-	gboolean ret = FALSE;
+  gchar *casefold;
+  gchar *normalized_s1;
+  gchar *normalized_s2;
+  gint len_s1;
+  gint len_s2;
+  gboolean ret = FALSE;
 
-	g_return_val_if_fail (s1 != NULL, FALSE);
-	g_return_val_if_fail (s2 != NULL, FALSE);
-	g_return_val_if_fail (n1 > 0, FALSE);
-	g_return_val_if_fail (n2 > 0, FALSE);
+  g_return_val_if_fail (s1 != NULL, FALSE);
+  g_return_val_if_fail (s2 != NULL, FALSE);
+  g_return_val_if_fail (n1 > 0, FALSE);
+  g_return_val_if_fail (n2 > 0, FALSE);
 
-	casefold = g_utf8_casefold (s1, n1);
-	normalized_s1 = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
-	g_free (casefold);
+  casefold = g_utf8_casefold (s1, n1);
+  normalized_s1 = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
+  g_free (casefold);
 
-	casefold = g_utf8_casefold (s2, n2);
-	normalized_s2 = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
-	g_free (casefold);
+  casefold = g_utf8_casefold (s2, n2);
+  normalized_s2 = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
+  g_free (casefold);
 
-	len_s1 = strlen (normalized_s1);
-	len_s2 = strlen (normalized_s2);
+  len_s1 = strlen (normalized_s1);
+  len_s2 = strlen (normalized_s2);
 
-	if (len_s1 < len_s2)
-		goto finally_2;
+  if (len_s1 < len_s2)
+    goto finally_2;
 
-	ret = (strncmp (normalized_s1, normalized_s2, len_s2) == 0);
+  ret = (strncmp (normalized_s1, normalized_s2, len_s2) == 0);
 
 finally_2:
-	g_free (normalized_s1);
-	g_free (normalized_s2);
+  g_free (normalized_s1);
+  g_free (normalized_s2);
 
-	return ret;
+  return ret;
 }
 
 static void
 forward_chars_with_skipping (GtkTextIter *iter,
-			     gint         count,
-			     gboolean     skip_invisible,
-			     gboolean     skip_nontext,
-			     gboolean     skip_decomp)
+    gint count,
+    gboolean skip_invisible,
+    gboolean skip_nontext,
+    gboolean skip_decomp)
 {
-	gint i;
-
-	g_return_if_fail (count >= 0);
+  gint i;
 
-	i = count;
+  g_return_if_fail (count >= 0);
 
-	while (i > 0)
-	{
-		gboolean ignored = FALSE;
+  i = count;
 
-		/* minimal workaround to avoid the infinite loop of bug #168247.
-		 * It doesn't fix the problemjust the symptom...
-		 */
-		if (gtk_text_iter_is_end (iter))
-			return;
+  while (i > 0)
+    {
+      gboolean ignored = FALSE;
 
-		if (skip_nontext && gtk_text_iter_get_char (iter) == GTK_TEXT_UNKNOWN_CHAR)
-			ignored = TRUE;
+      /* minimal workaround to avoid the infinite loop of bug #168247.
+       * It doesn't fix the problemjust the symptom...
+       */
+      if (gtk_text_iter_is_end (iter))
+        return;
 
-		if (!ignored && skip_invisible &&
-		    /* _gtk_text_btree_char_is_invisible (iter)*/ FALSE)
-			ignored = TRUE;
+      if (skip_nontext &&
+          gtk_text_iter_get_char (iter) == GTK_TEXT_UNKNOWN_CHAR)
+        ignored = TRUE;
 
-		if (!ignored && skip_decomp)
-		{
-			/* being UTF8 correct sucks; this accounts for extra
-			   offsets coming from canonical decompositions of
-			   UTF8 characters (e.g. accented characters) which
-			   g_utf8_normalize () performs */
-			gchar *normal;
-			gchar buffer[6];
-			gint buffer_len;
+      if (!ignored && skip_invisible &&
+          /* _gtk_text_btree_char_is_invisible (iter)*/ FALSE)
+        ignored = TRUE;
 
-			buffer_len = g_unichar_to_utf8 (gtk_text_iter_get_char (iter), buffer);
-			normal = g_utf8_normalize (buffer, buffer_len, G_NORMALIZE_NFD);
-			i -= (g_utf8_strlen (normal, -1) - 1);
-			g_free (normal);
-		}
+      if (!ignored && skip_decomp)
+        {
+          /* being UTF8 correct sucks; this accounts for extra
+             offsets coming from canonical decompositions of
+             UTF8 characters (e.g. accented characters) which
+             g_utf8_normalize () performs */
+          gchar *normal;
+          gchar buffer[6];
+          gint buffer_len;
+
+          buffer_len = g_unichar_to_utf8 (gtk_text_iter_get_char (iter),
+              buffer);
+
+          normal = g_utf8_normalize (buffer, buffer_len, G_NORMALIZE_NFD);
+          i -= (g_utf8_strlen (normal, -1) - 1);
+          g_free (normal);
+        }
 
-		gtk_text_iter_forward_char (iter);
+      gtk_text_iter_forward_char (iter);
 
-		if (!ignored)
-			--i;
-	}
+      if (!ignored)
+        --i;
+    }
 }
 
 static gboolean
 lines_match (const GtkTextIter *start,
-	     const gchar      **lines,
-	     gboolean           visible_only,
-	     gboolean           slice,
-	     GtkTextIter       *match_start,
-	     GtkTextIter       *match_end)
-{
-	GtkTextIter next;
-	gchar *line_text;
-	const gchar *found;
-	gint offset;
-
-	if (*lines == NULL || **lines == '\0')
-	{
-		if (match_start)
-			*match_start = *start;
-		if (match_end)
-			*match_end = *start;
-		return TRUE;
-	}
-
-	next = *start;
-	gtk_text_iter_forward_line (&next);
-
-	/* No more text in buffer, but *lines is nonempty */
-	if (gtk_text_iter_equal (start, &next))
-		return FALSE;
-
-	if (slice)
-	{
-		if (visible_only)
-			line_text = gtk_text_iter_get_visible_slice (start, &next);
-		else
-			line_text = gtk_text_iter_get_slice (start, &next);
-	}
-	else
-	{
-		if (visible_only)
-			line_text = gtk_text_iter_get_visible_text (start, &next);
-		else
-			line_text = gtk_text_iter_get_text (start, &next);
-	}
-
-	if (match_start) /* if this is the first line we're matching */
-	{
-		found = g_utf8_strcasestr (line_text, *lines);
-	}
-	else
-	{
-		/* If it's not the first line, we have to match from the
-		 * start of the line.
-		 */
-		if (g_utf8_caselessnmatch (line_text, *lines, strlen (line_text),
-					   strlen (*lines)))
-			found = line_text;
-		else
-			found = NULL;
-	}
-
-	if (found == NULL)
-	{
-		g_free (line_text);
-		return FALSE;
-	}
-
-	/* Get offset to start of search string */
-	offset = g_utf8_strlen (line_text, found - line_text);
-
-	next = *start;
-
-	/* If match start needs to be returned, set it to the
-	 * start of the search string.
-	 */
-	forward_chars_with_skipping (&next, offset, visible_only, !slice, FALSE);
-	if (match_start)
-	{
-		*match_start = next;
-	}
-
-	/* Go to end of search string */
-	forward_chars_with_skipping (&next, g_utf8_strlen (*lines, -1), visible_only, !slice, TRUE);
-
-	g_free (line_text);
-
-	++lines;
-
-	if (match_end)
-		*match_end = next;
-
-	/* pass NULL for match_start, since we don't need to find the
-	 * start again.
-	 */
-	return lines_match (&next, lines, visible_only, slice, NULL, match_end);
+    const gchar **lines,
+    gboolean visible_only,
+    gboolean slice,
+    GtkTextIter *match_start,
+    GtkTextIter *match_end)
+{
+  GtkTextIter next;
+  gchar *line_text;
+  const gchar *found;
+  gint offset;
+
+  if (*lines == NULL || **lines == '\0')
+    {
+      if (match_start)
+        *match_start = *start;
+      if (match_end)
+        *match_end = *start;
+      return TRUE;
+    }
+
+  next = *start;
+  gtk_text_iter_forward_line (&next);
+
+  /* No more text in buffer, but *lines is nonempty */
+  if (gtk_text_iter_equal (start, &next))
+    return FALSE;
+
+  if (slice)
+    {
+      if (visible_only)
+        line_text = gtk_text_iter_get_visible_slice (start, &next);
+      else
+        line_text = gtk_text_iter_get_slice (start, &next);
+    }
+  else
+    {
+      if (visible_only)
+        line_text = gtk_text_iter_get_visible_text (start, &next);
+      else
+        line_text = gtk_text_iter_get_text (start, &next);
+    }
+
+  if (match_start) /* if this is the first line we're matching */
+    {
+      found = g_utf8_strcasestr (line_text, *lines);
+    }
+  else
+    {
+      /* If it's not the first line, we have to match from the
+       * start of the line.
+       */
+      if (g_utf8_caselessnmatch (line_text, *lines, strlen (line_text),
+               strlen (*lines)))
+        found = line_text;
+      else
+        found = NULL;
+    }
+
+  if (found == NULL)
+    {
+      g_free (line_text);
+      return FALSE;
+    }
+
+  /* Get offset to start of search string */
+  offset = g_utf8_strlen (line_text, found - line_text);
+
+  next = *start;
+
+  /* If match start needs to be returned, set it to the
+   * start of the search string.
+   */
+  forward_chars_with_skipping (&next, offset, visible_only, !slice, FALSE);
+  if (match_start)
+    {
+      *match_start = next;
+    }
+
+  /* Go to end of search string */
+  forward_chars_with_skipping (&next, g_utf8_strlen (*lines, -1), visible_only,
+      !slice, TRUE);
+
+  g_free (line_text);
+
+  ++lines;
+
+  if (match_end)
+    *match_end = next;
+
+  /* pass NULL for match_start, since we don't need to find the
+   * start again.
+   */
+  return lines_match (&next, lines, visible_only, slice, NULL, match_end);
 }
 
 /* strsplit () that retains the delimiter as part of the string. */
 static gchar **
 strbreakup (const char *string,
-	    const char *delimiter,
-	    gint        max_tokens)
+    const char *delimiter,
+    gint max_tokens)
 {
-	GSList *string_list = NULL, *slist;
-	gchar **str_array, *s, *casefold, *new_string;
-	guint i, n = 1;
-
-	g_return_val_if_fail (string != NULL, NULL);
-	g_return_val_if_fail (delimiter != NULL, NULL);
+  GSList *string_list = NULL, *slist;
+  gchar **str_array, *s, *casefold, *new_string;
+  guint i, n = 1;
 
-	if (max_tokens < 1)
-		max_tokens = G_MAXINT;
+  g_return_val_if_fail (string != NULL, NULL);
+  g_return_val_if_fail (delimiter != NULL, NULL);
 
-	s = strstr (string, delimiter);
-	if (s)
-	{
-		guint delimiter_len = strlen (delimiter);
+  if (max_tokens < 1)
+    max_tokens = G_MAXINT;
 
-		do
-		{
-			guint len;
+  s = strstr (string, delimiter);
+  if (s)
+    {
+      guint delimiter_len = strlen (delimiter);
 
-			len = s - string + delimiter_len;
-			new_string = g_new (gchar, len + 1);
-			strncpy (new_string, string, len);
-			new_string[len] = 0;
-			casefold = g_utf8_casefold (new_string, -1);
-			g_free (new_string);
-			new_string = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
-			g_free (casefold);
-			string_list = g_slist_prepend (string_list, new_string);
-			n++;
-			string = s + delimiter_len;
-			s = strstr (string, delimiter);
-		} while (--max_tokens && s);
-	}
+      do
+        {
+          guint len;
+
+          len = s - string + delimiter_len;
+          new_string = g_new (gchar, len + 1);
+          strncpy (new_string, string, len);
+          new_string[len] = 0;
+          casefold = g_utf8_casefold (new_string, -1);
+          g_free (new_string);
+          new_string = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
+          g_free (casefold);
+          string_list = g_slist_prepend (string_list, new_string);
+          n++;
+          string = s + delimiter_len;
+          s = strstr (string, delimiter);
+        } while (--max_tokens && s);
+    }
 
-	if (*string)
-	{
-		n++;
-		casefold = g_utf8_casefold (string, -1);
-		new_string = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
-		g_free (casefold);
-		string_list = g_slist_prepend (string_list, new_string);
-	}
+  if (*string)
+    {
+      n++;
+      casefold = g_utf8_casefold (string, -1);
+      new_string = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
+      g_free (casefold);
+      string_list = g_slist_prepend (string_list, new_string);
+    }
 
-	str_array = g_new (gchar*, n);
+  str_array = g_new (gchar*, n);
 
-	i = n - 1;
+  i = n - 1;
 
-	str_array[i--] = NULL;
-	for (slist = string_list; slist; slist = slist->next)
-		str_array[i--] = slist->data;
+  str_array[i--] = NULL;
+  for (slist = string_list; slist; slist = slist->next)
+    str_array[i--] = slist->data;
 
-	g_slist_free (string_list);
+  g_slist_free (string_list);
 
-	return str_array;
+  return str_array;
 }
 
 gboolean
-empathy_text_iter_forward_search (const GtkTextIter   *iter,
-				 const gchar         *str,
-				 GtkTextIter         *match_start,
-				 GtkTextIter         *match_end,
-				 const GtkTextIter   *limit)
-{
-	gchar **lines = NULL;
-	GtkTextIter match;
-	gboolean retval = FALSE;
-	GtkTextIter search;
-	gboolean visible_only;
-	gboolean slice;
-
-	g_return_val_if_fail (iter != NULL, FALSE);
-	g_return_val_if_fail (str != NULL, FALSE);
-
-	if (limit && gtk_text_iter_compare (iter, limit) >= 0)
-		return FALSE;
-
-	if (*str == '\0') {
-		/* If we can move one char, return the empty string there */
-		match = *iter;
-
-		if (gtk_text_iter_forward_char (&match)) {
-			if (limit && gtk_text_iter_equal (&match, limit)) {
-				return FALSE;
-			}
-
-			if (match_start) {
-				*match_start = match;
-			}
-			if (match_end) {
-				*match_end = match;
-			}
-			return TRUE;
-		} else {
-			return FALSE;
-		}
-	}
-
-	visible_only = TRUE;
-	slice = FALSE;
-
-	/* locate all lines */
-	lines = strbreakup (str, "\n", -1);
-
-	search = *iter;
-
-	do {
-		/* This loop has an inefficient worst-case, where
-		 * gtk_text_iter_get_text () is called repeatedly on
-		 * a single line.
-		 */
-		GtkTextIter end;
-
-		if (limit && gtk_text_iter_compare (&search, limit) >= 0) {
-			break;
-		}
-
-		if (lines_match (&search, (const gchar**)lines,
-				 visible_only, slice, &match, &end)) {
-			if (limit == NULL ||
-			    (limit && gtk_text_iter_compare (&end, limit) <= 0)) {
-				retval = TRUE;
-
-				if (match_start) {
-					*match_start = match;
-				}
-				if (match_end) {
-					*match_end = end;
-				}
-			}
-			break;
-		}
-	} while (gtk_text_iter_forward_line (&search));
-
-	g_strfreev ((gchar **) lines);
-
-	return retval;
+empathy_text_iter_forward_search (const GtkTextIter *iter,
+    const gchar *str,
+    GtkTextIter *match_start,
+    GtkTextIter *match_end,
+    const GtkTextIter *limit)
+{
+  gchar **lines = NULL;
+  GtkTextIter match;
+  gboolean retval = FALSE;
+  GtkTextIter search;
+  gboolean visible_only;
+  gboolean slice;
+
+  g_return_val_if_fail (iter != NULL, FALSE);
+  g_return_val_if_fail (str != NULL, FALSE);
+
+  if (limit && gtk_text_iter_compare (iter, limit) >= 0)
+    return FALSE;
+
+  if (*str == '\0')
+    {
+      /* If we can move one char, return the empty string there */
+      match = *iter;
+
+      if (gtk_text_iter_forward_char (&match))
+        {
+          if (limit && gtk_text_iter_equal (&match, limit))
+            return FALSE;
+
+          if (match_start)
+            *match_start = match;
+
+          if (match_end)
+            *match_end = match;
+
+          return TRUE;
+        }
+      else
+        {
+          return FALSE;
+        }
+    }
+
+  visible_only = TRUE;
+  slice = FALSE;
+
+  /* locate all lines */
+  lines = strbreakup (str, "\n", -1);
+
+  search = *iter;
+
+  do
+    {
+      /* This loop has an inefficient worst-case, where
+       * gtk_text_iter_get_text () is called repeatedly on
+       * a single line.
+       */
+      GtkTextIter end;
+
+      if (limit && gtk_text_iter_compare (&search, limit) >= 0)
+        break;
+
+      if (lines_match (&search, (const gchar**)lines,
+           visible_only, slice, &match, &end))
+        {
+          if (limit == NULL ||
+              (limit && gtk_text_iter_compare (&end, limit) <= 0))
+            {
+              retval = TRUE;
+
+              if (match_start)
+                *match_start = match;
+
+              if (match_end)
+                *match_end = end;
+            }
+          break;
+        }
+    } while (gtk_text_iter_forward_line (&search));
+
+  g_strfreev ((gchar **) lines);
+
+  return retval;
 }
 
 static const gchar *
-g_utf8_strrcasestr (const gchar *haystack, const gchar *needle)
-{
-	gsize needle_len;
-	gsize haystack_len;
-	const gchar *ret = NULL;
-	gchar *p;
-	gchar *casefold;
-	gchar *caseless_haystack;
-	gint i;
-
-	g_return_val_if_fail (haystack != NULL, NULL);
-	g_return_val_if_fail (needle != NULL, NULL);
-
-	casefold = g_utf8_casefold (haystack, -1);
-	caseless_haystack = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
-	g_free (casefold);
-
-	needle_len = g_utf8_strlen (needle, -1);
-	haystack_len = g_utf8_strlen (caseless_haystack, -1);
-
-	if (needle_len == 0)
-	{
-		ret = (gchar *) haystack;
-		goto finally_1;
-	}
-
-	if (haystack_len < needle_len)
-	{
-		ret = NULL;
-		goto finally_1;
-	}
-
-	i = haystack_len - needle_len;
-	p = g_utf8_offset_to_pointer (caseless_haystack, i);
-	needle_len = strlen (needle);
-
-	while (p >= caseless_haystack)
-	{
-		if (strncmp (p, needle, needle_len) == 0)
-		{
-			ret = pointer_from_offset_skipping_decomp (haystack, i);
-			goto finally_1;
-		}
-
-		p = g_utf8_prev_char (p);
-		i--;
-	}
+g_utf8_strrcasestr (const gchar *haystack,
+    const gchar *needle)
+{
+  gsize needle_len;
+  gsize haystack_len;
+  const gchar *ret = NULL;
+  gchar *p;
+  gchar *casefold;
+  gchar *caseless_haystack;
+  gint i;
+
+  g_return_val_if_fail (haystack != NULL, NULL);
+  g_return_val_if_fail (needle != NULL, NULL);
+
+  casefold = g_utf8_casefold (haystack, -1);
+  caseless_haystack = g_utf8_normalize (casefold, -1, G_NORMALIZE_NFD);
+  g_free (casefold);
+
+  needle_len = g_utf8_strlen (needle, -1);
+  haystack_len = g_utf8_strlen (caseless_haystack, -1);
+
+  if (needle_len == 0)
+    {
+      ret = (gchar *) haystack;
+      goto finally_1;
+    }
+
+  if (haystack_len < needle_len)
+    {
+      ret = NULL;
+      goto finally_1;
+    }
+
+  i = haystack_len - needle_len;
+  p = g_utf8_offset_to_pointer (caseless_haystack, i);
+  needle_len = strlen (needle);
+
+  while (p >= caseless_haystack)
+    {
+      if (strncmp (p, needle, needle_len) == 0)
+        {
+          ret = pointer_from_offset_skipping_decomp (haystack, i);
+          goto finally_1;
+        }
+
+      p = g_utf8_prev_char (p);
+      i--;
+    }
 
 finally_1:
-	g_free (caseless_haystack);
+  g_free (caseless_haystack);
 
-	return ret;
+  return ret;
 }
 
 static gboolean
 backward_lines_match (const GtkTextIter *start,
-		      const gchar      **lines,
-		      gboolean           visible_only,
-		      gboolean           slice,
-		      GtkTextIter       *match_start,
-		      GtkTextIter       *match_end)
-{
-	GtkTextIter line, next;
-	gchar *line_text;
-	const gchar *found;
-	gint offset;
-
-	if (*lines == NULL || **lines == '\0')
-	{
-		if (match_start)
-			*match_start = *start;
-		if (match_end)
-			*match_end = *start;
-		return TRUE;
-	}
-
-	line = next = *start;
-	if (gtk_text_iter_get_line_offset (&next) == 0)
-	{
-		if (!gtk_text_iter_backward_line (&next))
-			return FALSE;
-	}
-	else
-		gtk_text_iter_set_line_offset (&next, 0);
-
-	if (slice)
-	{
-		if (visible_only)
-			line_text = gtk_text_iter_get_visible_slice (&next, &line);
-		else
-			line_text = gtk_text_iter_get_slice (&next, &line);
-	}
-	else
-	{
-		if (visible_only)
-			line_text = gtk_text_iter_get_visible_text (&next, &line);
-		else
-			line_text = gtk_text_iter_get_text (&next, &line);
-	}
-
-	if (match_start) /* if this is the first line we're matching */
-	{
-		found = g_utf8_strrcasestr (line_text, *lines);
-	}
-	else
-	{
-		/* If it's not the first line, we have to match from the
-		 * start of the line.
-		 */
-		if (g_utf8_caselessnmatch (line_text, *lines, strlen (line_text),
-					   strlen (*lines)))
-			found = line_text;
-		else
-			found = NULL;
-	}
-
-	if (found == NULL)
-	{
-		g_free (line_text);
-		return FALSE;
-	}
-
-	/* Get offset to start of search string */
-	offset = g_utf8_strlen (line_text, found - line_text);
-
-	forward_chars_with_skipping (&next, offset, visible_only, !slice, FALSE);
-
-	/* If match start needs to be returned, set it to the
-	 * start of the search string.
-	 */
-	if (match_start)
-	{
-		*match_start = next;
-	}
-
-	/* Go to end of search string */
-	forward_chars_with_skipping (&next, g_utf8_strlen (*lines, -1), visible_only, !slice, TRUE);
-
-	g_free (line_text);
-
-	++lines;
-
-	if (match_end)
-		*match_end = next;
-
-	/* try to match the rest of the lines forward, passing NULL
-	 * for match_start so lines_match will try to match the entire
-	 * line */
-	return lines_match (&next, lines, visible_only,
-			    slice, NULL, match_end);
+    const gchar **lines,
+    gboolean visible_only,
+    gboolean slice,
+    GtkTextIter *match_start,
+    GtkTextIter *match_end)
+{
+  GtkTextIter line, next;
+  gchar *line_text;
+  const gchar *found;
+  gint offset;
+
+  if (*lines == NULL || **lines == '\0')
+    {
+      if (match_start)
+        *match_start = *start;
+      if (match_end)
+        *match_end = *start;
+      return TRUE;
+    }
+
+  line = next = *start;
+  if (gtk_text_iter_get_line_offset (&next) == 0)
+    {
+      if (!gtk_text_iter_backward_line (&next))
+        return FALSE;
+    }
+  else
+    {
+      gtk_text_iter_set_line_offset (&next, 0);
+    }
+
+  if (slice)
+    {
+      if (visible_only)
+        line_text = gtk_text_iter_get_visible_slice (&next, &line);
+      else
+        line_text = gtk_text_iter_get_slice (&next, &line);
+    }
+  else
+    {
+      if (visible_only)
+        line_text = gtk_text_iter_get_visible_text (&next, &line);
+      else
+        line_text = gtk_text_iter_get_text (&next, &line);
+    }
+
+  if (match_start) /* if this is the first line we're matching */
+    {
+      found = g_utf8_strrcasestr (line_text, *lines);
+    }
+  else
+    {
+      /* If it's not the first line, we have to match from the
+       * start of the line.
+       */
+      if (g_utf8_caselessnmatch (line_text, *lines, strlen (line_text),
+               strlen (*lines)))
+        found = line_text;
+      else
+        found = NULL;
+    }
+
+  if (found == NULL)
+    {
+      g_free (line_text);
+      return FALSE;
+    }
+
+  /* Get offset to start of search string */
+  offset = g_utf8_strlen (line_text, found - line_text);
+
+  forward_chars_with_skipping (&next, offset, visible_only, !slice, FALSE);
+
+  /* If match start needs to be returned, set it to the
+   * start of the search string.
+   */
+  if (match_start)
+    {
+      *match_start = next;
+    }
+
+  /* Go to end of search string */
+  forward_chars_with_skipping (&next, g_utf8_strlen (*lines, -1), visible_only,
+      !slice, TRUE);
+
+  g_free (line_text);
+
+  ++lines;
+
+  if (match_end)
+    *match_end = next;
+
+  /* try to match the rest of the lines forward, passing NULL
+   * for match_start so lines_match will try to match the entire
+   * line */
+  return lines_match (&next, lines, visible_only, slice, NULL, match_end);
 }
 
 gboolean
-empathy_text_iter_backward_search (const GtkTextIter   *iter,
-				  const gchar         *str,
-				  GtkTextIter         *match_start,
-				  GtkTextIter         *match_end,
-				  const GtkTextIter   *limit)
-{
-	gchar **lines = NULL;
-	GtkTextIter match;
-	gboolean retval = FALSE;
-	GtkTextIter search;
-	gboolean visible_only;
-	gboolean slice;
-
-	g_return_val_if_fail (iter != NULL, FALSE);
-	g_return_val_if_fail (str != NULL, FALSE);
-
-	if (limit && gtk_text_iter_compare (iter, limit) <= 0)
-		return FALSE;
-
-	if (*str == '\0')
-	{
-		/* If we can move one char, return the empty string there */
-		match = *iter;
-
-		if (gtk_text_iter_backward_char (&match))
-		{
-			if (limit && gtk_text_iter_equal (&match, limit))
-				return FALSE;
-
-			if (match_start)
-				*match_start = match;
-			if (match_end)
-				*match_end = match;
-			return TRUE;
-		}
-		else
-		{
-			return FALSE;
-		}
-	}
-
-	visible_only = TRUE;
-	slice = TRUE;
-
-	/* locate all lines */
-	lines = strbreakup (str, "\n", -1);
-
-	search = *iter;
-
-	while (TRUE)
-	{
-		/* This loop has an inefficient worst-case, where
-		 * gtk_text_iter_get_text () is called repeatedly on
-		 * a single line.
-		 */
-		GtkTextIter end;
-
-		if (limit && gtk_text_iter_compare (&search, limit) <= 0)
-			break;
-
-		if (backward_lines_match (&search, (const gchar**)lines,
-					  visible_only, slice, &match, &end))
-		{
-			if (limit == NULL || (limit &&
-					      gtk_text_iter_compare (&end, limit) > 0))
-			{
-				retval = TRUE;
-
-				if (match_start)
-					*match_start = match;
-				if (match_end)
-					*match_end = end;
-			}
-			break;
-		}
-
-		if (gtk_text_iter_get_line_offset (&search) == 0)
-		{
-			if (!gtk_text_iter_backward_line (&search))
-				break;
-		}
-		else
-		{
-			gtk_text_iter_set_line_offset (&search, 0);
-		}
-	}
-
-	g_strfreev ((gchar **) lines);
-
-	return retval;
+empathy_text_iter_backward_search (const GtkTextIter *iter,
+    const gchar *str,
+    GtkTextIter *match_start,
+    GtkTextIter *match_end,
+    const GtkTextIter *limit)
+{
+  gchar **lines = NULL;
+  GtkTextIter match;
+  gboolean retval = FALSE;
+  GtkTextIter search;
+  gboolean visible_only;
+  gboolean slice;
+
+  g_return_val_if_fail (iter != NULL, FALSE);
+  g_return_val_if_fail (str != NULL, FALSE);
+
+  if (limit && gtk_text_iter_compare (iter, limit) <= 0)
+    return FALSE;
+
+  if (*str == '\0')
+    {
+      /* If we can move one char, return the empty string there */
+      match = *iter;
+
+      if (gtk_text_iter_backward_char (&match))
+        {
+          if (limit && gtk_text_iter_equal (&match, limit))
+            return FALSE;
+
+          if (match_start)
+            *match_start = match;
+          if (match_end)
+            *match_end = match;
+          return TRUE;
+        }
+      else
+        {
+          return FALSE;
+        }
+    }
+
+  visible_only = TRUE;
+  slice = TRUE;
+
+  /* locate all lines */
+  lines = strbreakup (str, "\n", -1);
+
+  search = *iter;
+
+  while (TRUE)
+    {
+      /* This loop has an inefficient worst-case, where
+       * gtk_text_iter_get_text () is called repeatedly on
+       * a single line.
+       */
+      GtkTextIter end;
+
+      if (limit && gtk_text_iter_compare (&search, limit) <= 0)
+        break;
+
+      if (backward_lines_match (&search, (const gchar**)lines,
+              visible_only, slice, &match, &end))
+        {
+          if (limit == NULL || (limit &&
+                    gtk_text_iter_compare (&end, limit) > 0))
+            {
+              retval = TRUE;
+
+              if (match_start)
+                *match_start = match;
+              if (match_end)
+                *match_end = end;
+            }
+          break;
+        }
+
+      if (gtk_text_iter_get_line_offset (&search) == 0)
+        {
+          if (!gtk_text_iter_backward_line (&search))
+            break;
+        }
+      else
+      {
+        gtk_text_iter_set_line_offset (&search, 0);
+      }
+    }
+
+  g_strfreev ((gchar **) lines);
+
+  return retval;
 }
 
 /* Takes care of moving the window to the current workspace. */
 void
 empathy_window_present_with_time (GtkWindow *window,
-			guint32 timestamp)
+    guint32 timestamp)
 {
-	GdkWindow *gdk_window;
-
-	g_return_if_fail (GTK_IS_WINDOW (window));
+  GdkWindow *gdk_window;
 
-	/* Move the window to the current workspace before trying to show it.
-	 * This is the behaviour people expect when clicking on the statusbar icon. */
-	gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
-	if (gdk_window) {
-		gint x, y;
-		gint w, h;
+  g_return_if_fail (GTK_IS_WINDOW (window));
 
-		/* Has no effect if the WM has viewports, like compiz */
-		gdk_x11_window_move_to_current_desktop (gdk_window);
+  /* Move the window to the current workspace before trying to show it.
+   * This is the behaviour people expect when clicking on the statusbar icon. */
+  gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
 
-		/* If window is still off-screen, hide it to force it to
-		 * reposition on the current workspace. */
-		gtk_window_get_position (window, &x, &y);
-		gtk_window_get_size (window, &w, &h);
-		if (!EMPATHY_RECT_IS_ON_SCREEN (x, y, w, h))
-			gtk_widget_hide (GTK_WIDGET (window));
-	}
+  if (gdk_window)
+    {
+      gint x, y;
+      gint w, h;
+
+      /* Has no effect if the WM has viewports, like compiz */
+      gdk_x11_window_move_to_current_desktop (gdk_window);
+
+      /* If window is still off-screen, hide it to force it to
+       * reposition on the current workspace. */
+      gtk_window_get_position (window, &x, &y);
+      gtk_window_get_size (window, &w, &h);
+      if (!EMPATHY_RECT_IS_ON_SCREEN (x, y, w, h))
+        gtk_widget_hide (GTK_WIDGET (window));
+    }
 
-	if (timestamp == GDK_CURRENT_TIME)
-		gtk_window_present (window);
-	else
-		gtk_window_present_with_time (window, timestamp);
+  if (timestamp == GDK_CURRENT_TIME)
+    gtk_window_present (window);
+  else
+    gtk_window_present_with_time (window, timestamp);
 }
 
 void
@@ -1676,17 +1729,16 @@ empathy_window_present (GtkWindow *window)
 GtkWindow *
 empathy_get_toplevel_window (GtkWidget *widget)
 {
-	GtkWidget *toplevel;
+  GtkWidget *toplevel;
 
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
 
-	toplevel = gtk_widget_get_toplevel (widget);
-	if (GTK_IS_WINDOW (toplevel) &&
-	    gtk_widget_is_toplevel (toplevel)) {
-		return GTK_WINDOW (toplevel);
-	}
+  toplevel = gtk_widget_get_toplevel (widget);
+  if (GTK_IS_WINDOW (toplevel) &&
+      gtk_widget_is_toplevel (toplevel))
+    return GTK_WINDOW (toplevel);
 
-	return NULL;
+  return NULL;
 }
 
 /** empathy_make_absolute_url_len:
@@ -1697,21 +1749,19 @@ empathy_get_toplevel_window (GtkWidget *widget)
  */
 gchar *
 empathy_make_absolute_url_len (const gchar *url,
-			       guint len)
+    guint len)
 {
-	g_return_val_if_fail (url != NULL, NULL);
+  g_return_val_if_fail (url != NULL, NULL);
 
-	if (g_str_has_prefix (url, "help:") ||
-	    g_str_has_prefix (url, "mailto:") ||
-	    strstr (url, ":/")) {
-		return g_strndup (url, len);
-	}
+  if (g_str_has_prefix (url, "help:") ||
+      g_str_has_prefix (url, "mailto:") ||
+      strstr (url, ":/"))
+    return g_strndup (url, len);
 
-	if (strstr (url, "@")) {
-		return g_strdup_printf ("mailto:%.*s", len, url);
-	}
+  if (strstr (url, "@"))
+    return g_strdup_printf ("mailto:%.*s", len, url);
 
-	return g_strdup_printf ("http://%.*s", len, url);
+  return g_strdup_printf ("http://%.*s", len, url);
 }
 
 /** empathy_make_absolute_url:
@@ -1728,323 +1778,330 @@ empathy_make_absolute_url_len (const gchar *url,
 gchar *
 empathy_make_absolute_url (const gchar *url)
 {
-	return empathy_make_absolute_url_len (url, strlen (url));
+  return empathy_make_absolute_url_len (url, strlen (url));
 }
 
 void
 empathy_url_show (GtkWidget *parent,
-		  const char *url)
+      const char *url)
 {
-	gchar  *real_url;
-	GError *error = NULL;
+  gchar  *real_url;
+  GError *error = NULL;
 
-	g_return_if_fail (parent == NULL || GTK_IS_WIDGET (parent));
-	g_return_if_fail (url != NULL);
+  g_return_if_fail (parent == NULL || GTK_IS_WIDGET (parent));
+  g_return_if_fail (url != NULL);
 
-	real_url = empathy_make_absolute_url (url);
+  real_url = empathy_make_absolute_url (url);
 
-	gtk_show_uri (parent ? gtk_widget_get_screen (parent) : NULL, real_url,
-		      gtk_get_current_event_time (), &error);
+  gtk_show_uri (parent ? gtk_widget_get_screen (parent) : NULL, real_url,
+      gtk_get_current_event_time (), &error);
 
-	if (error) {
-		GtkWidget *dialog;
+  if (error)
+    {
+      GtkWidget *dialog;
+
+      dialog = gtk_message_dialog_new (NULL, 0,
+          GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+          _("Unable to open URI"));
 
-		dialog = gtk_message_dialog_new (NULL, 0,
-						 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-						 _("Unable to open URI"));
-		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-							  "%s", error->message);
+      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+          "%s", error->message);
 
-		g_signal_connect (dialog, "response",
-				  G_CALLBACK (gtk_widget_destroy),
-				  NULL);
-		gtk_window_present (GTK_WINDOW (dialog));
+      g_signal_connect (dialog, "response",
+            G_CALLBACK (gtk_widget_destroy), NULL);
 
-		g_clear_error (&error);
-	}
+      gtk_window_present (GTK_WINDOW (dialog));
 
-	g_free (real_url);
+      g_clear_error (&error);
+    }
+
+  g_free (real_url);
 }
 
 void
-empathy_send_file (EmpathyContact *contact, GFile *file)
+empathy_send_file (EmpathyContact *contact,
+    GFile *file)
 {
-	EmpathyFTFactory *factory;
-	GtkRecentManager *manager;
-	gchar *uri;
+  EmpathyFTFactory *factory;
+  GtkRecentManager *manager;
+  gchar *uri;
 
-	g_return_if_fail (EMPATHY_IS_CONTACT (contact));
-	g_return_if_fail (G_IS_FILE (file));
+  g_return_if_fail (EMPATHY_IS_CONTACT (contact));
+  g_return_if_fail (G_IS_FILE (file));
 
-	factory = empathy_ft_factory_dup_singleton ();
+  factory = empathy_ft_factory_dup_singleton ();
 
-	empathy_ft_factory_new_transfer_outgoing (factory, contact, file,
-		empathy_get_current_action_time ());
+  empathy_ft_factory_new_transfer_outgoing (factory, contact, file,
+      empathy_get_current_action_time ());
 
-	uri = g_file_get_uri (file);
-	manager = gtk_recent_manager_get_default ();
-	gtk_recent_manager_add_item (manager, uri);
-	g_free (uri);
+  uri = g_file_get_uri (file);
+  manager = gtk_recent_manager_get_default ();
+  gtk_recent_manager_add_item (manager, uri);
+  g_free (uri);
 
-	g_object_unref (factory);
+  g_object_unref (factory);
 }
 
 void
-empathy_send_file_from_uri_list (EmpathyContact *contact, const gchar *uri_list)
-{
-	const gchar *nl;
-	GFile *file;
-
-	/* Only handle a single file for now.  It would be wicked cool to be
-	   able to do multiple files, offering to zip them or whatever like
-	   nautilus-sendto does.  Note that text/uri-list is defined to have
-	   each line terminated by \r\n, but we can be tolerant of applications
-	   that only use \n or don't terminate single-line entries.
-	*/
-	nl = strstr (uri_list, "\r\n");
-	if (!nl) {
-		nl = strchr (uri_list, '\n');
-	}
-	if (nl) {
-		gchar *uri = g_strndup (uri_list, nl - uri_list);
-		file = g_file_new_for_uri (uri);
-		g_free (uri);
-	}
-	else {
-		file = g_file_new_for_uri (uri_list);
-	}
-
-	empathy_send_file (contact, file);
-
-	g_object_unref (file);
+empathy_send_file_from_uri_list (EmpathyContact *contact,
+    const gchar *uri_list)
+{
+  const gchar *nl;
+  GFile *file;
+
+  /* Only handle a single file for now. It would be wicked cool to be
+     able to do multiple files, offering to zip them or whatever like
+     nautilus-sendto does. Note that text/uri-list is defined to have
+     each line terminated by \r\n, but we can be tolerant of applications
+     that only use \n or don't terminate single-line entries.
+  */
+  nl = strstr (uri_list, "\r\n");
+  if (!nl)
+    nl = strchr (uri_list, '\n');
+
+  if (nl)
+    {
+      gchar *uri = g_strndup (uri_list, nl - uri_list);
+      file = g_file_new_for_uri (uri);
+      g_free (uri);
+    }
+  else
+    {
+      file = g_file_new_for_uri (uri_list);
+    }
+
+  empathy_send_file (contact, file);
+
+  g_object_unref (file);
 }
 
 static void
-file_manager_send_file_response_cb (GtkDialog      *widget,
-				    gint            response_id,
-				    EmpathyContact *contact)
+file_manager_send_file_response_cb (GtkDialog *widget,
+    gint response_id,
+    EmpathyContact *contact)
 {
-	GFile *file;
+  GFile *file;
 
-	if (response_id == GTK_RESPONSE_OK) {
-		file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (widget));
+  if (response_id == GTK_RESPONSE_OK)
+    {
+      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (widget));
 
-		empathy_send_file (contact, file);
+      empathy_send_file (contact, file);
 
-		g_object_unref (file);
-	}
+      g_object_unref (file);
+    }
 
-	g_object_unref (contact);
-	gtk_widget_destroy (GTK_WIDGET (widget));
+  g_object_unref (contact);
+  gtk_widget_destroy (GTK_WIDGET (widget));
 }
 
 static gboolean
 filter_cb (const GtkFileFilterInfo *filter_info,
-		gpointer data)
+    gpointer data)
 {
-	/* filter out socket files */
-	return tp_strdiff (filter_info->mime_type, "inode/socket");
+  /* filter out socket files */
+  return tp_strdiff (filter_info->mime_type, "inode/socket");
 }
 
 static GtkFileFilter *
 create_file_filter (void)
 {
-	GtkFileFilter *filter;
+  GtkFileFilter *filter;
 
-	filter = gtk_file_filter_new ();
+  filter = gtk_file_filter_new ();
 
-	gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_MIME_TYPE, filter_cb,
-		NULL, NULL);
+  gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_MIME_TYPE, filter_cb,
+    NULL, NULL);
 
-	return filter;
+  return filter;
 }
 
 void
 empathy_send_file_with_file_chooser (EmpathyContact *contact)
 {
-	GtkWidget               *widget;
-	GtkWidget               *button;
+  GtkWidget *widget;
+  GtkWidget *button;
+
+  g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
-	g_return_if_fail (EMPATHY_IS_CONTACT (contact));
+  DEBUG ("Creating selection file chooser");
 
-	DEBUG ("Creating selection file chooser");
+  widget = gtk_file_chooser_dialog_new (_("Select a file"), NULL,
+      GTK_FILE_CHOOSER_ACTION_OPEN,
+      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+      NULL);
 
-	widget = gtk_file_chooser_dialog_new (_("Select a file"),
-					      NULL,
-					      GTK_FILE_CHOOSER_ACTION_OPEN,
-					      GTK_STOCK_CANCEL,
-					      GTK_RESPONSE_CANCEL,
-					      NULL);
+  /* send button */
+  button = gtk_button_new_with_mnemonic (_("_Send"));
+  gtk_button_set_image (GTK_BUTTON (button),
+      gtk_image_new_from_icon_name (EMPATHY_IMAGE_DOCUMENT_SEND,
+        GTK_ICON_SIZE_BUTTON));
+  gtk_widget_show (button);
 
-	/* send button */
-	button = gtk_button_new_with_mnemonic (_("_Send"));
-	gtk_button_set_image (GTK_BUTTON (button),
-		gtk_image_new_from_icon_name (EMPATHY_IMAGE_DOCUMENT_SEND,
-					      GTK_ICON_SIZE_BUTTON));
-	gtk_widget_show (button);
-	gtk_dialog_add_action_widget (GTK_DIALOG (widget), button,
-				      GTK_RESPONSE_OK);
-	gtk_widget_set_can_default (button, TRUE);
-	gtk_dialog_set_default_response (GTK_DIALOG (widget),
-					 GTK_RESPONSE_OK);
+  gtk_dialog_add_action_widget (GTK_DIALOG (widget), button,
+      GTK_RESPONSE_OK);
 
-	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), FALSE);
+  gtk_widget_set_can_default (button, TRUE);
+  gtk_dialog_set_default_response (GTK_DIALOG (widget),
+      GTK_RESPONSE_OK);
 
-	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget),
-		g_get_home_dir ());
+  gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), FALSE);
 
-	gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget),
-		create_file_filter ());
+  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget),
+      g_get_home_dir ());
 
-	g_signal_connect (widget, "response",
-			  G_CALLBACK (file_manager_send_file_response_cb),
-			  g_object_ref (contact));
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget),
+      create_file_filter ());
 
-	gtk_widget_show (widget);
+  g_signal_connect (widget, "response",
+      G_CALLBACK (file_manager_send_file_response_cb), g_object_ref (contact));
+
+  gtk_widget_show (widget);
 }
 
 static void
 file_manager_receive_file_response_cb (GtkDialog *dialog,
-				       GtkResponseType response,
-				       EmpathyFTHandler *handler)
+    GtkResponseType response,
+    EmpathyFTHandler *handler)
 {
-	EmpathyFTFactory *factory;
-	GFile *file;
+  EmpathyFTFactory *factory;
+  GFile *file;
 
-	if (response == GTK_RESPONSE_OK) {
-		GFile *parent;
-		GFileInfo *info;
-		guint64 free_space, file_size;
-		GError *error = NULL;
+  if (response == GTK_RESPONSE_OK)
+    {
+      GFile *parent;
+      GFileInfo *info;
+      guint64 free_space, file_size;
+      GError *error = NULL;
 
-		file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
-		parent = g_file_get_parent (file);
-		info = g_file_query_filesystem_info (parent,
-				G_FILE_ATTRIBUTE_FILESYSTEM_FREE,
-				NULL, &error);
+      file = gtk_file_chooser_get_file (GTK_FILE_CHOOSER (dialog));
+      parent = g_file_get_parent (file);
+      info = g_file_query_filesystem_info (parent,
+          G_FILE_ATTRIBUTE_FILESYSTEM_FREE, NULL, &error);
 
-		g_object_unref (parent);
+      g_object_unref (parent);
 
-		if (error != NULL) {
-			g_warning ("Error: %s", error->message);
+      if (error != NULL)
+        {
+          g_warning ("Error: %s", error->message);
 
-			g_object_unref (file);
-			return;
-		}
+          g_object_unref (file);
+          return;
+        }
 
-		free_space = g_file_info_get_attribute_uint64 (info,
-				G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
-		file_size = empathy_ft_handler_get_total_bytes (handler);
+      free_space = g_file_info_get_attribute_uint64 (info,
+          G_FILE_ATTRIBUTE_FILESYSTEM_FREE);
+      file_size = empathy_ft_handler_get_total_bytes (handler);
 
-		g_object_unref (info);
+      g_object_unref (info);
 
-		if (file_size > free_space) {
-			GtkWidget *message = gtk_message_dialog_new (
-				GTK_WINDOW (dialog),
-				GTK_DIALOG_MODAL,
-				GTK_MESSAGE_ERROR,
-				GTK_BUTTONS_CLOSE,
-				_("Insufficient free space to save file"));
-			char *file_size_str, *free_space_str;
+      if (file_size > free_space)
+        {
+          GtkWidget *message = gtk_message_dialog_new (GTK_WINDOW (dialog),
+            GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR,
+            GTK_BUTTONS_CLOSE,
+            _("Insufficient free space to save file"));
+          char *file_size_str, *free_space_str;
 
-			file_size_str = g_format_size (file_size);
-			free_space_str = g_format_size (free_space);
+          file_size_str = g_format_size (file_size);
+          free_space_str = g_format_size (free_space);
 
-			gtk_message_dialog_format_secondary_text (
-				GTK_MESSAGE_DIALOG (message),
-				_("%s of free space are required to save this "
-				  "file, but only %s is available. Please "
-				  "choose another location."),
-				file_size_str, free_space_str);
+          gtk_message_dialog_format_secondary_text (
+              GTK_MESSAGE_DIALOG (message),
+              _("%s of free space are required to save this "
+                "file, but only %s is available. Please "
+                "choose another location."),
+            file_size_str, free_space_str);
 
-			gtk_dialog_run (GTK_DIALOG (message));
+          gtk_dialog_run (GTK_DIALOG (message));
 
-			g_free (file_size_str);
-			g_free (free_space_str);
-			gtk_widget_destroy (message);
+          g_free (file_size_str);
+          g_free (free_space_str);
+          gtk_widget_destroy (message);
 
-			g_object_unref (file);
+          g_object_unref (file);
 
-			return;
-		}
+          return;
+        }
 
-		factory = empathy_ft_factory_dup_singleton ();
+      factory = empathy_ft_factory_dup_singleton ();
 
-		empathy_ft_factory_set_destination_for_incoming_handler (
-				factory, handler, file);
+      empathy_ft_factory_set_destination_for_incoming_handler (
+          factory, handler, file);
 
-		g_object_unref (factory);
-		g_object_unref (file);
-	} else {
-		/* unref the handler, as we dismissed the file chooser,
-		 * and refused the transfer.
-		 */
-		g_object_unref (handler);
-	}
+      g_object_unref (factory);
+      g_object_unref (file);
+    }
+  else
+    {
+      /* unref the handler, as we dismissed the file chooser,
+       * and refused the transfer.
+       */
+      g_object_unref (handler);
+    }
 
-	gtk_widget_destroy (GTK_WIDGET (dialog));
+  gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
 void
 empathy_receive_file_with_file_chooser (EmpathyFTHandler *handler)
 {
-	GtkWidget *widget;
-	const gchar *dir;
-	EmpathyContact *contact;
-	gchar *title;
+  GtkWidget *widget;
+  const gchar *dir;
+  EmpathyContact *contact;
+  gchar *title;
+
+  contact = empathy_ft_handler_get_contact (handler);
+  g_assert (contact != NULL);
+
+  title = g_strdup_printf (_("Incoming file from %s"),
+    empathy_contact_get_alias (contact));
 
-	contact = empathy_ft_handler_get_contact (handler);
-	g_assert (contact != NULL);
+  widget = gtk_file_chooser_dialog_new (title,
+      NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
+      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+      GTK_STOCK_SAVE, GTK_RESPONSE_OK,
+      NULL);
 
-	title = g_strdup_printf (_("Incoming file from %s"),
-		empathy_contact_get_alias (contact));
+  gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (widget),
+    empathy_ft_handler_get_filename (handler));
 
-	widget = gtk_file_chooser_dialog_new (title,
-					      NULL,
-					      GTK_FILE_CHOOSER_ACTION_SAVE,
-					      GTK_STOCK_CANCEL,
-					      GTK_RESPONSE_CANCEL,
-					      GTK_STOCK_SAVE,
-					      GTK_RESPONSE_OK,
-					      NULL);
-	gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (widget),
-		empathy_ft_handler_get_filename (handler));
-	gtk_file_chooser_set_do_overwrite_confirmation
-		(GTK_FILE_CHOOSER (widget), TRUE);
+  gtk_file_chooser_set_do_overwrite_confirmation
+    (GTK_FILE_CHOOSER (widget), TRUE);
 
-	dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD);
-	if (dir == NULL)
-		/* Fallback to $HOME if $XDG_DOWNLOAD_DIR is not set */
-		dir = g_get_home_dir ();
+  dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD);
+  if (dir == NULL)
+    /* Fallback to $HOME if $XDG_DOWNLOAD_DIR is not set */
+    dir = g_get_home_dir ();
 
-	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), dir);
+  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), dir);
 
-	g_signal_connect (widget, "response",
-		G_CALLBACK (file_manager_receive_file_response_cb), handler);
+  g_signal_connect (widget, "response",
+      G_CALLBACK (file_manager_receive_file_response_cb), handler);
 
-	gtk_widget_show (widget);
-	g_free (title);
+  gtk_widget_show (widget);
+  g_free (title);
 }
 
 void
 empathy_make_color_whiter (GdkRGBA *color)
 {
-	const GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 };
+  const GdkRGBA white = { 1.0, 1.0, 1.0, 1.0 };
 
-	color->red = (color->red + white.red) / 2;
-	color->green = (color->green + white.green) / 2;
-	color->blue = (color->blue + white.blue) / 2;
+  color->red = (color->red + white.red) / 2;
+  color->green = (color->green + white.green) / 2;
+  color->blue = (color->blue + white.blue) / 2;
 }
 
 static void
 menu_deactivate_cb (GtkMenu *menu,
-	gpointer user_data)
+  gpointer user_data)
 {
-	/* FIXME: we shouldn't have to disconnect the signal (bgo #641327) */
-	g_signal_handlers_disconnect_by_func (menu,
-		     menu_deactivate_cb, user_data);
+  /* FIXME: we shouldn't have to disconnect the signal (bgo #641327) */
+  g_signal_handlers_disconnect_by_func (menu,
+         menu_deactivate_cb, user_data);
 
-	gtk_menu_detach (menu);
+  gtk_menu_detach (menu);
 }
 
 /* Convenient function to create a GtkMenu attached to @attach_to and detach
@@ -2053,21 +2110,21 @@ menu_deactivate_cb (GtkMenu *menu,
 GtkWidget *
 empathy_context_menu_new (GtkWidget *attach_to)
 {
-	GtkWidget *menu;
+  GtkWidget *menu;
 
-	menu = gtk_menu_new ();
+  menu = gtk_menu_new ();
 
-	gtk_menu_attach_to_widget (GTK_MENU (menu), attach_to, NULL);
+  gtk_menu_attach_to_widget (GTK_MENU (menu), attach_to, NULL);
 
-	/* menu is initially unowned but gtk_menu_attach_to_widget () taked its
-	 * floating ref. We can either wait that @attach_to releases its ref when
-	 * it will be destroyed (when leaving Empathy most of the time) or explicitely
-	 * detach the menu when it's not displayed any more.
-	 * We go for the latter as we don't want to keep useless menus in memory
-	 * during the whole lifetime of Empathy. */
-	g_signal_connect (menu, "deactivate", G_CALLBACK (menu_deactivate_cb), NULL);
+  /* menu is initially unowned but gtk_menu_attach_to_widget () taked its
+   * floating ref. We can either wait that @attach_to releases its ref when
+   * it will be destroyed (when leaving Empathy most of the time) or explicitely
+   * detach the menu when it's not displayed any more.
+   * We go for the latter as we don't want to keep useless menus in memory
+   * during the whole lifetime of Empathy. */
+  g_signal_connect (menu, "deactivate", G_CALLBACK (menu_deactivate_cb), NULL);
 
-	return menu;
+  return menu;
 }
 
 gint64
@@ -2201,8 +2258,8 @@ _wnck_activate_workspace (Screen *screen,
     Time timestamp)
 {
   Display *display;
-  Window   root;
-  XEvent   xev;
+  Window root;
+  XEvent xev;
 
   display = DisplayOfScreen (screen);
   root = RootWindowOfScreen (screen);
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,