theme-manager: port to new coding style

2 files changed, 308 insertions, 269 deletions

diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index 4635ed60d..bab128e70 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -1,7 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2008 Collabora Ltd.
+ * Copyright (C) 2008-2012 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -43,20 +42,23 @@
 #include <libempathy/empathy-debug.h>
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyThemeManager)
-typedef struct {
-	GSettings   *gsettings_chat;
-	guint        emit_changed_idle;
-	gboolean     in_constructor;
-
-	EmpathyAdiumData *adium_data;
-	gchar *adium_variant;
-	/* list of weakref to EmpathyThemeAdium objects */
-	GList *adium_views;
+
+typedef struct
+{
+  GSettings   *gsettings_chat;
+  guint        emit_changed_idle;
+  gboolean     in_constructor;
+
+  EmpathyAdiumData *adium_data;
+  gchar *adium_variant;
+  /* list of weakref to EmpathyThemeAdium objects */
+  GList *adium_views;
 } EmpathyThemeManagerPriv;
 
-enum {
-	THEME_CHANGED,
-	LAST_SIGNAL
+enum
+{
+  THEME_CHANGED,
+  LAST_SIGNAL
 };
 
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -66,343 +68,363 @@ G_DEFINE_TYPE (EmpathyThemeManager, empathy_theme_manager, G_TYPE_OBJECT);
 static gboolean
 theme_manager_emit_changed_idle_cb (gpointer manager)
 {
-	EmpathyThemeManagerPriv *priv = GET_PRIV (manager);
-	const gchar *adium_path = NULL;
+  EmpathyThemeManagerPriv *priv = GET_PRIV (manager);
+  const gchar *adium_path = NULL;
+
+  if (priv->adium_data)
+    adium_path = empathy_adium_data_get_path (priv->adium_data);
 
-	if (priv->adium_data) {
-		adium_path = empathy_adium_data_get_path (priv->adium_data);
-	}
-	DEBUG ("Emit theme-changed with: adium_path='%s' "
-	       "adium_variant='%s'", adium_path,
-	       priv->adium_variant);
+  DEBUG ("Emit theme-changed with: adium_path='%s' "
+      "adium_variant='%s'", adium_path, priv->adium_variant);
 
-	g_signal_emit (manager, signals[THEME_CHANGED], 0, NULL);
-	priv->emit_changed_idle = 0;
+  g_signal_emit (manager, signals[THEME_CHANGED], 0, NULL);
+  priv->emit_changed_idle = 0;
 
-	return FALSE;
+  return FALSE;
 }
 
 static void
 theme_manager_emit_changed (EmpathyThemeManager *manager)
 {
-	EmpathyThemeManagerPriv *priv = GET_PRIV (manager);
-
-	/* We emit the signal in idle callback to be sure we emit it only once
-	 * in the case both the name and adium_path changed */
-	if (priv->emit_changed_idle == 0 && !priv->in_constructor) {
-		priv->emit_changed_idle = g_idle_add (
-			theme_manager_emit_changed_idle_cb, manager);
-	}
+  EmpathyThemeManagerPriv *priv = GET_PRIV (manager);
+
+  /* We emit the signal in idle callback to be sure we emit it only once
+   * in the case both the name and adium_path changed */
+  if (priv->emit_changed_idle == 0 && !priv->in_constructor)
+    {
+      priv->emit_changed_idle = g_idle_add (
+        theme_manager_emit_changed_idle_cb, manager);
+    }
 }
 
 static void
 theme_manager_view_weak_notify_cb (gpointer data,
-				    GObject *where_the_object_was)
+    GObject *where_the_object_was)
 {
-	GList **list = data;
-	*list = g_list_remove (*list, where_the_object_was);
+  GList **list = data;
+
+  *list = g_list_remove (*list, where_the_object_was);
 }
 
 static void
 clear_list_of_views (GList **views)
 {
-	while (*views) {
-		g_object_weak_unref ((*views)->data,
-				     theme_manager_view_weak_notify_cb,
-				     views);
-		*views = g_list_delete_link (*views, *views);
-	}
+  while (*views)
+    {
+      g_object_weak_unref ((*views)->data,
+               theme_manager_view_weak_notify_cb,
+               views);
+
+      *views = g_list_delete_link (*views, *views);
+    }
 }
 
 static EmpathyThemeAdium *
 theme_manager_create_adium_view (EmpathyThemeManager *manager)
 {
-	EmpathyThemeManagerPriv *priv = GET_PRIV (manager);
-	EmpathyThemeAdium *theme;
+  EmpathyThemeManagerPriv *priv = GET_PRIV (manager);
+  EmpathyThemeAdium *theme;
+
+  theme = empathy_theme_adium_new (priv->adium_data, priv->adium_variant);
+
+  priv->adium_views = g_list_prepend (priv->adium_views, theme);
 
-	theme = empathy_theme_adium_new (priv->adium_data, priv->adium_variant);
-	priv->adium_views = g_list_prepend (priv->adium_views, theme);
-	g_object_weak_ref (G_OBJECT (theme),
-			   theme_manager_view_weak_notify_cb,
-			   &priv->adium_views);
+  g_object_weak_ref (G_OBJECT (theme),
+         theme_manager_view_weak_notify_cb,
+         &priv->adium_views);
 
-	return theme;
+  return theme;
 }
 
 static void
-theme_manager_notify_adium_path_cb (GSettings   *gsettings_chat,
-				    const gchar *key,
-				    gpointer     user_data)
+theme_manager_notify_adium_path_cb (GSettings *gsettings_chat,
+    const gchar *key,
+    gpointer user_data)
 {
-	EmpathyThemeManager     *manager = EMPATHY_THEME_MANAGER (user_data);
-	EmpathyThemeManagerPriv *priv = GET_PRIV (manager);
-	const gchar             *current_path = NULL;
-	gchar                   *new_path;
-
-	new_path = g_settings_get_string (gsettings_chat, key);
-
-	if (priv->adium_data != NULL) {
-		current_path = empathy_adium_data_get_path (priv->adium_data);
-	}
-
-	/* If path did not really changed, ignore */
-	if (!tp_strdiff (current_path, new_path)) {
-		goto finally;
-	}
-
-	/* If path does not really contains an adium path, ignore */
-	if (empathy_adium_path_is_valid (new_path)) {
-		/* pass */
-	} else if (empathy_theme_manager_find_theme (new_path) != NULL) {
-		new_path = empathy_theme_manager_find_theme (new_path);
-	} else {
-		g_warning ("Do not understand theme: %s", new_path);
-		goto finally;
-	}
-
-	/* Load new theme data, we can stop tracking existing views since we
-	 * won't be able to change them live anymore */
-	clear_list_of_views (&priv->adium_views);
-	tp_clear_pointer (&priv->adium_data, empathy_adium_data_unref);
-	priv->adium_data = empathy_adium_data_new (new_path);
-
-	theme_manager_emit_changed (manager);
+  EmpathyThemeManager *manager = EMPATHY_THEME_MANAGER (user_data);
+  EmpathyThemeManagerPriv *priv = GET_PRIV (manager);
+  const gchar *current_path = NULL;
+  gchar *new_path;
+
+  new_path = g_settings_get_string (gsettings_chat, key);
+
+  if (priv->adium_data != NULL)
+    current_path = empathy_adium_data_get_path (priv->adium_data);
+
+  /* If path did not really changed, ignore */
+  if (!tp_strdiff (current_path, new_path))
+    goto finally;
+
+  /* If path does not really contains an adium path, ignore */
+  if (empathy_adium_path_is_valid (new_path))
+    {
+      /* pass */
+    }
+  else if (empathy_theme_manager_find_theme (new_path) != NULL)
+    {
+      new_path = empathy_theme_manager_find_theme (new_path);
+    }
+  else
+    {
+      g_warning ("Do not understand theme: %s", new_path);
+      goto finally;
+    }
+
+  /* Load new theme data, we can stop tracking existing views since we
+   * won't be able to change them live anymore */
+  clear_list_of_views (&priv->adium_views);
+  tp_clear_pointer (&priv->adium_data, empathy_adium_data_unref);
+  priv->adium_data = empathy_adium_data_new (new_path);
+
+  theme_manager_emit_changed (manager);
 
 finally:
-	g_free (new_path);
+  g_free (new_path);
 }
 
 static void
-theme_manager_notify_adium_variant_cb (GSettings   *gsettings_chat,
-				       const gchar *key,
-				       gpointer     user_data)
+theme_manager_notify_adium_variant_cb (GSettings *gsettings_chat,
+    const gchar *key,
+    gpointer user_data)
 {
-	EmpathyThemeManager     *manager = EMPATHY_THEME_MANAGER (user_data);
-	EmpathyThemeManagerPriv *priv = GET_PRIV (manager);
-	gchar                   *new_variant;
-	GList                   *l;
-
-	new_variant = g_settings_get_string (gsettings_chat, key);
-	if (!tp_strdiff (priv->adium_variant, new_variant)) {
-		g_free (new_variant);
-		return;
-	}
-
-	g_free (priv->adium_variant);
-	priv->adium_variant = new_variant;
-
-	for (l = priv->adium_views; l; l = l->next) {
-		empathy_theme_adium_set_variant (EMPATHY_THEME_ADIUM (l->data),
-			priv->adium_variant);
-	}
+  EmpathyThemeManager *manager = EMPATHY_THEME_MANAGER (user_data);
+  EmpathyThemeManagerPriv *priv = GET_PRIV (manager);
+  gchar *new_variant;
+  GList *l;
+
+  new_variant = g_settings_get_string (gsettings_chat, key);
+  if (!tp_strdiff (priv->adium_variant, new_variant))
+    {
+      g_free (new_variant);
+      return;
+    }
+
+  g_free (priv->adium_variant);
+  priv->adium_variant = new_variant;
+
+  for (l = priv->adium_views; l; l = l->next)
+    {
+      empathy_theme_adium_set_variant (EMPATHY_THEME_ADIUM (l->data),
+        priv->adium_variant);
+    }
 }
 
 EmpathyChatView *
 empathy_theme_manager_create_view (EmpathyThemeManager *manager)
 {
-	EmpathyThemeManagerPriv *priv = GET_PRIV (manager);
+  EmpathyThemeManagerPriv *priv = GET_PRIV (manager);
 
-	g_return_val_if_fail (EMPATHY_IS_THEME_MANAGER (manager), NULL);
+  g_return_val_if_fail (EMPATHY_IS_THEME_MANAGER (manager), NULL);
 
-	if (priv->adium_data != NULL)  {
-		return EMPATHY_CHAT_VIEW (theme_manager_create_adium_view (manager));
-	}
+  if (priv->adium_data != NULL)
+    return EMPATHY_CHAT_VIEW (theme_manager_create_adium_view (manager));
 
-	g_return_val_if_reached (NULL);
+  g_return_val_if_reached (NULL);
 }
 
 static void
 theme_manager_finalize (GObject *object)
 {
-	EmpathyThemeManagerPriv *priv = GET_PRIV (object);
+  EmpathyThemeManagerPriv *priv = GET_PRIV (object);
 
-	g_object_unref (priv->gsettings_chat);
+  g_object_unref (priv->gsettings_chat);
 
-	if (priv->emit_changed_idle != 0) {
-		g_source_remove (priv->emit_changed_idle);
-	}
+  if (priv->emit_changed_idle != 0)
+    g_source_remove (priv->emit_changed_idle);
 
-	clear_list_of_views (&priv->adium_views);
-	g_free (priv->adium_variant);
-	tp_clear_pointer (&priv->adium_data, empathy_adium_data_unref);
+  clear_list_of_views (&priv->adium_views);
+  g_free (priv->adium_variant);
+  tp_clear_pointer (&priv->adium_data, empathy_adium_data_unref);
 
-	G_OBJECT_CLASS (empathy_theme_manager_parent_class)->finalize (object);
+  G_OBJECT_CLASS (empathy_theme_manager_parent_class)->finalize (object);
 }
 
 static void
 empathy_theme_manager_class_init (EmpathyThemeManagerClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	signals[THEME_CHANGED] =
-		g_signal_new ("theme-changed",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      g_cclosure_marshal_generic,
-			      G_TYPE_NONE,
-			      0);
+  signals[THEME_CHANGED] = g_signal_new ("theme-changed",
+      G_OBJECT_CLASS_TYPE (object_class),
+      G_SIGNAL_RUN_LAST,
+      0,
+      NULL, NULL,
+      g_cclosure_marshal_generic,
+      G_TYPE_NONE,
+      0);
 
-	g_type_class_add_private (object_class, sizeof (EmpathyThemeManagerPriv));
+  g_type_class_add_private (object_class, sizeof (EmpathyThemeManagerPriv));
 
-	object_class->finalize = theme_manager_finalize;
+  object_class->finalize = theme_manager_finalize;
 }
 
 static void
 empathy_theme_manager_init (EmpathyThemeManager *manager)
 {
-	EmpathyThemeManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
-		EMPATHY_TYPE_THEME_MANAGER, EmpathyThemeManagerPriv);
-
-	manager->priv = priv;
-	priv->in_constructor = TRUE;
-
-	priv->gsettings_chat = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA);
-
-	/* Take the adium path/variant and track changes */
-	g_signal_connect (priv->gsettings_chat,
-			  "changed::" EMPATHY_PREFS_CHAT_ADIUM_PATH,
-			  G_CALLBACK (theme_manager_notify_adium_path_cb),
-			  manager);
-	theme_manager_notify_adium_path_cb (priv->gsettings_chat,
-					    EMPATHY_PREFS_CHAT_ADIUM_PATH,
-					    manager);
-
-	g_signal_connect (priv->gsettings_chat,
-			  "changed::" EMPATHY_PREFS_CHAT_THEME_VARIANT,
-			  G_CALLBACK (theme_manager_notify_adium_variant_cb),
-			  manager);
-	theme_manager_notify_adium_variant_cb (priv->gsettings_chat,
-					       EMPATHY_PREFS_CHAT_THEME_VARIANT,
-					       manager);
-	priv->in_constructor = FALSE;
+  EmpathyThemeManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
+    EMPATHY_TYPE_THEME_MANAGER, EmpathyThemeManagerPriv);
+
+  manager->priv = priv;
+  priv->in_constructor = TRUE;
+
+  priv->gsettings_chat = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA);
+
+  /* Take the adium path/variant and track changes */
+  g_signal_connect (priv->gsettings_chat,
+      "changed::" EMPATHY_PREFS_CHAT_ADIUM_PATH,
+      G_CALLBACK (theme_manager_notify_adium_path_cb), manager);
+
+  theme_manager_notify_adium_path_cb (priv->gsettings_chat,
+      EMPATHY_PREFS_CHAT_ADIUM_PATH,
+      manager);
+
+  g_signal_connect (priv->gsettings_chat,
+      "changed::" EMPATHY_PREFS_CHAT_THEME_VARIANT,
+      G_CALLBACK (theme_manager_notify_adium_variant_cb), manager);
+
+  theme_manager_notify_adium_variant_cb (priv->gsettings_chat,
+      EMPATHY_PREFS_CHAT_THEME_VARIANT,
+      manager);
+
+  priv->in_constructor = FALSE;
 }
 
 EmpathyThemeManager *
 empathy_theme_manager_dup_singleton (void)
 {
-	static EmpathyThemeManager *manager = NULL;
+  static EmpathyThemeManager *manager = NULL;
 
-	if (manager == NULL) {
-		manager = g_object_new (EMPATHY_TYPE_THEME_MANAGER, NULL);
-		g_object_add_weak_pointer (G_OBJECT (manager), (gpointer *) &manager);
+  if (manager == NULL)
+    {
+      manager = g_object_new (EMPATHY_TYPE_THEME_MANAGER, NULL);
+      g_object_add_weak_pointer (G_OBJECT (manager), (gpointer *) &manager);
 
-		return manager;
-	}
+      return manager;
+    }
 
-	return g_object_ref (manager);
+  return g_object_ref (manager);
 }
 
 static void
 find_themes (GList **list, const gchar *dirpath)
 {
-	GDir *dir;
-	GError *error = NULL;
-	const gchar *name = NULL;
-	GHashTable *info = NULL;
-
-	dir = g_dir_open (dirpath, 0, &error);
-	if (dir != NULL) {
-		name = g_dir_read_name (dir);
-		while (name != NULL) {
-			gchar *path;
-
-			path = g_build_path (G_DIR_SEPARATOR_S, dirpath, name, NULL);
-			if (empathy_adium_path_is_valid (path)) {
-				info = empathy_adium_info_new (path);
-				if (info != NULL) {
-					*list = g_list_prepend (*list, info);
-				}
-			}
-			g_free (path);
-			name = g_dir_read_name (dir);
-		}
-		g_dir_close (dir);
-	} else {
-		DEBUG ("Error opening %s: %s\n", dirpath, error->message);
-		g_error_free (error);
-	}
+  GDir *dir;
+  GError *error = NULL;
+  const gchar *name = NULL;
+  GHashTable *info = NULL;
+
+  dir = g_dir_open (dirpath, 0, &error);
+  if (dir != NULL)
+    {
+      name = g_dir_read_name (dir);
+
+      while (name != NULL)
+        {
+          gchar *path;
+
+          path = g_build_path (G_DIR_SEPARATOR_S, dirpath, name, NULL);
+          if (empathy_adium_path_is_valid (path))
+            {
+              info = empathy_adium_info_new (path);
+
+              if (info != NULL)
+                *list = g_list_prepend (*list, info);
+            }
+
+          g_free (path);
+          name = g_dir_read_name (dir);
+        }
+
+      g_dir_close (dir);
+    }
+  else
+    {
+      DEBUG ("Error opening %s: %s\n", dirpath, error->message);
+      g_error_free (error);
+    }
 }
 
 GList *
 empathy_theme_manager_get_adium_themes (void)
 {
-	GList *themes_list = NULL;
-	gchar *userpath = NULL;
-	const gchar *const *paths = NULL;
-	gint i = 0;
-
-	userpath = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (), "adium/message-styles", NULL);
-	find_themes (&themes_list, userpath);
-	g_free (userpath);
-
-	paths = g_get_system_data_dirs ();
-	for (i = 0; paths[i] != NULL; i++) {
-		userpath = g_build_path (G_DIR_SEPARATOR_S, paths[i],
-			"adium/message-styles", NULL);
-		find_themes (&themes_list, userpath);
-		g_free (userpath);
-	}
-
-	return themes_list;
+  GList *themes_list = NULL;
+  gchar *userpath = NULL;
+  const gchar *const *paths = NULL;
+  gint i = 0;
+
+  userpath = g_build_path (G_DIR_SEPARATOR_S, g_get_user_data_dir (),
+      "adium/message-styles", NULL);
+  find_themes (&themes_list, userpath);
+  g_free (userpath);
+
+  paths = g_get_system_data_dirs ();
+  for (i = 0; paths[i] != NULL; i++)
+    {
+      userpath = g_build_path (G_DIR_SEPARATOR_S, paths[i],
+        "adium/message-styles", NULL);
+      find_themes (&themes_list, userpath);
+      g_free (userpath);
+    }
+
+  return themes_list;
 }
 
 gchar *
 empathy_theme_manager_find_theme (const gchar *name)
 {
-	gchar *path;
-	const gchar * const *paths;
-	gint i;
+  gchar *path;
+  const gchar * const *paths;
+  gint i;
 
-	/* look in EMPATHY_SRCDIR */
-	path = g_strjoin (NULL,
-			g_getenv ("EMPATHY_SRCDIR"),
-			"/data/themes/",
-			name,
-			".AdiumMessageStyle",
-			NULL);
+  /* look in EMPATHY_SRCDIR */
+  path = g_strjoin (NULL,
+      g_getenv ("EMPATHY_SRCDIR"),
+      "/data/themes/",
+      name,
+      ".AdiumMessageStyle",
+      NULL);
 
-	DEBUG ("Trying '%s'", path);
+  DEBUG ("Trying '%s'", path);
 
-	if (empathy_adium_path_is_valid (path))
-		return path;
+  if (empathy_adium_path_is_valid (path))
+    return path;
 
-	g_free (path);
+  g_free (path);
 
-	/* look in user dir */
-	path = g_strjoin (NULL,
-			g_get_user_data_dir (),
-			"/adium/message-styles/",
-			name,
-			".AdiumMessageStyle",
-			NULL);
+  /* look in user dir */
+  path = g_strjoin (NULL,
+      g_get_user_data_dir (),
+      "/adium/message-styles/",
+      name,
+      ".AdiumMessageStyle",
+      NULL);
 
-	DEBUG ("Trying '%s'", path);
+  DEBUG ("Trying '%s'", path);
 
-	if (empathy_adium_path_is_valid (path))
-		return path;
+  if (empathy_adium_path_is_valid (path))
+    return path;
 
-	g_free (path);
+  g_free (path);
 
-	/* look in system dirs */
-	paths = g_get_system_data_dirs ();
+  /* look in system dirs */
+  paths = g_get_system_data_dirs ();
 
-	for (i = 0; paths[i] != NULL; i++) {
-		path = g_strjoin (NULL,
-				paths[i],
-				"/adium/message-styles/",
-				name,
-				".AdiumMessageStyle",
-				NULL);
+  for (i = 0; paths[i] != NULL; i++)
+    {
+      path = g_strjoin (NULL,
+          paths[i],
+          "/adium/message-styles/",
+          name,
+          ".AdiumMessageStyle",
+          NULL);
 
-		DEBUG ("Trying '%s'", path);
+      DEBUG ("Trying '%s'", path);
 
-		if (empathy_adium_path_is_valid (path))
-			return path;
+      if (empathy_adium_path_is_valid (path))
+        return path;
 
-		g_free (path);
-	}
+      g_free (path);
+    }
 
-	return NULL;
+  return NULL;
 }
diff --git a/libempathy-gtk/empathy-theme-manager.h b/libempathy-gtk/empathy-theme-manager.h
index 6e6672886..fe762e5d4 100644
--- a/libempathy-gtk/empathy-theme-manager.h
+++ b/libempathy-gtk/empathy-theme-manager.h
@@ -1,7 +1,6 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2005-2007 Imendio AB
- * Copyright (C) 2008 Collabora Ltd.
+ * Copyright (C) 2008-2012 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -29,30 +28,48 @@
 
 G_BEGIN_DECLS
 
-#define EMPATHY_TYPE_THEME_MANAGER         (empathy_theme_manager_get_type ())
-#define EMPATHY_THEME_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_THEME_MANAGER, EmpathyThemeManager))
-#define EMPATHY_THEME_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_THEME_MANAGER, EmpathyThemeManagerClass))
-#define EMPATHY_IS_THEME_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_THEME_MANAGER))
-#define EMPATHY_IS_THEME_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_THEME_MANAGER))
-#define EMPATHY_THEME_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_THEME_MANAGER, EmpathyThemeManagerClass))
+/* TYPE MACROS */
+#define EMPATHY_TYPE_THEME_MANAGER \
+  (empathy_theme_manager_get_type ())
+#define EMPATHY_THEME_MANAGER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
+    EMPATHY_TYPE_THEME_MANAGER, \
+    EmpathyThemeManager))
+#define EMPATHY_THEME_MANAGER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), \
+    EMPATHY_TYPE_THEME_MANAGER, \
+    EmpathyThemeManagerClass))
+#define EMPATHY_IS_THEME_MANAGER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+    EMPATHY_TYPE_THEME_MANAGER))
+#define EMPATHY_IS_THEME_MANAGER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), \
+    EMPATHY_TYPE_THEME_MANAGER))
+#define EMPATHY_THEME_MANAGER_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+    EMPATHY_TYPE_THEME_MANAGER, \
+    EmpathyThemeManagerClass))
+
 
 typedef struct _EmpathyThemeManager      EmpathyThemeManager;
 typedef struct _EmpathyThemeManagerClass EmpathyThemeManagerClass;
 
-struct _EmpathyThemeManager {
-	GObject parent;
-	gpointer priv;
+struct _EmpathyThemeManager
+{
+  GObject parent;
+  gpointer priv;
 };
 
-struct _EmpathyThemeManagerClass {
-	GObjectClass parent_class;
+struct _EmpathyThemeManagerClass
+{
+  GObjectClass parent_class;
 };
 
-GType                   empathy_theme_manager_get_type    (void) G_GNUC_CONST;
-EmpathyThemeManager *   empathy_theme_manager_dup_singleton (void);
-GList *                 empathy_theme_manager_get_adium_themes (void);
-EmpathyChatView *       empathy_theme_manager_create_view (EmpathyThemeManager *manager);
-gchar *                 empathy_theme_manager_find_theme (const gchar *name);
+GType empathy_theme_manager_get_type (void) G_GNUC_CONST;
+EmpathyThemeManager * empathy_theme_manager_dup_singleton (void);
+GList * empathy_theme_manager_get_adium_themes (void);
+EmpathyChatView * empathy_theme_manager_create_view (EmpathyThemeManager *self);
+gchar * empathy_theme_manager_find_theme (const gchar *name);
 
 G_END_DECLS