[Xfce4-commits] r30340 - in libexo/trunk: exo exo-desktop-item-edit exo-helper exo-mount exo-open exo-support python tests

Nick Schermer nick at xfce.org
Fri Jul 17 23:37:30 CEST 2009


Author: nick
Date: 2009-07-17 21:37:29 +0000 (Fri, 17 Jul 2009)
New Revision: 30340

Modified:
   libexo/trunk/exo-desktop-item-edit/exo-die-command-entry.c
   libexo/trunk/exo-desktop-item-edit/exo-die-command-model.c
   libexo/trunk/exo-desktop-item-edit/exo-die-desktop-model.c
   libexo/trunk/exo-desktop-item-edit/exo-die-editor.c
   libexo/trunk/exo-desktop-item-edit/exo-die-enum-types.h
   libexo/trunk/exo-desktop-item-edit/exo-die-utils.h
   libexo/trunk/exo-helper/exo-helper-chooser-dialog.h
   libexo/trunk/exo-helper/exo-helper-chooser.c
   libexo/trunk/exo-helper/exo-helper-chooser.h
   libexo/trunk/exo-helper/exo-helper-launcher-dialog.c
   libexo/trunk/exo-helper/exo-helper-launcher-dialog.h
   libexo/trunk/exo-helper/exo-helper-utils.h
   libexo/trunk/exo-helper/exo-helper.c
   libexo/trunk/exo-helper/exo-helper.h
   libexo/trunk/exo-mount/exo-mount-fstab.h
   libexo/trunk/exo-mount/exo-mount-hal.c
   libexo/trunk/exo-mount/exo-mount-hal.h
   libexo/trunk/exo-mount/exo-mount-utils.h
   libexo/trunk/exo-open/main.c
   libexo/trunk/exo-support/xfce-heading.c
   libexo/trunk/exo-support/xfce-heading.h
   libexo/trunk/exo-support/xfce-titled-dialog.c
   libexo/trunk/exo-support/xfce-titled-dialog.h
   libexo/trunk/exo/exo-binding.h
   libexo/trunk/exo/exo-cell-renderer-ellipsized-text.c
   libexo/trunk/exo/exo-cell-renderer-ellipsized-text.h
   libexo/trunk/exo/exo-cell-renderer-icon.c
   libexo/trunk/exo/exo-cell-renderer-icon.h
   libexo/trunk/exo/exo-ellipsized-label.h
   libexo/trunk/exo/exo-execute.h
   libexo/trunk/exo/exo-gdk-pixbuf-extensions.c
   libexo/trunk/exo/exo-gdk-pixbuf-extensions.h
   libexo/trunk/exo/exo-gobject-extensions.h
   libexo/trunk/exo/exo-gtk-extensions.h
   libexo/trunk/exo/exo-icon-bar.c
   libexo/trunk/exo/exo-icon-bar.h
   libexo/trunk/exo/exo-icon-chooser-dialog.c
   libexo/trunk/exo/exo-icon-chooser-dialog.h
   libexo/trunk/exo/exo-icon-chooser-model.c
   libexo/trunk/exo/exo-icon-chooser-model.h
   libexo/trunk/exo/exo-icon-view.c
   libexo/trunk/exo/exo-icon-view.h
   libexo/trunk/exo/exo-job.c
   libexo/trunk/exo/exo-job.h
   libexo/trunk/exo/exo-md5.c
   libexo/trunk/exo/exo-md5.h
   libexo/trunk/exo/exo-mount-point.c
   libexo/trunk/exo/exo-mount-point.h
   libexo/trunk/exo/exo-pango-extensions.c
   libexo/trunk/exo/exo-pango-extensions.h
   libexo/trunk/exo/exo-private.c
   libexo/trunk/exo/exo-private.h
   libexo/trunk/exo/exo-simple-job.c
   libexo/trunk/exo/exo-simple-job.h
   libexo/trunk/exo/exo-string.c
   libexo/trunk/exo/exo-string.h
   libexo/trunk/exo/exo-thumbnail-preview.c
   libexo/trunk/exo/exo-thumbnail-preview.h
   libexo/trunk/exo/exo-thumbnail.h
   libexo/trunk/exo/exo-toolbars-editor-dialog.c
   libexo/trunk/exo/exo-toolbars-editor-dialog.h
   libexo/trunk/exo/exo-toolbars-editor.c
   libexo/trunk/exo/exo-toolbars-editor.h
   libexo/trunk/exo/exo-toolbars-model.c
   libexo/trunk/exo/exo-toolbars-model.h
   libexo/trunk/exo/exo-toolbars-private.c
   libexo/trunk/exo/exo-toolbars-private.h
   libexo/trunk/exo/exo-toolbars-view.c
   libexo/trunk/exo/exo-toolbars-view.h
   libexo/trunk/exo/exo-tree-view.c
   libexo/trunk/exo/exo-tree-view.h
   libexo/trunk/exo/exo-url.c
   libexo/trunk/exo/exo-url.h
   libexo/trunk/exo/exo-utils.h
   libexo/trunk/exo/exo-wrap-table.c
   libexo/trunk/exo/exo-wrap-table.h
   libexo/trunk/exo/exo-xsession-client.c
   libexo/trunk/exo/exo-xsession-client.h
   libexo/trunk/python/exo.override
   libexo/trunk/python/exomodule.c
   libexo/trunk/python/pyexo.h
   libexo/trunk/tests/test-exo-csource.c
Log:
Cleanup a bunch of code.

Use Glib macros for defining a type, saves a bunch
of code and is thread-safe.

Drop ; after G_{BEGIN,END}_DECLS macros.

Move G_GNUC_INTERNAL macros in front of the function
to avoid problems with Solaris. Remove them from the
code that is compiled as an executable.

Tabs and spaces cleanups.


Modified: libexo/trunk/exo/exo-binding.h
===================================================================
--- libexo/trunk/exo/exo-binding.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-binding.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -30,7 +30,7 @@
 
 #include <glib-object.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _ExoBindingBase    ExoBindingBase;
 typedef struct _ExoBindingLink    ExoBindingLink;
@@ -108,6 +108,6 @@
                                                          const gchar        *property2);
 void               exo_mutual_binding_unbind            (ExoMutualBinding   *binding);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_BINDING_H__ */

Modified: libexo/trunk/exo/exo-cell-renderer-ellipsized-text.c
===================================================================
--- libexo/trunk/exo/exo-cell-renderer-ellipsized-text.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-cell-renderer-ellipsized-text.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -43,7 +43,6 @@
 
 
 
-static void exo_cell_renderer_ellipsized_text_class_init    (ExoCellRendererEllipsizedTextClass *klass);
 static void exo_cell_renderer_ellipsized_text_get_property  (GObject                            *object,
                                                              guint                               prop_id,
                                                              GValue                             *value,
@@ -76,39 +75,16 @@
 
 
 
-static GObjectClass *exo_cell_renderer_ellipsized_text_parent_class;
+G_DEFINE_TYPE (ExoCellRendererEllipsizedText, exo_cell_renderer_ellipsized_text, GTK_TYPE_CELL_RENDERER_TEXT)
 
 
 
-GType
-exo_cell_renderer_ellipsized_text_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
-
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (GTK_TYPE_CELL_RENDERER_TEXT,
-                                          "ExoCellRendererEllipsizedText",
-                                          sizeof (ExoCellRendererEllipsizedTextClass),
-                                          exo_cell_renderer_ellipsized_text_class_init,
-                                          sizeof (ExoCellRendererEllipsizedText),
-                                          NULL);
-    }
-
-  return type;
-}
-
-
-
 static void
 exo_cell_renderer_ellipsized_text_class_init (ExoCellRendererEllipsizedTextClass *klass)
 {
   GtkCellRendererClass *gtkcell_renderer_class;
   GObjectClass         *gobject_class;
 
-  /* determine the parent type class */
-  exo_cell_renderer_ellipsized_text_parent_class = g_type_class_peek_parent (klass);
-
   /* add our private data to the type's instances */
   g_type_class_add_private (klass, sizeof (ExoCellRendererEllipsizedTextPrivate));
 
@@ -144,6 +120,13 @@
 
 
 static void
+exo_cell_renderer_ellipsized_text_init (ExoCellRendererEllipsizedText *text)
+{
+}
+
+
+
+static void
 exo_cell_renderer_ellipsized_text_get_property (GObject    *object,
                                                 guint       prop_id,
                                                 GValue     *value,

Modified: libexo/trunk/exo/exo-cell-renderer-ellipsized-text.h
===================================================================
--- libexo/trunk/exo/exo-cell-renderer-ellipsized-text.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-cell-renderer-ellipsized-text.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -31,7 +31,7 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _ExoCellRendererEllipsizedTextPrivate ExoCellRendererEllipsizedTextPrivate;
 typedef struct _ExoCellRendererEllipsizedTextClass   ExoCellRendererEllipsizedTextClass;
@@ -61,6 +61,6 @@
 
 GtkCellRenderer *exo_cell_renderer_ellipsized_text_new      (void) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_CELL_RENDERER_ELLIPSIZED_TEXT_H__ */

Modified: libexo/trunk/exo/exo-cell-renderer-icon.c
===================================================================
--- libexo/trunk/exo/exo-cell-renderer-icon.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-cell-renderer-icon.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -49,7 +49,6 @@
 
 
 
-static void exo_cell_renderer_icon_class_init   (ExoCellRendererIconClass *klass);
 static void exo_cell_renderer_icon_finalize     (GObject                  *object);
 static void exo_cell_renderer_icon_get_property (GObject                  *object,
                                                  guint                     prop_id,
@@ -87,39 +86,16 @@
 
 
 
-static GObjectClass *exo_cell_renderer_icon_parent_class;
+G_DEFINE_TYPE (ExoCellRendererIcon, exo_cell_renderer_icon, GTK_TYPE_CELL_RENDERER)
 
 
 
-GType
-exo_cell_renderer_icon_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
-
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (GTK_TYPE_CELL_RENDERER,
-                                          "ExoCellRendererIcon",
-                                          sizeof (ExoCellRendererIconClass),
-                                          exo_cell_renderer_icon_class_init,
-                                          sizeof (ExoCellRendererIcon),
-                                          NULL);
-    }
-
-  return type;
-}
-
-
-
 static void
 exo_cell_renderer_icon_class_init (ExoCellRendererIconClass *klass)
 {
   GtkCellRendererClass *gtkcell_renderer_class;
   GObjectClass         *gobject_class;
 
-  /* determine the parent type class */
-  exo_cell_renderer_icon_parent_class = g_type_class_peek_parent (klass);
-
   /* add our private data to the type's instances */
   g_type_class_add_private (klass, sizeof (ExoCellRendererIconPrivate));
 
@@ -177,10 +153,10 @@
   /**
    * ExoCellRendererIcon:gicon:
    *
-   * The #GIcon to render. May also be %NULL in which case no icon will be 
+   * The #GIcon to render. May also be %NULL in which case no icon will be
    * rendered for the cell.
    *
-   * Currently only #GThemedIcon<!---->s are supported which are loaded 
+   * Currently only #GThemedIcon<!---->s are supported which are loaded
    * using the current icon theme.
    *
    * Since: 0.4.0
@@ -219,6 +195,13 @@
 
 
 static void
+exo_cell_renderer_icon_init (ExoCellRendererIcon *icon_undocked)
+{
+}
+
+
+
+static void
 exo_cell_renderer_icon_finalize (GObject *object)
 {
   const ExoCellRendererIconPrivate *priv = EXO_CELL_RENDERER_ICON_GET_PRIVATE (object);
@@ -421,8 +404,8 @@
       else if (priv->gicon != NULL)
         {
           icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme,
-                                                      priv->gicon, 
-                                                      priv->size, 
+                                                      priv->gicon,
+                                                      priv->size,
                                                       GTK_ICON_LOOKUP_USE_BUILTIN);
         }
 
@@ -455,7 +438,7 @@
         {
           display_name = g_filename_display_name (priv->icon);
         }
-      else if (G_UNLIKELY (priv->gicon != NULL 
+      else if (G_UNLIKELY (priv->gicon != NULL
                            && g_object_class_find_property (G_OBJECT_GET_CLASS (priv->gicon),
                                                             "name")))
         {

Modified: libexo/trunk/exo/exo-cell-renderer-icon.h
===================================================================
--- libexo/trunk/exo/exo-cell-renderer-icon.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-cell-renderer-icon.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -29,7 +29,7 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _ExoCellRendererIconPrivate ExoCellRendererIconPrivate;
 typedef struct _ExoCellRendererIconClass   ExoCellRendererIconClass;
@@ -66,6 +66,6 @@
 
 GtkCellRenderer *exo_cell_renderer_icon_new      (void) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_CELL_RENDERER_ICON_H__ */

Modified: libexo/trunk/exo/exo-ellipsized-label.h
===================================================================
--- libexo/trunk/exo/exo-ellipsized-label.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-ellipsized-label.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -32,7 +32,7 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 #define EXO_TYPE_ELLIPSIZED_LABEL            (exo_ellipsized_label_get_type ())
 #define EXO_ELLIPSIZED_LABEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXO_TYPE_ELLIPSIZED_LABEL, ExoEllipsizedLabel))
@@ -66,7 +66,7 @@
 void               exo_ellipsized_label_set_ellipsize (ExoEllipsizedLabel *label,
                                                        PangoEllipsizeMode  ellipsize);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_ELLIPSIZED_LABEL_H__ */
 

Modified: libexo/trunk/exo/exo-execute.h
===================================================================
--- libexo/trunk/exo/exo-execute.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-execute.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -27,7 +27,7 @@
 
 #include <gdk/gdk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 gboolean exo_execute_preferred_application            (const gchar *category,
                                                        const gchar *parameter,
@@ -51,6 +51,6 @@
                                                        GdkScreen   *screen,
                                                        GError     **error);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_EXECUTE_H__ */

Modified: libexo/trunk/exo/exo-gdk-pixbuf-extensions.c
===================================================================
--- libexo/trunk/exo/exo-gdk-pixbuf-extensions.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-gdk-pixbuf-extensions.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -186,7 +186,7 @@
               *pixdst++ = (*pixsrc++ * red_value) >> 8;
               *pixdst++ = (*pixsrc++ * green_value) >> 8;
               *pixdst++ = (*pixsrc++ * blue_value) >> 8;
-              
+
               if (has_alpha)
                 *pixdst++ = *pixsrc++;
             }
@@ -211,7 +211,7 @@
   gint remaining_width;
   gint slab_width;
   gint h_offset;
-  
+
   for (h_offset = 0, remaining_width = target_width; remaining_width > 0; h_offset += slab_width, remaining_width -= slab_width)
     {
       slab_width = (remaining_width > source_width) ? source_width : remaining_width;
@@ -234,7 +234,7 @@
   gint remaining_height;
   gint slab_height;
   gint v_offset;
-  
+
   for (v_offset = 0, remaining_height = target_height; remaining_height > 0; v_offset += slab_height, remaining_height -= slab_height)
     {
       slab_height = (remaining_height > source_height) ? source_height : remaining_height;
@@ -463,7 +463,7 @@
   /* determine src/dst row strides */
   dst_row_stride = gdk_pixbuf_get_rowstride (dst);
   src_row_stride = gdk_pixbuf_get_rowstride (src);
-  
+
 #if defined(__GNUC__) && defined(__MMX__)
   /* check if there's a good reason to use MMX */
   if (G_LIKELY (has_alpha && dst_row_stride == width * 4 && src_row_stride == width * 4 && (width * height) % 2 == 0))
@@ -526,7 +526,7 @@
         {
           pixdst = dst_pixels + i * dst_row_stride;
           pixsrc = src_pixels + i * src_row_stride;
-      
+
           for (j = width; j > 0; --j)
             {
               *pixdst++ = lighten_channel (*pixsrc++);

Modified: libexo/trunk/exo/exo-gdk-pixbuf-extensions.h
===================================================================
--- libexo/trunk/exo/exo-gdk-pixbuf-extensions.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-gdk-pixbuf-extensions.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -31,7 +31,7 @@
 
 #include <gdk/gdk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 GdkPixbuf *exo_gdk_pixbuf_colorize                  (const GdkPixbuf *src,
                                                      const GdkColor  *color) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
@@ -62,7 +62,7 @@
                                                      gboolean         preserve_aspect_ratio,
                                                      GError         **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_GDK_PIXBUF_EXTENSIONS_H__ */
 

Modified: libexo/trunk/exo/exo-gobject-extensions.h
===================================================================
--- libexo/trunk/exo/exo-gobject-extensions.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-gobject-extensions.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -29,11 +29,11 @@
 
 #include <glib-object.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 gboolean  exo_g_value_transform_negate  (const GValue *src_value,
                                          GValue       *dst_value);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_GOBJECT_EXTENSIONS_H__ */

Modified: libexo/trunk/exo/exo-gtk-extensions.h
===================================================================
--- libexo/trunk/exo/exo-gtk-extensions.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-gtk-extensions.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -29,7 +29,7 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 void      exo_gtk_object_destroy_later                (GtkObject      *object);
 
@@ -40,6 +40,6 @@
 
 void      exo_gtk_file_chooser_add_thumbnail_preview  (GtkFileChooser *chooser);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_GTK_EXTENSIONS_H__ */

Modified: libexo/trunk/exo/exo-icon-bar.c
===================================================================
--- libexo/trunk/exo/exo-icon-bar.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-icon-bar.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -64,8 +64,6 @@
 
 
 
-static void            exo_icon_bar_class_init            (ExoIconBarClass  *klass);
-static void            exo_icon_bar_init                  (ExoIconBar       *icon_bar);
 static void            exo_icon_bar_destroy               (GtkObject        *object);
 static void            exo_icon_bar_finalize              (GObject          *object);
 static void            exo_icon_bar_get_property          (GObject          *object,
@@ -179,31 +177,14 @@
 
 
 
-static GObjectClass *exo_icon_bar_parent_class;
-static guint         icon_bar_signals[LAST_SIGNAL];
+static guint icon_bar_signals[LAST_SIGNAL];
 
 
 
-GType
-exo_icon_bar_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (ExoIconBar, exo_icon_bar, GTK_TYPE_CONTAINER)
 
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (GTK_TYPE_CONTAINER,
-                                          "ExoIconBar",
-                                          sizeof (ExoIconBarClass),
-                                          exo_icon_bar_class_init,
-                                          sizeof (ExoIconBar),
-                                          exo_icon_bar_init);
-    }
 
-  return type;
-}
 
-
-
 static void
 exo_icon_bar_class_init (ExoIconBarClass *klass)
 {
@@ -213,8 +194,6 @@
 
   g_type_class_add_private (klass, sizeof (ExoIconBarPrivate));
 
-  exo_icon_bar_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = exo_icon_bar_finalize;
   gobject_class->get_property = exo_icon_bar_get_property;
@@ -846,7 +825,7 @@
       gtk_object_sink (GTK_OBJECT (icon_bar->priv->vadjustment));
 
       g_signal_connect (icon_bar->priv->vadjustment, "value_changed",
-			                  G_CALLBACK (exo_icon_bar_adjustment_changed), icon_bar);
+                        G_CALLBACK (exo_icon_bar_adjustment_changed), icon_bar);
       need_adjust = TRUE;
     }
 
@@ -1469,7 +1448,7 @@
  *
  * Returns the model the #ExoIconBar is based on. Returns %NULL if
  * the model is unset.
- * 
+ *
  * Return value: A #GtkTreeModel, or %NULL if none is currently being used.
  **/
 GtkTreeModel*

Modified: libexo/trunk/exo/exo-icon-bar.h
===================================================================
--- libexo/trunk/exo/exo-icon-bar.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-icon-bar.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -29,7 +29,7 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 #define EXO_TYPE_ICON_BAR             (exo_icon_bar_get_type ())
 #define EXO_ICON_BAR(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXO_TYPE_ICON_BAR, ExoIconBar))
@@ -96,7 +96,7 @@
 void            exo_icon_bar_set_active_iter    (ExoIconBar     *icon_bar,
                                                  GtkTreeIter    *iter);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_ICON_BAR_H__ */
 

Modified: libexo/trunk/exo/exo-icon-chooser-dialog.c
===================================================================
--- libexo/trunk/exo/exo-icon-chooser-dialog.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-icon-chooser-dialog.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -50,8 +50,6 @@
 
 
 
-static void     exo_icon_chooser_dialog_class_init        (ExoIconChooserDialogClass  *klass);
-static void     exo_icon_chooser_dialog_init              (ExoIconChooserDialog       *icon_chooser_dialog);
 static void     exo_icon_chooser_dialog_style_set         (GtkWidget                  *widget,
                                                            GtkStyle                   *previous_style);
 static void     exo_icon_chooser_dialog_screen_changed    (GtkWidget                  *widget,
@@ -117,30 +115,10 @@
 
 
 
-static GObjectClass *exo_icon_chooser_dialog_parent_class;
+G_DEFINE_TYPE (ExoIconChooserDialog, exo_icon_chooser_dialog, GTK_TYPE_DIALOG)
 
 
 
-GType
-exo_icon_chooser_dialog_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
-
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (GTK_TYPE_DIALOG,
-                                          "ExoIconChooserDialog",
-                                          sizeof (ExoIconChooserDialogClass),
-                                          exo_icon_chooser_dialog_class_init,
-                                          sizeof (ExoIconChooserDialog),
-                                          exo_icon_chooser_dialog_init);
-    }
-
-  return type;
-}
-
-
-
 static void
 exo_icon_chooser_dialog_class_init (ExoIconChooserDialogClass *klass)
 {
@@ -151,9 +129,6 @@
   /* add our private data to the type's instances */
   g_type_class_add_private (klass, sizeof (ExoIconChooserDialogPrivate));
 
-  /* determine the parent type class */
-  exo_icon_chooser_dialog_parent_class = g_type_class_peek_parent (klass);
-
   gtkwidget_class = GTK_WIDGET_CLASS (klass);
   gtkwidget_class->style_set = exo_icon_chooser_dialog_style_set;
   gtkwidget_class->screen_changed = exo_icon_chooser_dialog_screen_changed;

Modified: libexo/trunk/exo/exo-icon-chooser-dialog.h
===================================================================
--- libexo/trunk/exo/exo-icon-chooser-dialog.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-icon-chooser-dialog.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -29,7 +29,7 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _ExoIconChooserDialogPrivate ExoIconChooserDialogPrivate;
 typedef struct _ExoIconChooserDialogClass   ExoIconChooserDialogClass;
@@ -73,6 +73,6 @@
 gboolean   exo_icon_chooser_dialog_set_icon (ExoIconChooserDialog *icon_chooser_dialog,
                                              const gchar          *icon);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_ICON_CHOOSER_DIALOG_H__ */

Modified: libexo/trunk/exo/exo-icon-chooser-model.c
===================================================================
--- libexo/trunk/exo/exo-icon-chooser-model.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-icon-chooser-model.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -40,9 +40,7 @@
 
 
 
-static void               exo_icon_chooser_model_class_init         (ExoIconChooserModelClass  *klass);
 static void               exo_icon_chooser_model_tree_model_init    (GtkTreeModelIface         *iface);
-static void               exo_icon_chooser_model_init               (ExoIconChooserModel       *model);
 static void               exo_icon_chooser_model_finalize           (GObject                   *object);
 static GtkTreeModelFlags  exo_icon_chooser_model_get_flags          (GtkTreeModel              *tree_model);
 static gint               exo_icon_chooser_model_get_n_columns      (GtkTreeModel              *tree_model);
@@ -118,39 +116,18 @@
   "Status",         /* EXO_ICON_CHOOSER_CONTEXT_STATUS */
 };
 
-static GObjectClass *exo_icon_chooser_model_parent_class;
 
 
+G_DEFINE_TYPE_WITH_CODE (ExoIconChooserModel, exo_icon_chooser_model, G_TYPE_OBJECT,
+  G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, exo_icon_chooser_model_tree_model_init))
 
-GType
-_exo_icon_chooser_model_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
 
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (G_TYPE_OBJECT,
-                                          "ExoIconChooserModel",
-                                          sizeof (ExoIconChooserModelClass),
-                                          exo_icon_chooser_model_class_init,
-                                          sizeof (ExoIconChooserModel),
-                                          exo_icon_chooser_model_init);
-      _exo_g_type_add_interface_simple (type, GTK_TYPE_TREE_MODEL, (GInterfaceInitFunc) exo_icon_chooser_model_tree_model_init);
-    }
 
-  return type;
-}
-
-
-
 static void
 exo_icon_chooser_model_class_init (ExoIconChooserModelClass *klass)
 {
   GObjectClass *gobject_class;
 
-  /* determine the parent type class */
-  exo_icon_chooser_model_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = exo_icon_chooser_model_finalize;
 }
@@ -373,7 +350,7 @@
       iter->user_data = model->items;
       return TRUE;
     }
-  
+
   return FALSE;
 }
 

Modified: libexo/trunk/exo/exo-icon-chooser-model.h
===================================================================
--- libexo/trunk/exo/exo-icon-chooser-model.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-icon-chooser-model.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -29,12 +29,12 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _ExoIconChooserModelClass ExoIconChooserModelClass;
 typedef struct _ExoIconChooserModel      ExoIconChooserModel;
 
-#define EXO_TYPE_ICON_CHOOSER_MODEL             (_exo_icon_chooser_model_get_type ())
+#define EXO_TYPE_ICON_CHOOSER_MODEL             (exo_icon_chooser_model_get_type ())
 #define EXO_ICON_CHOOSER_MODEL(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXO_TYPE_ICON_CHOOSER_MODEL, ExoIconChooserModel))
 #define EXO_ICON_CHOOSER_MODEL_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), EXO_TYPE_ICON_CHOOSER_MODEL, ExoIconChooserModelClass))
 #define EXO_IS_ICON_CHOOSER_MODEL(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXO_TYPE_ICON_CHOOSER_MODEL))
@@ -86,15 +86,15 @@
   EXO_ICON_CHOOSER_MODEL_N_COLUMNS,
 } ExoIconChooserModelColumn;
 
-GType                _exo_icon_chooser_model_get_type               (void) G_GNUC_CONST G_GNUC_INTERNAL;
+G_GNUC_INTERNAL GType                  exo_icon_chooser_model_get_type                (void) G_GNUC_CONST;
 
-ExoIconChooserModel *_exo_icon_chooser_model_get_for_widget         (GtkWidget           *widget) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
-ExoIconChooserModel *_exo_icon_chooser_model_get_for_icon_theme     (GtkIconTheme        *icon_theme) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT;
+G_GNUC_INTERNAL ExoIconChooserModel   *_exo_icon_chooser_model_get_for_widget         (GtkWidget           *widget) G_GNUC_WARN_UNUSED_RESULT;
+G_GNUC_INTERNAL ExoIconChooserModel   *_exo_icon_chooser_model_get_for_icon_theme     (GtkIconTheme        *icon_theme) G_GNUC_WARN_UNUSED_RESULT;
 
-gboolean             _exo_icon_chooser_model_get_iter_for_icon_name (ExoIconChooserModel *model,
-                                                                     GtkTreeIter         *iter,
-                                                                     const gchar         *icon_name) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL gboolean               _exo_icon_chooser_model_get_iter_for_icon_name (ExoIconChooserModel *model,
+                                                                                       GtkTreeIter         *iter,
+                                                                                       const gchar         *icon_name) ;
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_ICON_CHOOSER_MODEL_H__ */

Modified: libexo/trunk/exo/exo-icon-view.c
===================================================================
--- libexo/trunk/exo/exo-icon-view.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-icon-view.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -64,7 +64,7 @@
   PROP_0,
   PROP_PIXBUF_COLUMN,
   PROP_TEXT_COLUMN,
-  PROP_MARKUP_COLUMN,  
+  PROP_MARKUP_COLUMN,
   PROP_SELECTION_MODE,
   PROP_LAYOUT_MODE,
   PROP_ORIENTATION,
@@ -123,9 +123,7 @@
 
 
 
-static void                 exo_icon_view_class_init                     (ExoIconViewClass       *klass);
 static void                 exo_icon_view_cell_layout_init               (GtkCellLayoutIface     *iface);
-static void                 exo_icon_view_init                           (ExoIconView            *icon_view);
 static void                 exo_icon_view_dispose                        (GObject                *object);
 static void                 exo_icon_view_finalize                       (GObject                *object);
 static void                 exo_icon_view_get_property                   (GObject                *object,
@@ -410,7 +408,7 @@
 struct _ExoIconViewItem
 {
   GtkTreeIter iter;
-  
+
   /* Bounding box (a value of -1 for width indicates
    * that the item needs to be layouted first)
    */
@@ -418,8 +416,8 @@
 
   /* Individual cells.
    * box[i] is the actual area occupied by cell i,
-   * before, after are used to calculate the cell 
-   * area relative to the box. 
+   * before, after are used to calculate the cell
+   * area relative to the box.
    * See exo_icon_view_get_cell_area().
    */
   gint n_cells;
@@ -447,14 +445,14 @@
   GList *children;
 
   GtkTreeModel *model;
-  
+
   GList *items;
-  
+
   GtkAdjustment *hadjustment;
   GtkAdjustment *vadjustment;
 
   gint layout_idle_id;
-  
+
   gboolean doing_rubberband;
   gint rubberband_x_1, rubberband_y_1;
   gint rubberband_x2, rubberband_y2;
@@ -557,32 +555,15 @@
 
 
 
-static GObjectClass *exo_icon_view_parent_class;
-static guint         icon_view_signals[LAST_SIGNAL];
+static guint icon_view_signals[LAST_SIGNAL];
 
 
 
-GType
-exo_icon_view_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE_WITH_CODE (ExoIconView, exo_icon_view, GTK_TYPE_CONTAINER,
+    G_IMPLEMENT_INTERFACE (GTK_TYPE_CELL_LAYOUT, exo_icon_view_cell_layout_init))
 
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (GTK_TYPE_CONTAINER,
-                                          "ExoIconView",
-                                          sizeof (ExoIconViewClass),
-                                          exo_icon_view_class_init,
-                                          sizeof (ExoIconView),
-                                          exo_icon_view_init);
-      _exo_g_type_add_interface_simple (type, GTK_TYPE_CELL_LAYOUT, (GInterfaceInitFunc) exo_icon_view_cell_layout_init);
-    }
 
-  return type;
-}
 
-
-
 static void
 exo_icon_view_class_init (ExoIconViewClass *klass)
 {
@@ -590,9 +571,6 @@
   GtkWidgetClass    *gtkwidget_class;
   GtkBindingSet     *gtkbinding_set;
   GObjectClass      *gobject_class;
-  
-  /* determine the parent type class */
-  exo_icon_view_parent_class = g_type_class_peek_parent (klass);
 
   /* add our private data to the type's instances */
   g_type_class_add_private (klass, sizeof (ExoIconViewPrivate));
@@ -636,9 +614,9 @@
   klass->select_cursor_item = exo_icon_view_real_select_cursor_item;
   klass->toggle_cursor_item = exo_icon_view_real_toggle_cursor_item;
   klass->move_cursor = exo_icon_view_real_move_cursor;
-  klass->activate_cursor_item = exo_icon_view_real_activate_cursor_item;  
+  klass->activate_cursor_item = exo_icon_view_real_activate_cursor_item;
   klass->start_interactive_search = exo_icon_view_real_start_interactive_search;
-  
+
   /**
    * ExoIconView:column-spacing:
    *
@@ -671,7 +649,7 @@
                                                      _("Number of columns to display"),
                                                      -1, G_MAXINT, -1,
                                                      EXO_PARAM_READWRITE));
-  
+
   /**
    * ExoIconView:enable-search:
    *
@@ -691,8 +669,8 @@
   /**
    * ExoIconView:item-width:
    *
-   * The item-width property specifies the width to use for each item. 
-   * If it is set to -1, the icon view will automatically determine a 
+   * The item-width property specifies the width to use for each item.
+   * If it is set to -1, the icon view will automatically determine a
    * suitable item size.
    *
    * Since: 0.3.1
@@ -703,7 +681,7 @@
                                                      _("Width for each item"),
                                                      _("The width used for each item"),
                                                      -1, G_MAXINT, -1,
-                                                     EXO_PARAM_READWRITE));  
+                                                     EXO_PARAM_READWRITE));
 
   /**
    * ExoIconView:layout-mode:
@@ -713,7 +691,7 @@
    * which is the default, where items are layed out horizontally in
    * rows from top to bottom, or %EXO_ICON_VIEW_LAYOUT_COLS, where items
    * are layed out vertically in columns from left to right.
-   * 
+   *
    * Since: 0.3.1.5
    **/
   g_object_class_install_property (gobject_class,
@@ -728,7 +706,7 @@
   /**
    * ExoIconView:margin:
    *
-   * The margin property specifies the space which is inserted 
+   * The margin property specifies the space which is inserted
    * at the edges of the icon view.
    *
    * Since: 0.3.1
@@ -745,10 +723,10 @@
    * ExoIconView:markup-column:
    *
    * The markup-column property contains the number of the model column
-   * containing markup information to be displayed. The markup column must be 
-   * of type #G_TYPE_STRING. If this property and the text-column property 
+   * containing markup information to be displayed. The markup column must be
+   * of type #G_TYPE_STRING. If this property and the text-column property
    * are both set to column numbers, it overrides the text column.
-   * If both are set to -1, no texts are displayed.   
+   * If both are set to -1, no texts are displayed.
    **/
   g_object_class_install_property (gobject_class,
                                    PROP_MARKUP_COLUMN,
@@ -772,11 +750,11 @@
                                                         _("The model for the icon view"),
                                                         GTK_TYPE_TREE_MODEL,
                                                         EXO_PARAM_READWRITE));
-  
+
   /**
    * ExoIconView:orientation:
    *
-   * The orientation property specifies how the cells (i.e. the icon and 
+   * The orientation property specifies how the cells (i.e. the icon and
    * the text) of the item are positioned relative to each other.
    **/
   g_object_class_install_property (gobject_class,
@@ -792,7 +770,7 @@
    * ExoIconView:pixbuf-column:
    *
    * The ::pixbuf-column property contains the number of the model column
-   * containing the pixbufs which are displayed. The pixbuf column must be 
+   * containing the pixbufs which are displayed. The pixbuf column must be
    * of type #GDK_TYPE_PIXBUF. Setting this property to -1 turns off the
    * display of pixbufs.
    **/
@@ -853,7 +831,7 @@
 
   /**
    * ExoIconView:selection-mode:
-   * 
+   *
    * The selection-mode property specifies the selection mode of
    * icon view. If the mode is #GTK_SELECTION_MULTIPLE, rubberband selection
    * is enabled, for the other modes, only keyboard selection is possible.
@@ -919,9 +897,9 @@
    * ExoIconView:text-column:
    *
    * The text-column property contains the number of the model column
-   * containing the texts which are displayed. The text column must be 
-   * of type #G_TYPE_STRING. If this property and the markup-column 
-   * property are both set to -1, no texts are displayed.   
+   * containing the texts which are displayed. The text column must be
+   * of type #G_TYPE_STRING. If this property and the markup-column
+   * property are both set to -1, no texts are displayed.
    **/
   g_object_class_install_property (gobject_class,
                                    PROP_TEXT_COLUMN,
@@ -931,7 +909,7 @@
                                                      -1, G_MAXINT, -1,
                                                      EXO_PARAM_READWRITE));
 
-  
+
   gtk_widget_class_install_style_property (gtkwidget_class,
                                            g_param_spec_boxed ("selection-box-color",
                                                                _("Selection Box Color"),
@@ -986,7 +964,7 @@
                   G_TYPE_FROM_CLASS (gobject_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (ExoIconViewClass, set_scroll_adjustments),
-                  NULL, NULL, 
+                  NULL, NULL,
                   _exo_marshal_VOID__OBJECT_OBJECT,
                   G_TYPE_NONE, 2,
                   GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
@@ -1003,7 +981,7 @@
                   NULL, NULL,
                   g_cclosure_marshal_VOID__VOID,
                   G_TYPE_NONE, 0);
-  
+
   /**
    * ExoIconView::unselect-all:
    * @icon_view : a #ExoIconView.
@@ -1046,7 +1024,7 @@
   /**
    * ExoIconView::activate-cursor-item:
    * @icon_view : a #ExoIconView.
-   * 
+   *
    * Return value:
    **/
   icon_view_signals[ACTIVATE_CURSOR_ITEM] =
@@ -1072,7 +1050,7 @@
                   NULL, NULL,
                   _exo_marshal_BOOLEAN__VOID,
                   G_TYPE_BOOLEAN, 0);
-  
+
   /**
    * ExoIconView::move-cursor:
    * @icon_view : a #ExoIconView.
@@ -1144,19 +1122,19 @@
 exo_icon_view_init (ExoIconView *icon_view)
 {
   icon_view->priv = EXO_ICON_VIEW_GET_PRIVATE (icon_view);
-  
+
   icon_view->priv->selection_mode = GTK_SELECTION_SINGLE;
   icon_view->priv->pressed_button = -1;
   icon_view->priv->press_start_x = -1;
   icon_view->priv->press_start_y = -1;
   icon_view->priv->text_column = -1;
-  icon_view->priv->markup_column = -1;  
+  icon_view->priv->markup_column = -1;
   icon_view->priv->pixbuf_column = -1;
   icon_view->priv->text_cell = -1;
-  icon_view->priv->pixbuf_cell = -1;  
+  icon_view->priv->pixbuf_cell = -1;
 
   GTK_WIDGET_SET_FLAGS (icon_view, GTK_CAN_FOCUS);
-  
+
   exo_icon_view_set_adjustments (icon_view, NULL, NULL);
 
   icon_view->priv->cursor_cell = -1;
@@ -1215,7 +1193,7 @@
 
   /* drop the scroll timer */
   remove_scroll_timeout (icon_view);
-  
+
   (*G_OBJECT_CLASS (exo_icon_view_parent_class)->dispose) (object);
 }
 
@@ -1511,7 +1489,7 @@
       child = lp->data;
       if (GTK_WIDGET_VISIBLE (child->widget))
         gtk_widget_size_request (child->widget, &child_requisition);
-    }  
+    }
 }
 
 
@@ -1569,7 +1547,7 @@
 
   /* layout the items */
   exo_icon_view_layout (icon_view);
-  
+
   /* allocate space to the widgets (editing) */
   exo_icon_view_allocate_children (icon_view);
 
@@ -1631,7 +1609,7 @@
   const GList            *lp;
   gint                    event_area_last;
   gint                    dest_index = -1;
- 
+
   /* verify that the expose happened on the icon window */
   if (G_UNLIKELY (event->window != priv->bin_window))
     return FALSE;
@@ -1694,7 +1672,7 @@
                   : event_area.x + event_area.width;
 
   /* paint all items that are affected by the expose event */
-  for (lp = priv->items; lp != NULL; lp = lp->next) 
+  for (lp = priv->items; lp != NULL; lp = lp->next)
     {
       /* check if this item is in the visible area */
       item = EXO_ICON_VIEW_ITEM (lp->data);
@@ -1773,7 +1751,7 @@
           g_assert_not_reached ();
         }
     }
-  
+
   /* draw the rubberband border */
   if (G_UNLIKELY (priv->doing_rubberband))
     {
@@ -1798,7 +1776,7 @@
   gdouble        value;
 
   GDK_THREADS_ENTER ();
-  
+
   /* determine the adjustment for the scroll direction */
   adjustment = (icon_view->priv->layout_mode == EXO_ICON_VIEW_LAYOUT_ROWS)
              ? icon_view->priv->vadjustment
@@ -1812,7 +1790,7 @@
 
   /* update the rubberband */
   exo_icon_view_update_rubberband (icon_view);
-  
+
   GDK_THREADS_LEAVE ();
 
   return TRUE;
@@ -1828,7 +1806,7 @@
   GdkCursor       *cursor;
   gint             size;
   gint             abso;
-  
+
   exo_icon_view_maybe_begin_drag (icon_view, event);
 
   if (icon_view->priv->doing_rubberband)
@@ -1864,7 +1842,7 @@
           icon_view->priv->event_last_y = event->y;
 
           if (icon_view->priv->scroll_timeout_id == 0)
-            icon_view->priv->scroll_timeout_id = g_timeout_add (30, rubberband_scroll_timeout, 
+            icon_view->priv->scroll_timeout_id = g_timeout_add (30, rubberband_scroll_timeout,
                                                                 icon_view);
         }
       else
@@ -1918,7 +1896,7 @@
             }
         }
     }
-  
+
   return TRUE;
 }
 
@@ -1963,14 +1941,14 @@
 
 
 static void
-exo_icon_view_item_activate_cell (ExoIconView         *icon_view, 
-                                  ExoIconViewItem     *item, 
+exo_icon_view_item_activate_cell (ExoIconView         *icon_view,
+                                  ExoIconViewItem     *item,
                                   ExoIconViewCellInfo *info,
                                   GdkEvent            *event)
 {
   GtkCellRendererMode mode;
   GdkRectangle        cell_area;
-  GtkTreePath        *path;  
+  GtkTreePath        *path;
   gboolean            visible;
   gchar              *path_string;
 
@@ -1994,14 +1972,14 @@
 
 
 
-static void 
+static void
 exo_icon_view_put (ExoIconView     *icon_view,
                    GtkWidget       *widget,
                    ExoIconViewItem *item,
                    gint             cell)
 {
   ExoIconViewChild *child;
-  
+
   /* allocate the new child */
   child = g_slice_new (ExoIconViewChild);
   child->widget = widget;
@@ -2037,9 +2015,9 @@
 
       if (GTK_WIDGET_HAS_FOCUS (editable))
         gtk_widget_grab_focus (GTK_WIDGET (icon_view));
-      
+
       g_signal_handlers_disconnect_by_func (editable, exo_icon_view_remove_widget, icon_view);
-      gtk_container_remove (GTK_CONTAINER (icon_view), GTK_WIDGET (editable));  
+      gtk_container_remove (GTK_CONTAINER (icon_view), GTK_WIDGET (editable));
 
       exo_icon_view_queue_draw_item (icon_view, item);
     }
@@ -2048,15 +2026,15 @@
 
 
 static void
-exo_icon_view_start_editing (ExoIconView         *icon_view, 
-                             ExoIconViewItem     *item, 
+exo_icon_view_start_editing (ExoIconView         *icon_view,
+                             ExoIconViewItem     *item,
                              ExoIconViewCellInfo *info,
                              GdkEvent            *event)
 {
   GtkCellRendererMode mode;
   GtkCellEditable    *editable;
   GdkRectangle        cell_area;
-  GtkTreePath        *path;  
+  GtkTreePath        *path;
   gboolean            visible;
   gchar              *path_string;
 
@@ -2096,7 +2074,7 @@
       g_signal_connect (G_OBJECT (editable), "remove-widget", G_CALLBACK (exo_icon_view_remove_widget), icon_view);
 
       /* cleanup */
-      g_free (path_string);      
+      g_free (path_string);
     }
 }
 
@@ -2176,22 +2154,22 @@
 
   if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
     {
-      item = exo_icon_view_get_item_at_coords (icon_view, 
+      item = exo_icon_view_get_item_at_coords (icon_view,
                                                event->x, event->y,
                                                TRUE,
-                                               &info);      
+                                               &info);
       if (item != NULL)
         {
           g_object_get (info->cell, "mode", &mode, NULL);
-          
+
           if (mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE ||
               mode == GTK_CELL_RENDERER_MODE_EDITABLE)
             cursor_cell = g_list_index (icon_view->priv->cell_list, info);
           else
             cursor_cell = -1;
-          
+
           exo_icon_view_scroll_to_item (icon_view, item);
-          
+
           if (icon_view->priv->selection_mode == GTK_SELECTION_NONE)
             {
               exo_icon_view_set_cursor_item (icon_view, item, cursor_cell);
@@ -2199,19 +2177,19 @@
           else if (icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE &&
                    (event->state & GDK_SHIFT_MASK))
             {
-              if (!(event->state & GDK_CONTROL_MASK)) 
+              if (!(event->state & GDK_CONTROL_MASK))
                 exo_icon_view_unselect_all_internal (icon_view);
 
               exo_icon_view_set_cursor_item (icon_view, item, cursor_cell);
               if (!icon_view->priv->anchor_item)
                 icon_view->priv->anchor_item = item;
-              else 
+              else
                 exo_icon_view_select_all_between (icon_view,
                                                   icon_view->priv->anchor_item,
                                                   item);
               dirty = TRUE;
             }
-          else 
+          else
             {
               if ((icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE ||
                   ((icon_view->priv->selection_mode == GTK_SELECTION_SINGLE) && item->selected)) &&
@@ -2226,7 +2204,7 @@
                   if (!item->selected)
                     {
                       exo_icon_view_unselect_all_internal (icon_view);
-                      
+
                       item->selected = TRUE;
                       exo_icon_view_queue_draw_item (icon_view, item);
                       dirty = TRUE;
@@ -2249,13 +2227,13 @@
 
           /* cancel the current editing, if it exists */
           exo_icon_view_stop_editing (icon_view, TRUE);
-          
+
           if (mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE)
-            exo_icon_view_item_activate_cell (icon_view, item, info, 
+            exo_icon_view_item_activate_cell (icon_view, item, info,
                                               (GdkEvent *)event);
           else if (mode == GTK_CELL_RENDERER_MODE_EDITABLE)
-            exo_icon_view_start_editing (icon_view, item, info, 
-                                         (GdkEvent *)event);      
+            exo_icon_view_start_editing (icon_view, item, info,
+                                         (GdkEvent *)event);
         }
       else
         {
@@ -2267,7 +2245,7 @@
             {
               dirty = exo_icon_view_unselect_all_internal (icon_view);
             }
-          
+
           if (icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE)
             exo_icon_view_start_rubberbanding (icon_view, event->x, event->y);
         }
@@ -2292,7 +2270,7 @@
       icon_view->priv->last_single_clicked = NULL;
       icon_view->priv->pressed_button = -1;
     }
- 
+
   /* grab focus and stop drawing the keyboard focus indicator on single clicks */
   if (G_LIKELY (event->type != GDK_2BUTTON_PRESS && event->type != GDK_3BUTTON_PRESS))
     {
@@ -2300,7 +2278,7 @@
         gtk_widget_grab_focus (GTK_WIDGET (icon_view));
       EXO_ICON_VIEW_UNSET_FLAG (icon_view, EXO_ICON_VIEW_DRAW_KEYFOCUS);
     }
- 
+
   if (dirty)
     g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
 
@@ -2316,7 +2294,7 @@
   ExoIconViewItem *item;
   ExoIconView     *icon_view = EXO_ICON_VIEW (widget);
   GtkTreePath     *path;
-  
+
   if (icon_view->priv->pressed_button == (gint) event->button)
     {
       /* check if we're in single click mode */
@@ -2523,7 +2501,7 @@
   GdkRectangle new_area;
   GdkRectangle common;
   GdkRegion *invalid_region;
-  
+
   icon_view = EXO_ICON_VIEW (data);
 
   gdk_window_get_pointer (icon_view->priv->bin_window, &x, &y, NULL);
@@ -2539,7 +2517,7 @@
                         icon_view->priv->rubberband_x_1) + 1;
   old_area.height = ABS (icon_view->priv->rubberband_y2 -
                          icon_view->priv->rubberband_y_1) + 1;
-  
+
   new_area.x = MIN (icon_view->priv->rubberband_x_1, x);
   new_area.y = MIN (icon_view->priv->rubberband_y_1, y);
   new_area.width = ABS (x - icon_view->priv->rubberband_x_1) + 1;
@@ -2558,19 +2536,19 @@
       common.y += 1;
       common.width -= 2;
       common.height -= 2;
-      
+
       common_region = gdk_region_rectangle (&common);
 
       gdk_region_subtract (invalid_region, common_region);
       gdk_region_destroy (common_region);
     }
-  
+
   gdk_window_invalidate_region (icon_view->priv->bin_window, invalid_region, TRUE);
-    
+
   gdk_region_destroy (invalid_region);
 
   icon_view->priv->rubberband_x2 = x;
-  icon_view->priv->rubberband_y2 = y;  
+  icon_view->priv->rubberband_y2 = y;
 
   exo_icon_view_update_rubberband_selection (icon_view);
 }
@@ -2687,13 +2665,13 @@
   gint             x, y;
   gint             width;
   gint             height;
-  
+
   /* determine the new rubberband area */
   x = MIN (icon_view->priv->rubberband_x_1, icon_view->priv->rubberband_x2);
   y = MIN (icon_view->priv->rubberband_y_1, icon_view->priv->rubberband_y2);
   width = ABS (icon_view->priv->rubberband_x_1 - icon_view->priv->rubberband_x2);
   height = ABS (icon_view->priv->rubberband_y_1 - icon_view->priv->rubberband_y2);
-  
+
   /* check all items */
   for (lp = icon_view->priv->items; lp != NULL; lp = lp->next)
     {
@@ -2727,14 +2705,14 @@
 {
   GList *l;
   GdkRectangle box;
- 
+
   for (l = icon_view->priv->cell_list; l; l = l->next)
     {
       ExoIconViewCellInfo *info = (ExoIconViewCellInfo *)l->data;
-      
+
       if (!info->cell->visible)
         continue;
-      
+
       box = item->box[info->position];
 
       if (MIN (x + width, box.x + box.width) - MAX (x, box.x) > 0 &&
@@ -2853,7 +2831,7 @@
 exo_icon_view_real_select_cursor_item (ExoIconView *icon_view)
 {
   exo_icon_view_unselect_all (icon_view);
-  
+
   if (icon_view->priv->cursor_item != NULL)
     exo_icon_view_select_item (icon_view, icon_view->priv->cursor_item);
 }
@@ -2866,33 +2844,33 @@
   GtkTreePath *path;
   GtkCellRendererMode mode;
   ExoIconViewCellInfo *info = NULL;
-  
+
   if (!icon_view->priv->cursor_item)
     return FALSE;
 
-  info = g_list_nth_data (icon_view->priv->cell_list, 
+  info = g_list_nth_data (icon_view->priv->cell_list,
                           icon_view->priv->cursor_cell);
 
-  if (info) 
-    {  
+  if (info)
+    {
       g_object_get (info->cell, "mode", &mode, NULL);
 
       if (mode == GTK_CELL_RENDERER_MODE_ACTIVATABLE)
         {
-          exo_icon_view_item_activate_cell (icon_view, 
-                                            icon_view->priv->cursor_item, 
+          exo_icon_view_item_activate_cell (icon_view,
+                                            icon_view->priv->cursor_item,
                                             info, NULL);
           return TRUE;
         }
       else if (mode == GTK_CELL_RENDERER_MODE_EDITABLE)
         {
-          exo_icon_view_start_editing (icon_view, 
-                                       icon_view->priv->cursor_item, 
+          exo_icon_view_start_editing (icon_view,
+                                       icon_view->priv->cursor_item,
                                        info, NULL);
           return TRUE;
         }
     }
-  
+
   path = gtk_tree_path_new_from_indices (g_list_index (icon_view->priv->items, icon_view->priv->cursor_item), -1);
   exo_icon_view_item_activated (icon_view, path);
   gtk_tree_path_free (path);
@@ -2933,7 +2911,7 @@
 
         case GTK_SELECTION_MULTIPLE:
           icon_view->priv->cursor_item->selected = !icon_view->priv->cursor_item->selected;
-          g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0); 
+          g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
           exo_icon_view_queue_draw_item (icon_view, icon_view->priv->cursor_item);
           break;
 
@@ -2963,11 +2941,11 @@
 
 
 static GList*
-exo_icon_view_layout_single_row (ExoIconView *icon_view, 
-                                 GList       *first_item, 
+exo_icon_view_layout_single_row (ExoIconView *icon_view,
+                                 GList       *first_item,
                                  gint         item_width,
                                  gint         row,
-                                 gint        *y, 
+                                 gint        *y,
                                  gint        *maximum_width,
                                  gint         max_cols)
 {
@@ -3024,14 +3002,14 @@
       item->area.y = *y + focus_width;
       item->area.x = rtl ? GTK_WIDGET (icon_view)->allocation.width - item->area.width - x : x;
 
-      x = current_width - (priv->margin + focus_width); 
+      x = current_width - (priv->margin + focus_width);
 
       for (i = 0; i < priv->n_cells; i++)
         {
           max_width[i] = MAX (max_width[i], item->box[i].width);
           max_height[i] = MAX (max_height[i], item->box[i].height);
         }
-              
+
       if (current_width > *maximum_width)
         *maximum_width = current_width;
 
@@ -3057,14 +3035,14 @@
       if (G_UNLIKELY (rtl))
         item->col = col - 1 - item->col;
     }
- 
+
   return last_item;
 }
 
 
 
 static GList*
-exo_icon_view_layout_single_col (ExoIconView *icon_view, 
+exo_icon_view_layout_single_col (ExoIconView *icon_view,
                                  GList       *first_item,
                                  gint         item_height,
                                  gint         col,
@@ -3122,7 +3100,7 @@
       item->area.y = y + focus_width;
       item->area.x = *x;
 
-      y = current_height - (priv->margin + focus_width); 
+      y = current_height - (priv->margin + focus_width);
 
       for (i = 0; i < priv->n_cells; i++)
         {
@@ -3166,7 +3144,7 @@
     {
       gdouble min = MAX (0.0, upper - adj->page_size);
       gboolean value_changed = FALSE;
-      
+
       adj->upper = upper;
 
       if (adj->value > min)
@@ -3174,9 +3152,9 @@
           adj->value = min;
           value_changed = TRUE;
         }
-      
+
       gtk_adjustment_changed (adj);
-      
+
       if (value_changed)
         gtk_adjustment_value_changed (adj);
     }
@@ -3200,7 +3178,7 @@
 
   do
     {
-      icons = exo_icon_view_layout_single_col (icon_view, icons, 
+      icons = exo_icon_view_layout_single_col (icon_view, icons,
                                                item_height, col,
                                                x, maximum_height, max_rows);
 
@@ -3210,14 +3188,14 @@
           for (items = icon_view->priv->items, rows = 0; items != icons; items = items->next, ++rows)
             ;
         }
-            
+
       col++;
     }
   while (icons != NULL);
 
   *x += icon_view->priv->margin;
   icon_view->priv->cols = col;
-      
+
   return rows;
 }
 
@@ -3234,12 +3212,12 @@
   GList *items;
   gint   row = 0;
   gint   cols = 0;
-  
+
   *y = icon_view->priv->margin;
 
   do
     {
-      icons = exo_icon_view_layout_single_row (icon_view, icons, 
+      icons = exo_icon_view_layout_single_row (icon_view, icons,
                                                item_width, row,
                                                y, maximum_width, max_cols);
 
@@ -3249,14 +3227,14 @@
           for (items = icon_view->priv->items, cols = 0; items != icons; items = items->next, ++cols)
             ;
         }
-            
+
       row++;
     }
   while (icons != NULL);
 
   *y += icon_view->priv->margin;
   icon_view->priv->rows = row;
-      
+
   return cols;
 }
 
@@ -3295,17 +3273,17 @@
         }
 
       cols = exo_icon_view_layout_rows (icon_view, item_width, &y, &maximum_width, 0);
-      
+
       /* If, by adding another column, we increase the height of the icon view, thus forcing a
        * vertical scrollbar to appear that would prevent the last column from being able to fit,
        * we need to relayout the icons with one less column.
        */
-      if (cols == priv->cols + 1 && y > GTK_WIDGET (icon_view)->allocation.height && 
+      if (cols == priv->cols + 1 && y > GTK_WIDGET (icon_view)->allocation.height &&
           priv->height <= GTK_WIDGET (icon_view)->allocation.height)
         {
           cols = exo_icon_view_layout_rows (icon_view, item_width, &y, &maximum_width, priv->cols);
         }
-        
+
       priv->width = maximum_width;
       priv->height = y;
       priv->cols = cols;
@@ -3326,12 +3304,12 @@
        * horizontal scrollbar to appear that would prevent the last row from being able to fit,
        * we need to relayout the icons with one less row.
        */
-      if (rows == priv->rows + 1 && x > GTK_WIDGET (icon_view)->allocation.width && 
+      if (rows == priv->rows + 1 && x > GTK_WIDGET (icon_view)->allocation.width &&
           priv->width <= GTK_WIDGET (icon_view)->allocation.width)
         {
           rows = exo_icon_view_layout_cols (icon_view, item_height, &x, &maximum_height, priv->rows);
         }
-        
+
       priv->height = maximum_height;
       priv->width = x;
       priv->rows = rows;
@@ -3356,7 +3334,7 @@
 
 
 
-static void 
+static void
 exo_icon_view_get_cell_area (ExoIconView         *icon_view,
                              ExoIconViewItem     *item,
                              ExoIconViewCellInfo *info,
@@ -3417,12 +3395,12 @@
       info = EXO_ICON_VIEW_CELL_INFO (lp->data);
       if (G_UNLIKELY (!info->cell->visible))
         continue;
-      
-      gtk_cell_renderer_get_size (info->cell, GTK_WIDGET (icon_view), 
+
+      gtk_cell_renderer_get_size (info->cell, GTK_WIDGET (icon_view),
                                   NULL, NULL, NULL,
-                                  &item->box[info->position].width, 
+                                  &item->box[info->position].width,
                                   &item->box[info->position].height);
-      
+
       if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
         {
           item->area.width += item->box[info->position].width + (info->position > 0 ? icon_view->priv->spacing : 0);
@@ -3481,7 +3459,7 @@
 
   cell_area.x = item->area.x;
   cell_area.y = item->area.y;
-      
+
   for (k = 0; k < 2; ++k)
     {
       for (lp = icon_view->priv->cell_list, i = 0; lp != NULL; lp = lp->next, ++i)
@@ -3531,7 +3509,7 @@
     {
       for (i = 0; i < icon_view->priv->n_cells; i++)
         item->box[i].x = item->area.x + item->area.width - (item->box[i].x + item->box[i].width - item->area.x);
-    }   
+    }
 }
 
 
@@ -3571,7 +3549,7 @@
 
   if (G_UNLIKELY (icon_view->priv->model == NULL))
     return;
-  
+
   exo_icon_view_set_cell_data (icon_view, item);
 
   rtl = gtk_widget_get_direction (GTK_WIDGET (icon_view)) == GTK_TEXT_DIR_RTL;
@@ -3582,8 +3560,8 @@
       state = GTK_WIDGET_HAS_FOCUS (icon_view) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE;
 
       /* FIXME We hardwire background drawing behind text cell renderers
-       * here. This is ugly, but it's done to be consistent with GtkIconView. 
-       * The additional info->is_text attribute is used for performance 
+       * here. This is ugly, but it's done to be consistent with GtkIconView.
+       * The additional info->is_text attribute is used for performance
        * optimization and should be removed alongside the following code. */
 
       cr = gdk_cairo_create (drawable);
@@ -3634,12 +3612,12 @@
     flags |= GTK_CELL_RENDERER_PRELIT;
   if (G_UNLIKELY (EXO_ICON_VIEW_FLAG_SET (icon_view, EXO_ICON_VIEW_DRAW_KEYFOCUS) && icon_view->priv->cursor_item == item))
     flags |= GTK_CELL_RENDERER_FOCUSED;
-  
+
 #ifdef DEBUG_ICON_VIEW
   gdk_draw_rectangle (drawable,
                       GTK_WIDGET (icon_view)->style->black_gc,
                       FALSE,
-                      x, y, 
+                      x, y,
                       item->area.width, item->area.height);
 #endif
 
@@ -3649,22 +3627,22 @@
 
       if (G_UNLIKELY (!info->cell->visible))
         continue;
-      
+
       exo_icon_view_get_cell_area (icon_view, item, info, &cell_area);
-      
+
 #ifdef DEBUG_ICON_VIEW
       gdk_draw_rectangle (drawable,
                           GTK_WIDGET (icon_view)->style->black_gc,
                           FALSE,
-                          x - item->area.x + cell_area.x, 
-                          y - item->area.y + cell_area.y, 
+                          x - item->area.x + cell_area.x,
+                          y - item->area.y + cell_area.y,
                           cell_area.width, cell_area.height);
 
       gdk_draw_rectangle (drawable,
                           GTK_WIDGET (icon_view)->style->black_gc,
                           FALSE,
-                          x - item->area.x + item->box[info->position].x, 
-                          y - item->area.y + item->box[info->position].y, 
+                          x - item->area.x + item->box[info->position].x,
+                          y - item->area.y + item->box[info->position].y,
                           item->box[info->position].width, item->box[info->position].height);
 #endif
 
@@ -3675,7 +3653,7 @@
                                 drawable,
                                 GTK_WIDGET (icon_view),
                                 &cell_area, &cell_area, area, flags);
-      
+
     }
 }
 
@@ -3745,7 +3723,7 @@
 
   if (icon_view->priv->cursor_item != NULL)
     exo_icon_view_queue_draw_item (icon_view, icon_view->priv->cursor_item);
-  
+
   icon_view->priv->cursor_item = item;
   if (cursor_cell >= 0)
     icon_view->priv->cursor_cell = cursor_cell;
@@ -3784,7 +3762,7 @@
                   info = (ExoIconViewCellInfo *) lp->data;
                   if (!info->cell->visible)
                     continue;
-                  
+
                   box = item->box[info->position];
                   if ((x >= box.x && x <= box.x + box.width &&
                        y >= box.y && y <= box.y + box.height) ||
@@ -3795,14 +3773,14 @@
                     {
                       if (cell_at_pos != NULL)
                         *cell_at_pos = info;
-                      
+
                       return item;
                     }
                 }
 
               if (only_in_cell)
                 return NULL;
-              
+
               if (cell_at_pos != NULL)
                 *cell_at_pos = NULL;
             }
@@ -3840,11 +3818,11 @@
 {
   if (!item->selected)
     return;
-  
+
   if (icon_view->priv->selection_mode == GTK_SELECTION_NONE ||
       icon_view->priv->selection_mode == GTK_SELECTION_BROWSE)
     return;
-  
+
   item->selected = FALSE;
 
   g_signal_emit (G_OBJECT (icon_view), icon_view_signals[SELECTION_CHANGED], 0);
@@ -3872,7 +3850,7 @@
   if (G_UNLIKELY (item->selected))
     g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
 
-  /* recalculate layout (a value of -1 for width 
+  /* recalculate layout (a value of -1 for width
    * indicates that the item needs to be layouted).
    */
   item->area.width = -1;
@@ -3889,7 +3867,7 @@
 {
   ExoIconViewItem *item;
   gint             idx;
-  
+
   idx = gtk_tree_path_get_indices (path)[0];
 
   /* allocate the new item */
@@ -3897,7 +3875,7 @@
   item->iter = *iter;
   item->area.width = -1;
   icon_view->priv->items = g_list_insert (icon_view->priv->items, item, idx);
-  
+
   /* recalculate the layout */
   exo_icon_view_queue_layout (icon_view);
 }
@@ -3945,7 +3923,7 @@
   /* check if the selection changed */
   if (G_UNLIKELY (item->selected))
     changed = TRUE;
-  
+
   /* release the item resources */
   g_free (item->box);
 
@@ -4023,9 +4001,9 @@
                                 GtkMovementStep step,
                                 gint            count)
 {
-  
+
   gtk_binding_entry_add_signal (binding_set, keyval, modmask, "move-cursor", 2, G_TYPE_ENUM, step, G_TYPE_INT, count);
-  
+
   /* skip shift+n and shift+p because this blocks type-ahead search.
    * see http://bugzilla.xfce.org/show_bug.cgi?id=4633
    */
@@ -4127,13 +4105,13 @@
     for (l = icon_view->priv->cell_list, i = 0; l; l = l->next, i++)
       {
         ExoIconViewCellInfo *info = (ExoIconViewCellInfo *)l->data;
-        
+
         if (info->pack == (k ? GTK_PACK_START : GTK_PACK_END))
           continue;
-        
+
         if (!info->cell->visible)
           continue;
-        
+
         if (GTK_IS_CELL_RENDERER_TEXT (info->cell))
           first_text = i;
 
@@ -4147,7 +4125,7 @@
             n_focusable++;
           }
       }
-  
+
   if (n_focusable == 0)
     focusable[n_focusable++] = first_text;
 
@@ -4172,9 +4150,9 @@
       cell = focusable[current + *count];
       *count = 0;
     }
-  
+
   g_free (focusable);
-  
+
   return cell;
 }
 
@@ -4202,7 +4180,7 @@
             break;
         }
     }
-  else 
+  else
     {
       for (; item != NULL; item = item->prev)
         {
@@ -4228,7 +4206,7 @@
   GList *items;
   ExoIconViewItem *item, *last;
   gboolean dirty = FALSE;
-  
+
   for (items = icon_view->priv->items; items; items = items->next)
     {
       item = items->data;
@@ -4265,7 +4243,7 @@
 
 
 
-static void 
+static void
 exo_icon_view_move_cursor_up_down (ExoIconView *icon_view,
                                    gint         count)
 {
@@ -4274,10 +4252,10 @@
   GList           *list;
   gint             cell = -1;
   gint             step;
-  
+
   if (!GTK_WIDGET_HAS_FOCUS (icon_view))
     return;
-  
+
   if (!icon_view->priv->cursor_item)
     {
       if (count > 0)
@@ -4291,11 +4269,11 @@
     {
       item = icon_view->priv->cursor_item;
       cell = icon_view->priv->cursor_cell;
-      step = count > 0 ? 1 : -1;      
+      step = count > 0 ? 1 : -1;
       while (item)
         {
           cell = find_cell (icon_view, item, cell,
-                            GTK_ORIENTATION_VERTICAL, 
+                            GTK_ORIENTATION_VERTICAL,
                             step, &count);
           if (count == 0)
             break;
@@ -4348,7 +4326,7 @@
       icon_view->priv->selection_mode != GTK_SELECTION_NONE)
     {
       dirty = exo_icon_view_unselect_all_internal (icon_view);
-      dirty = exo_icon_view_select_all_between (icon_view, 
+      dirty = exo_icon_view_select_all_between (icon_view,
                                                 icon_view->priv->anchor_item,
                                                 item) || dirty;
     }
@@ -4361,16 +4339,16 @@
 
 
 
-static void 
+static void
 exo_icon_view_move_cursor_page_up_down (ExoIconView *icon_view,
                                         gint         count)
 {
   ExoIconViewItem *item;
   gboolean dirty = FALSE;
-  
+
   if (!GTK_WIDGET_HAS_FOCUS (icon_view))
     return;
-  
+
   if (!icon_view->priv->cursor_item)
     {
       GList *list;
@@ -4383,7 +4361,7 @@
       item = list ? list->data : NULL;
     }
   else
-    item = find_item_page_up_down (icon_view, 
+    item = find_item_page_up_down (icon_view,
                                    icon_view->priv->cursor_item,
                                    count);
 
@@ -4402,7 +4380,7 @@
       icon_view->priv->selection_mode != GTK_SELECTION_NONE)
     {
       dirty = exo_icon_view_unselect_all_internal (icon_view);
-      dirty = exo_icon_view_select_all_between (icon_view, 
+      dirty = exo_icon_view_select_all_between (icon_view,
                                                 icon_view->priv->anchor_item,
                                                 item) || dirty;
     }
@@ -4410,12 +4388,12 @@
   exo_icon_view_scroll_to_item (icon_view, item);
 
   if (dirty)
-    g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);  
+    g_signal_emit (icon_view, icon_view_signals[SELECTION_CHANGED], 0);
 }
 
 
 
-static void 
+static void
 exo_icon_view_move_cursor_left_right (ExoIconView *icon_view,
                                       gint         count)
 {
@@ -4424,10 +4402,10 @@
   GList           *list;
   gint             cell = -1;
   gint             step;
-  
+
   if (!GTK_WIDGET_HAS_FOCUS (icon_view))
     return;
-  
+
   if (!icon_view->priv->cursor_item)
     {
       if (count > 0)
@@ -4445,7 +4423,7 @@
       while (item)
         {
           cell = find_cell (icon_view, item, cell,
-                            GTK_ORIENTATION_HORIZONTAL, 
+                            GTK_ORIENTATION_HORIZONTAL,
                             step, &count);
           if (count == 0)
             break;
@@ -4482,7 +4460,7 @@
 
           /* determine the item for the list position (if any) */
           item = (list != NULL) ? list->data : NULL;
-          
+
           count = count - step;
         }
     }
@@ -4502,7 +4480,7 @@
       icon_view->priv->selection_mode != GTK_SELECTION_NONE)
     {
       dirty = exo_icon_view_unselect_all_internal (icon_view);
-      dirty = exo_icon_view_select_all_between (icon_view, 
+      dirty = exo_icon_view_select_all_between (icon_view,
                                                 icon_view->priv->anchor_item,
                                                 item) || dirty;
     }
@@ -4515,17 +4493,17 @@
 
 
 
-static void 
+static void
 exo_icon_view_move_cursor_start_end (ExoIconView *icon_view,
                                      gint         count)
 {
   ExoIconViewItem *item;
   gboolean         dirty = FALSE;
   GList           *lp;
-  
+
   if (!GTK_WIDGET_HAS_FOCUS (icon_view))
     return;
-  
+
   lp = (count < 0) ? icon_view->priv->items : g_list_last (icon_view->priv->items);
   if (G_UNLIKELY (lp == NULL))
     return;
@@ -4543,7 +4521,7 @@
       icon_view->priv->selection_mode != GTK_SELECTION_NONE)
     {
       dirty = exo_icon_view_unselect_all_internal (icon_view);
-      dirty = exo_icon_view_select_all_between (icon_view, 
+      dirty = exo_icon_view_select_all_between (icon_view,
                                                 icon_view->priv->anchor_item,
                                                 item) || dirty;
     }
@@ -4556,8 +4534,8 @@
 
 
 
-static void     
-exo_icon_view_scroll_to_item (ExoIconView     *icon_view, 
+static void
+exo_icon_view_scroll_to_item (ExoIconView     *icon_view,
                               ExoIconViewItem *item)
 {
   gint x, y, width, height;
@@ -4567,21 +4545,21 @@
                         "focus-line-width", &focus_width,
                         NULL);
 
-  gdk_drawable_get_size (GDK_DRAWABLE (icon_view->priv->bin_window), 
+  gdk_drawable_get_size (GDK_DRAWABLE (icon_view->priv->bin_window),
                          &width, &height);
   gdk_window_get_position (icon_view->priv->bin_window, &x, &y);
 
   if (y + item->area.y - focus_width < 0)
-    gtk_adjustment_set_value (icon_view->priv->vadjustment, 
+    gtk_adjustment_set_value (icon_view->priv->vadjustment,
                               icon_view->priv->vadjustment->value + y + item->area.y - focus_width);
   else if (y + item->area.y + item->area.height + focus_width > GTK_WIDGET (icon_view)->allocation.height)
-    gtk_adjustment_set_value (icon_view->priv->vadjustment, 
-                              icon_view->priv->vadjustment->value + y + item->area.y + item->area.height 
+    gtk_adjustment_set_value (icon_view->priv->vadjustment,
+                              icon_view->priv->vadjustment->value + y + item->area.y + item->area.height
                               + focus_width - GTK_WIDGET (icon_view)->allocation.height);
 
   if (x + item->area.x - focus_width < 0)
     {
-      gtk_adjustment_set_value (icon_view->priv->hadjustment, 
+      gtk_adjustment_set_value (icon_view->priv->hadjustment,
                                 icon_view->priv->hadjustment->value + x + item->area.x - focus_width);
     }
   else if (x + item->area.x + item->area.width + focus_width > GTK_WIDGET (icon_view)->allocation.width
@@ -4592,8 +4570,8 @@
        * See http://bugzilla.xfce.org/show_bug.cgi?id=1683 for details.
        */
 
-      gtk_adjustment_set_value (icon_view->priv->hadjustment, 
-                                icon_view->priv->hadjustment->value + x + item->area.x + item->area.width 
+      gtk_adjustment_set_value (icon_view->priv->hadjustment,
+                                icon_view->priv->hadjustment->value + x + item->area.x + item->area.width
                                 + focus_width - GTK_WIDGET (icon_view)->allocation.width);
     }
 
@@ -4619,7 +4597,7 @@
 
 
 static void
-exo_icon_view_set_cell_data (const ExoIconView *icon_view, 
+exo_icon_view_set_cell_data (const ExoIconView *icon_view,
                              ExoIconViewItem   *item)
 {
   ExoIconViewCellInfo *info;
@@ -4628,7 +4606,7 @@
   GValue               value = {0, };
   GSList              *slp;
   GList               *lp;
-  
+
   if (G_UNLIKELY (!EXO_ICON_VIEW_FLAG_SET (icon_view, EXO_ICON_VIEW_ITERS_PERSIST)))
     {
       path = gtk_tree_path_new_from_indices (g_list_index (icon_view->priv->items, item), -1);
@@ -4639,7 +4617,7 @@
     {
       iter = item->iter;
     }
-  
+
   for (lp = icon_view->priv->cell_list; lp != NULL; lp = lp->next)
     {
       info = EXO_ICON_VIEW_CELL_INFO (lp->data);
@@ -4653,14 +4631,14 @@
 
       if (G_UNLIKELY (info->func != NULL))
         (*info->func) (GTK_CELL_LAYOUT (icon_view), info->cell, icon_view->priv->model, &iter, info->func_data);
-    }  
+    }
 }
 
 
 
-static void 
+static void
 free_cell_attributes (ExoIconViewCellInfo *info)
-{ 
+{
   GSList *lp;
 
   for (lp = info->attributes; lp != NULL && lp->next != NULL; lp = lp->next->next)
@@ -4704,7 +4682,7 @@
   info->pack = GTK_PACK_START;
   info->position = icon_view->priv->n_cells;
   info->is_text = GTK_IS_CELL_RENDERER_TEXT (renderer);
-  
+
   icon_view->priv->cell_list = g_list_append (icon_view->priv->cell_list, info);
   icon_view->priv->n_cells++;
 
@@ -4855,9 +4833,9 @@
 
 /**
  * exo_icon_view_new:
- * 
+ *
  * Creates a new #ExoIconView widget
- * 
+ *
  * Return value: A newly created #ExoIconView widget
  **/
 GtkWidget*
@@ -4871,9 +4849,9 @@
 /**
  * exo_icon_view_new_with_model:
  * @model: The model.
- * 
+ *
  * Creates a new #ExoIconView widget with the model @model.
- * 
+ *
  * Return value: A newly created #ExoIconView widget.
  **/
 GtkWidget*
@@ -4949,11 +4927,11 @@
  * @icon_view : A #ExoIconView.
  * @x         : The x position to be identified
  * @y         : The y position to be identified
- * 
+ *
  * Finds the path at the point (@x, @y), relative to widget coordinates.
  * See exo_icon_view_get_item_at_pos(), if you are also interested in
  * the cell at the specified position.
- * 
+ *
  * Return value: The #GtkTreePath corresponding to the icon or %NULL
  *               if no icon exists at that position.
  **/
@@ -4963,7 +4941,7 @@
                                gint               y)
 {
   ExoIconViewItem *item;
-  
+
   g_return_val_if_fail (EXO_IS_ICON_VIEW (icon_view), NULL);
 
   /* translate the widget coordinates to icon window coordinates */
@@ -4985,17 +4963,17 @@
  * @path: Return location for the path, or %NULL
  * @cell: Return location for the renderer responsible for the cell
  *   at (@x, @y), or %NULL
- * 
+ *
  * Finds the path at the point (@x, @y), relative to widget coordinates.
- * In contrast to exo_icon_view_get_path_at_pos(), this function also 
+ * In contrast to exo_icon_view_get_path_at_pos(), this function also
  * obtains the cell at the specified position. The returned path should
  * be freed with gtk_tree_path_free().
- * 
+ *
  * Return value: %TRUE if an item exists at the specified position
  *
  * Since: 0.3.1
  **/
-gboolean 
+gboolean
 exo_icon_view_get_item_at_pos (const ExoIconView *icon_view,
                                gint               x,
                                gint               y,
@@ -5004,7 +4982,7 @@
 {
   ExoIconViewCellInfo *info;
   ExoIconViewItem     *item;
-  
+
   g_return_val_if_fail (EXO_IS_ICON_VIEW (icon_view), FALSE);
 
   item = exo_icon_view_get_item_at_coords (icon_view, x, y, TRUE, &info);
@@ -5025,12 +5003,12 @@
  * @icon_view  : A #ExoIconView
  * @start_path : Return location for start of region, or %NULL
  * @end_path   : Return location for end of region, or %NULL
- * 
- * Sets @start_path and @end_path to be the first and last visible path. 
+ *
+ * Sets @start_path and @end_path to be the first and last visible path.
  * Note that there may be invisible paths in between.
- * 
+ *
  * Both paths should be freed with gtk_tree_path_free() after use.
- * 
+ *
  * Return value: %TRUE, if valid paths were placed in @start_path and @end_path
  *
  * Since: 0.3.1
@@ -5054,7 +5032,7 @@
 
   if (start_path == NULL && end_path == NULL)
     return FALSE;
-  
+
   for (i = 0, lp = priv->items; lp != NULL; ++i, lp = lp->next)
     {
       item = (const ExoIconViewItem *) lp->data;
@@ -5073,7 +5051,7 @@
     *start_path = gtk_tree_path_new_from_indices (start_index, -1);
   if (end_path != NULL && end_index != -1)
     *end_path = gtk_tree_path_new_from_indices (end_index, -1);
-  
+
   return (start_index != -1);
 }
 
@@ -5084,7 +5062,7 @@
  * @icon_view : A #ExoIconView.
  * @func      : The funcion to call for each selected icon.
  * @data      : User data to pass to the function.
- * 
+ *
  * Calls a function for each selected icon. Note that the model or
  * selection cannot be modified from within this function.
  **/
@@ -5111,7 +5089,7 @@
 /**
  * exo_icon_view_get_selection_mode:
  * @icon_view : A #ExoIconView.
- * 
+ *
  * Gets the selection mode of the @icon_view.
  *
  * Return value: the current selection mode
@@ -5129,7 +5107,7 @@
  * exo_icon_view_set_selection_mode:
  * @icon_view : A #ExoIconView.
  * @mode      : The selection mode
- * 
+ *
  * Sets the selection mode of the @icon_view.
  **/
 void
@@ -5142,7 +5120,7 @@
     {
       if (mode == GTK_SELECTION_NONE || icon_view->priv->selection_mode == GTK_SELECTION_MULTIPLE)
         exo_icon_view_unselect_all (icon_view);
-  
+
       icon_view->priv->selection_mode = mode;
 
       g_object_notify (G_OBJECT (icon_view), "selection-mode");
@@ -5162,7 +5140,7 @@
  *
  * Since: 0.3.1.5
  **/
-ExoIconViewLayoutMode 
+ExoIconViewLayoutMode
 exo_icon_view_get_layout_mode (const ExoIconView *icon_view)
 {
   g_return_val_if_fail (EXO_IS_ICON_VIEW (icon_view), EXO_ICON_VIEW_LAYOUT_ROWS);
@@ -5229,8 +5207,8 @@
  * @icon_view : A #ExoIconView.
  * @model     : The model.
  *
- * Sets the model for a #ExoIconView.  
- * If the @icon_view already has a model set, it will remove 
+ * Sets the model for a #ExoIconView.
+ * If the @icon_view already has a model set, it will remove
  * it before setting the new model.  If @model is %NULL, then
  * it will unset the old model.
  **/
@@ -5246,7 +5224,7 @@
 
   g_return_if_fail (EXO_IS_ICON_VIEW (icon_view));
   g_return_if_fail (model == NULL || GTK_IS_TREE_MODEL (model));
-  
+
   /* verify that we don't already use that model */
   if (G_UNLIKELY (icon_view->priv->model == model))
     return;
@@ -5265,7 +5243,7 @@
       if (G_UNLIKELY (icon_view->priv->markup_column != -1))
         g_return_if_fail (gtk_tree_model_get_column_type (model, icon_view->priv->markup_column) == G_TYPE_STRING);
     }
-  
+
   /* be sure to cancel any pending editor */
   exo_icon_view_stop_editing (icon_view, TRUE);
 
@@ -5373,7 +5351,7 @@
     exo_icon_view_search_dialog_hide (icon_view->priv->search_window, icon_view);
 
   /* notify listeners */
-  g_object_notify (G_OBJECT (icon_view), "model");  
+  g_object_notify (G_OBJECT (icon_view), "model");
 
   if (GTK_WIDGET_REALIZED (icon_view))
     gtk_widget_queue_resize (GTK_WIDGET (icon_view));
@@ -5387,24 +5365,24 @@
   ExoIconViewCellInfo *info;
   GList *l;
   gint i;
-          
+
   if (icon_view->priv->text_column == -1 &&
       icon_view->priv->markup_column == -1)
     {
       if (icon_view->priv->text_cell != -1)
         {
-          info = g_list_nth_data (icon_view->priv->cell_list, 
+          info = g_list_nth_data (icon_view->priv->cell_list,
                                   icon_view->priv->text_cell);
-          
+
           icon_view->priv->cell_list = g_list_remove (icon_view->priv->cell_list, info);
-          
+
           free_cell_info (info);
-          
+
           icon_view->priv->n_cells--;
           icon_view->priv->text_cell = -1;
         }
     }
-  else 
+  else
     {
       if (icon_view->priv->text_cell == -1)
         {
@@ -5420,19 +5398,19 @@
                 }
             }
         }
-      
+
       info = g_list_nth_data (icon_view->priv->cell_list,
                               icon_view->priv->text_cell);
 
       if (icon_view->priv->markup_column != -1)
         gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_view),
-                                        info->cell, 
-                                        "markup", icon_view->priv->markup_column, 
+                                        info->cell,
+                                        "markup", icon_view->priv->markup_column,
                                         NULL);
       else
         gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_view),
-                                        info->cell, 
-                                        "text", icon_view->priv->text_column, 
+                                        info->cell,
+                                        "text", icon_view->priv->text_column,
                                         NULL);
     }
 }
@@ -5448,23 +5426,23 @@
     {
       if (icon_view->priv->pixbuf_cell != -1)
         {
-          info = g_list_nth_data (icon_view->priv->cell_list, 
+          info = g_list_nth_data (icon_view->priv->cell_list,
                                   icon_view->priv->pixbuf_cell);
-          
+
           icon_view->priv->cell_list = g_list_remove (icon_view->priv->cell_list, info);
-          
+
           free_cell_info (info);
-          
+
           icon_view->priv->n_cells--;
           icon_view->priv->pixbuf_cell = -1;
         }
     }
-  else 
+  else
     {
       if (icon_view->priv->pixbuf_cell == -1)
         {
           GtkCellRenderer *cell = gtk_cell_renderer_pixbuf_new ();
-          
+
           gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (icon_view), cell, FALSE);
           for (l = icon_view->priv->cell_list, i = 0; l; l = l->next, i++)
             {
@@ -5476,13 +5454,13 @@
                 }
             }
         }
-      
-        info = g_list_nth_data (icon_view->priv->cell_list, 
+
+        info = g_list_nth_data (icon_view->priv->cell_list,
                                 icon_view->priv->pixbuf_cell);
-        
+
         gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_view),
-                                        info->cell, 
-                                        "pixbuf", icon_view->priv->pixbuf_column, 
+                                        info->cell,
+                                        "pixbuf", icon_view->priv->pixbuf_column,
                                         NULL);
     }
 }
@@ -5513,7 +5491,7 @@
  * exo_icon_view_set_text_column:
  * @icon_view: A #ExoIconView.
  * @column: A column in the currently used model.
- * 
+ *
  * Sets the column with text for @icon_view to be @column. The text
  * column must be of type #G_TYPE_STRING.
  *
@@ -5528,7 +5506,7 @@
 
   if (G_UNLIKELY (column == icon_view->priv->text_column))
     return;
-  
+
   if (column == -1)
     {
       icon_view->priv->text_column = -1;
@@ -5540,7 +5518,7 @@
           column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
           g_return_if_fail (column_type == G_TYPE_STRING);
         }
-      
+
       icon_view->priv->text_column = column;
     }
 
@@ -5549,7 +5527,7 @@
   update_text_cell (icon_view);
 
   exo_icon_view_invalidate_sizes (icon_view);
-  
+
   g_object_notify (G_OBJECT (icon_view), "text-column");
 }
 
@@ -5579,7 +5557,7 @@
  * exo_icon_view_set_markup_column:
  * @icon_view : A #ExoIconView.
  * @column    : A column in the currently used model.
- * 
+ *
  * Sets the column with markup information for @icon_view to be
  * @column. The markup column must be of type #G_TYPE_STRING.
  * If the markup column is set to something, it overrides
@@ -5594,7 +5572,7 @@
 {
   if (G_UNLIKELY (column == icon_view->priv->markup_column))
     return;
-  
+
   if (column == -1)
     icon_view->priv->markup_column = -1;
   else
@@ -5602,12 +5580,12 @@
       if (icon_view->priv->model != NULL)
         {
           GType column_type;
-          
+
           column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
 
           g_return_if_fail (column_type == G_TYPE_STRING);
         }
-      
+
       icon_view->priv->markup_column = column;
     }
 
@@ -5616,7 +5594,7 @@
   update_text_cell (icon_view);
 
   exo_icon_view_invalidate_sizes (icon_view);
-  
+
   g_object_notify (G_OBJECT (icon_view), "markup-column");
 }
 
@@ -5646,7 +5624,7 @@
  * exo_icon_view_set_pixbuf_column:
  * @icon_view : A #ExoIconView.
  * @column    : A column in the currently used model.
- * 
+ *
  * Sets the column with pixbufs for @icon_view to be @column. The pixbuf
  * column must be of type #GDK_TYPE_PIXBUF
  *
@@ -5661,7 +5639,7 @@
 
   if (G_UNLIKELY (column == icon_view->priv->pixbuf_column))
     return;
-  
+
   if (column == -1)
     {
       icon_view->priv->pixbuf_column = -1;
@@ -5673,7 +5651,7 @@
           column_type = gtk_tree_model_get_column_type (icon_view->priv->model, column);
           g_return_if_fail (column_type == GDK_TYPE_PIXBUF);
         }
-      
+
       icon_view->priv->pixbuf_column = column;
     }
 
@@ -5682,9 +5660,9 @@
   update_pixbuf_cell (icon_view);
 
   exo_icon_view_invalidate_sizes (icon_view);
-  
+
   g_object_notify (G_OBJECT (icon_view), "pixbuf-column");
-  
+
 }
 
 
@@ -5693,7 +5671,7 @@
  * exo_icon_view_select_path:
  * @icon_view : A #ExoIconView.
  * @path      : The #GtkTreePath to be selected.
- * 
+ *
  * Selects the row at @path.
  **/
 void
@@ -5717,7 +5695,7 @@
  * exo_icon_view_unselect_path:
  * @icon_view : A #ExoIconView.
  * @path      : The #GtkTreePath to be unselected.
- * 
+ *
  * Unselects the row at @path.
  **/
 void
@@ -5725,7 +5703,7 @@
                              GtkTreePath *path)
 {
   ExoIconViewItem *item;
-  
+
   g_return_if_fail (EXO_IS_ICON_VIEW (icon_view));
   g_return_if_fail (icon_view->priv->model != NULL);
   g_return_if_fail (gtk_tree_path_get_depth (path) > 0);
@@ -5760,9 +5738,9 @@
   GList *selected = NULL;
   GList *lp;
   gint   i;
-  
+
   g_return_val_if_fail (EXO_IS_ICON_VIEW (icon_view), NULL);
-  
+
   for (i = 0, lp = icon_view->priv->items; lp != NULL; ++i, lp = lp->next)
     {
       if (EXO_ICON_VIEW_ITEM (lp->data)->selected)
@@ -5777,7 +5755,7 @@
 /**
  * exo_icon_view_select_all:
  * @icon_view : A #ExoIconView.
- * 
+ *
  * Selects all the icons. @icon_view must has its selection mode set
  * to #GTK_SELECTION_MULTIPLE.
  **/
@@ -5786,7 +5764,7 @@
 {
   GList *items;
   gboolean dirty = FALSE;
-  
+
   g_return_if_fail (EXO_IS_ICON_VIEW (icon_view));
 
   if (icon_view->priv->selection_mode != GTK_SELECTION_MULTIPLE)
@@ -5795,7 +5773,7 @@
   for (items = icon_view->priv->items; items; items = items->next)
     {
       ExoIconViewItem *item = items->data;
-      
+
       if (!item->selected)
         {
           dirty = TRUE;
@@ -5813,7 +5791,7 @@
 /**
  * exo_icon_view_unselect_all:
  * @icon_view : A #ExoIconView.
- * 
+ *
  * Unselects all the icons.
  **/
 void
@@ -5834,10 +5812,10 @@
  * exo_icon_view_path_is_selected:
  * @icon_view: A #ExoIconView.
  * @path: A #GtkTreePath to check selection on.
- * 
+ *
  * Returns %TRUE if the icon pointed to by @path is currently
  * selected. If @icon does not point to a valid location, %FALSE is returned.
- * 
+ *
  * Return value: %TRUE if @path is selected.
  **/
 gboolean
@@ -5845,11 +5823,11 @@
                                 GtkTreePath       *path)
 {
   ExoIconViewItem *item;
-  
+
   g_return_val_if_fail (EXO_IS_ICON_VIEW (icon_view), FALSE);
   g_return_val_if_fail (icon_view->priv->model != NULL, FALSE);
   g_return_val_if_fail (gtk_tree_path_get_depth (path) > 0, FALSE);
-  
+
   item = g_list_nth_data (icon_view->priv->items, gtk_tree_path_get_indices(path)[0]);
 
   return (item != NULL && item->selected);
@@ -5861,7 +5839,7 @@
  * exo_icon_view_item_activated:
  * @icon_view : a #ExoIconView
  * @path      : the #GtkTreePath to be activated
- * 
+ *
  * Activates the item determined by @path.
  **/
 void
@@ -5870,7 +5848,7 @@
 {
   g_return_if_fail (EXO_IS_ICON_VIEW (icon_view));
   g_return_if_fail (gtk_tree_path_get_depth (path) > 0);
-  
+
   g_signal_emit (icon_view, icon_view_signals[ITEM_ACTIVATED], 0, path);
 }
 
@@ -5882,8 +5860,8 @@
  * @path      : Return location for the current cursor path, or %NULL
  * @cell      : Return location the current focus cell, or %NULL
  *
- * Fills in @path and @cell with the current cursor path and cell. 
- * If the cursor isn't currently set, then *@path will be %NULL.  
+ * Fills in @path and @cell with the current cursor path and cell.
+ * If the cursor isn't currently set, then *@path will be %NULL.
  * If no cell currently has focus, then *@cell will be %NULL.
  *
  * The returned #GtkTreePath must be freed with gtk_tree_path_free().
@@ -5924,13 +5902,13 @@
  * @start_editing : %TRUE if the specified cell should start being edited.
  *
  * Sets the current keyboard focus to be at @path, and selects it.  This is
- * useful when you want to focus the user's attention on a particular item.  
- * If @cell is not %NULL, then focus is given to the cell specified by 
- * it. Additionally, if @start_editing is %TRUE, then editing should be 
- * started in the specified cell.  
+ * useful when you want to focus the user's attention on a particular item.
+ * If @cell is not %NULL, then focus is given to the cell specified by
+ * it. Additionally, if @start_editing is %TRUE, then editing should be
+ * started in the specified cell.
  *
- * This function is often followed by <literal>gtk_widget_grab_focus 
- * (icon_view)</literal> in order to give keyboard focus to the widget.  
+ * This function is often followed by <literal>gtk_widget_grab_focus
+ * (icon_view)</literal> in order to give keyboard focus to the widget.
  * Please note that editing can only happen when the widget is realized.
  *
  * Since: 0.3.1
@@ -5951,11 +5929,11 @@
   g_return_if_fail (cell == NULL || GTK_IS_CELL_RENDERER (cell));
 
   exo_icon_view_stop_editing (icon_view, TRUE);
-  
+
   item = g_list_nth_data (icon_view->priv->items, gtk_tree_path_get_indices(path)[0]);
   if (G_UNLIKELY (item == NULL))
     return;
-  
+
   cell_pos = -1;
   for (l = icon_view->priv->cell_list, i = 0; l; l = l->next, i++)
     {
@@ -5990,9 +5968,9 @@
  * @row_align: The vertical alignment of the item specified by @path.
  * @col_align: The horizontal alignment of the item specified by @column.
  *
- * Moves the alignments of @icon_view to the position specified by @path.  
- * @row_align determines where the row is placed, and @col_align determines where 
- * @column is placed.  Both are expected to be between 0.0 and 1.0. 
+ * Moves the alignments of @icon_view to the position specified by @path.
+ * @row_align determines where the row is placed, and @col_align determines where
+ * @column is placed.  Both are expected to be between 0.0 and 1.0.
  * 0.0 means left/top alignment, 1.0 means right/bottom alignment, 0.5 means center.
  *
  * If @use_align is %FALSE, then the alignment arguments are ignored, and the
@@ -6019,7 +5997,7 @@
   g_return_if_fail (gtk_tree_path_get_depth (path) > 0);
   g_return_if_fail (row_align >= 0.0 && row_align <= 1.0);
   g_return_if_fail (col_align >= 0.0 && col_align <= 1.0);
-  
+
   /* Delay scrolling if either not realized or pending layout() */
   if (!GTK_WIDGET_REALIZED (icon_view) || icon_view->priv->layout_idle_id != 0)
     {
@@ -6048,19 +6026,19 @@
           gtk_widget_style_get (GTK_WIDGET (icon_view),
                                 "focus-line-width", &focus_width,
                                 NULL);
-          
+
           gdk_window_get_position (icon_view->priv->bin_window, &x, &y);
-          
-          offset =  y + item->area.y - focus_width - 
+
+          offset =  y + item->area.y - focus_width -
             row_align * (GTK_WIDGET (icon_view)->allocation.height - item->area.height);
-          value = CLAMP (icon_view->priv->vadjustment->value + offset, 
+          value = CLAMP (icon_view->priv->vadjustment->value + offset,
                          icon_view->priv->vadjustment->lower,
                          icon_view->priv->vadjustment->upper - icon_view->priv->vadjustment->page_size);
           gtk_adjustment_set_value (icon_view->priv->vadjustment, value);
 
-          offset = x + item->area.x - focus_width - 
+          offset = x + item->area.x - focus_width -
             col_align * (GTK_WIDGET (icon_view)->allocation.width - item->area.width);
-          value = CLAMP (icon_view->priv->hadjustment->value + offset, 
+          value = CLAMP (icon_view->priv->hadjustment->value + offset,
                          icon_view->priv->hadjustment->lower,
                          icon_view->priv->hadjustment->upper - icon_view->priv->hadjustment->page_size);
           gtk_adjustment_set_value (icon_view->priv->hadjustment, value);
@@ -6070,7 +6048,7 @@
         }
       else
         {
-          exo_icon_view_scroll_to_item (icon_view, item);    
+          exo_icon_view_scroll_to_item (icon_view, item);
         }
     }
 }
@@ -6080,12 +6058,12 @@
 /**
  * exo_icon_view_get_orientation:
  * @icon_view : a #ExoIconView
- * 
- * Returns the value of the ::orientation property which determines 
- * whether the labels are drawn beside the icons instead of below. 
- * 
- * Return value: the relative position of texts and icons 
  *
+ * Returns the value of the ::orientation property which determines
+ * whether the labels are drawn beside the icons instead of below.
+ *
+ * Return value: the relative position of texts and icons
+ *
  * Since: 0.3.1
  **/
 GtkOrientation
@@ -6100,14 +6078,14 @@
 /**
  * exo_icon_view_set_orientation:
  * @icon_view   : a #ExoIconView
- * @orientation : the relative position of texts and icons 
- * 
- * Sets the ::orientation property which determines whether the labels 
+ * @orientation : the relative position of texts and icons
+ *
+ * Sets the ::orientation property which determines whether the labels
  * are drawn beside the icons instead of below.
  *
  * Since: 0.3.1
  **/
-void 
+void
 exo_icon_view_set_orientation (ExoIconView   *icon_view,
                                GtkOrientation orientation)
 {
@@ -6122,7 +6100,7 @@
 
       update_text_cell (icon_view);
       update_pixbuf_cell (icon_view);
-      
+
       g_object_notify (G_OBJECT (icon_view), "orientation");
     }
 }
@@ -6132,9 +6110,9 @@
 /**
  * exo_icon_view_get_columns:
  * @icon_view: a #ExoIconView
- * 
+ *
  * Returns the value of the ::columns property.
- * 
+ *
  * Return value: the number of columns, or -1
  */
 gint
@@ -6150,29 +6128,29 @@
  * exo_icon_view_set_columns:
  * @icon_view : a #ExoIconView
  * @columns   : the number of columns
- * 
+ *
  * Sets the ::columns property which determines in how
  * many columns the icons are arranged. If @columns is
- * -1, the number of columns will be chosen automatically 
- * to fill the available area. 
+ * -1, the number of columns will be chosen automatically
+ * to fill the available area.
  *
  * Since: 0.3.1
  */
-void 
+void
 exo_icon_view_set_columns (ExoIconView *icon_view,
                            gint         columns)
 {
   g_return_if_fail (EXO_IS_ICON_VIEW (icon_view));
-  
+
   if (G_LIKELY (icon_view->priv->columns != columns))
     {
       icon_view->priv->columns = columns;
 
       exo_icon_view_stop_editing (icon_view, TRUE);
       exo_icon_view_queue_layout (icon_view);
-      
+
       g_object_notify (G_OBJECT (icon_view), "columns");
-    }  
+    }
 }
 
 
@@ -6180,9 +6158,9 @@
 /**
  * exo_icon_view_get_item_width:
  * @icon_view: a #ExoIconView
- * 
+ *
  * Returns the value of the ::item-width property.
- * 
+ *
  * Return value: the width of a single item, or -1
  *
  * Since: 0.3.1
@@ -6200,30 +6178,30 @@
  * exo_icon_view_set_item_width:
  * @icon_view  : a #ExoIconView
  * @item_width : the width for each item
- * 
- * Sets the ::item-width property which specifies the width 
- * to use for each item. If it is set to -1, the icon view will 
+ *
+ * Sets the ::item-width property which specifies the width
+ * to use for each item. If it is set to -1, the icon view will
  * automatically determine a suitable item size.
  *
  * Since: 0.3.1
  */
-void 
+void
 exo_icon_view_set_item_width (ExoIconView *icon_view,
                               gint         item_width)
 {
   g_return_if_fail (EXO_IS_ICON_VIEW (icon_view));
-  
+
   if (icon_view->priv->item_width != item_width)
     {
       icon_view->priv->item_width = item_width;
-      
+
       exo_icon_view_stop_editing (icon_view, TRUE);
       exo_icon_view_invalidate_sizes (icon_view);
-      
+
       update_text_cell (icon_view);
 
       g_object_notify (G_OBJECT (icon_view), "item-width");
-    }  
+    }
 }
 
 
@@ -6231,11 +6209,11 @@
 /**
  * exo_icon_view_get_spacing:
  * @icon_view: a #ExoIconView
- * 
+ *
  * Returns the value of the ::spacing property.
- * 
- * Return value: the space between cells 
  *
+ * Return value: the space between cells
+ *
  * Since: 0.3.1
  */
 gint
@@ -6251,28 +6229,28 @@
  * exo_icon_view_set_spacing:
  * @icon_view : a #ExoIconView
  * @spacing   : the spacing
- * 
- * Sets the ::spacing property which specifies the space 
- * which is inserted between the cells (i.e. the icon and 
+ *
+ * Sets the ::spacing property which specifies the space
+ * which is inserted between the cells (i.e. the icon and
  * the text) of an item.
  *
  * Since: 0.3.1
  */
-void 
+void
 exo_icon_view_set_spacing (ExoIconView *icon_view,
                            gint         spacing)
 {
   g_return_if_fail (EXO_IS_ICON_VIEW (icon_view));
-  
+
   if (G_LIKELY (icon_view->priv->spacing != spacing))
     {
       icon_view->priv->spacing = spacing;
 
       exo_icon_view_stop_editing (icon_view, TRUE);
       exo_icon_view_invalidate_sizes (icon_view);
-      
+
       g_object_notify (G_OBJECT (icon_view), "spacing");
-    }  
+    }
 }
 
 
@@ -6280,9 +6258,9 @@
 /**
  * exo_icon_view_get_row_spacing:
  * @icon_view: a #ExoIconView
- * 
+ *
  * Returns the value of the ::row-spacing property.
- * 
+ *
  * Return value: the space between rows
  *
  * Since: 0.3.1
@@ -6300,27 +6278,27 @@
  * exo_icon_view_set_row_spacing:
  * @icon_view   : a #ExoIconView
  * @row_spacing : the row spacing
- * 
- * Sets the ::row-spacing property which specifies the space 
+ *
+ * Sets the ::row-spacing property which specifies the space
  * which is inserted between the rows of the icon view.
  *
  * Since: 0.3.1
  */
-void 
+void
 exo_icon_view_set_row_spacing (ExoIconView *icon_view,
                                gint         row_spacing)
 {
   g_return_if_fail (EXO_IS_ICON_VIEW (icon_view));
-  
+
   if (G_LIKELY (icon_view->priv->row_spacing != row_spacing))
     {
       icon_view->priv->row_spacing = row_spacing;
 
       exo_icon_view_stop_editing (icon_view, TRUE);
       exo_icon_view_invalidate_sizes (icon_view);
-      
+
       g_object_notify (G_OBJECT (icon_view), "row-spacing");
-    }  
+    }
 }
 
 
@@ -6328,9 +6306,9 @@
 /**
  * exo_icon_view_get_column_spacing:
  * @icon_view: a #ExoIconView
- * 
+ *
  * Returns the value of the ::column-spacing property.
- * 
+ *
  * Return value: the space between columns
  *
  * Since: 0.3.1
@@ -6348,27 +6326,27 @@
  * exo_icon_view_set_column_spacing:
  * @icon_view      : a #ExoIconView
  * @column_spacing : the column spacing
- * 
- * Sets the ::column-spacing property which specifies the space 
+ *
+ * Sets the ::column-spacing property which specifies the space
  * which is inserted between the columns of the icon view.
  *
  * Since: 0.3.1
  **/
-void 
+void
 exo_icon_view_set_column_spacing (ExoIconView *icon_view,
                                   gint         column_spacing)
 {
   g_return_if_fail (EXO_IS_ICON_VIEW (icon_view));
-  
+
   if (G_LIKELY (icon_view->priv->column_spacing != column_spacing))
     {
       icon_view->priv->column_spacing = column_spacing;
 
       exo_icon_view_stop_editing (icon_view, TRUE);
       exo_icon_view_invalidate_sizes (icon_view);
-      
+
       g_object_notify (G_OBJECT (icon_view), "column-spacing");
-    }  
+    }
 }
 
 
@@ -6376,11 +6354,11 @@
 /**
  * exo_icon_view_get_margin:
  * @icon_view : a #ExoIconView
- * 
+ *
  * Returns the value of the ::margin property.
- * 
- * Return value: the space at the borders 
  *
+ * Return value: the space at the borders
+ *
  * Since: 0.3.1
  **/
 gint
@@ -6396,28 +6374,28 @@
  * exo_icon_view_set_margin:
  * @icon_view : a #ExoIconView
  * @margin    : the margin
- * 
- * Sets the ::margin property which specifies the space 
- * which is inserted at the top, bottom, left and right 
+ *
+ * Sets the ::margin property which specifies the space
+ * which is inserted at the top, bottom, left and right
  * of the icon view.
  *
  * Since: 0.3.1
  **/
-void 
+void
 exo_icon_view_set_margin (ExoIconView *icon_view,
                           gint         margin)
 {
   g_return_if_fail (EXO_IS_ICON_VIEW (icon_view));
-  
+
   if (G_LIKELY (icon_view->priv->margin != margin))
     {
       icon_view->priv->margin = margin;
 
       exo_icon_view_stop_editing (icon_view, TRUE);
       exo_icon_view_invalidate_sizes (icon_view);
-      
+
       g_object_notify (G_OBJECT (icon_view), "margin");
-    }  
+    }
 }
 
 
@@ -6532,9 +6510,9 @@
                               NULL, NULL);
       return;
     }
-  
+
   dr = g_slice_new0 (DestRow);
-     
+
   dr->dest_row = gtk_tree_row_reference_new (model, dest_row);
   dr->empty_view_drop = empty_view_drop;
   dr->drop_append_mode = drop_append_mode;
@@ -6555,7 +6533,7 @@
   if (dr)
     {
       GtkTreePath *path = NULL;
-      
+
       if (dr->dest_row)
         path = gtk_tree_row_reference_get_path (dr->dest_row);
       else if (dr->empty_view_drop)
@@ -6634,14 +6612,14 @@
 
   if (voffset != 0)
     {
-      value = CLAMP (icon_view->priv->vadjustment->value + voffset, 
+      value = CLAMP (icon_view->priv->vadjustment->value + voffset,
                      icon_view->priv->vadjustment->lower,
                      icon_view->priv->vadjustment->upper - icon_view->priv->vadjustment->page_size);
       gtk_adjustment_set_value (icon_view->priv->vadjustment, value);
     }
   if (hoffset != 0)
     {
-      value = CLAMP (icon_view->priv->hadjustment->value + hoffset, 
+      value = CLAMP (icon_view->priv->hadjustment->value + hoffset,
                      icon_view->priv->hadjustment->lower,
                      icon_view->priv->hadjustment->upper - icon_view->priv->hadjustment->page_size);
       gtk_adjustment_set_value (icon_view->priv->hadjustment, value);
@@ -6703,11 +6681,11 @@
   if (*target == GDK_NONE)
     return FALSE;
 
-  if (!exo_icon_view_get_dest_item_at_pos (icon_view, x, y, &path, &pos)) 
+  if (!exo_icon_view_get_dest_item_at_pos (icon_view, x, y, &path, &pos))
     {
       gint n_children;
       GtkTreeModel *model;
-      
+
       /* the row got dropped on empty space, let's setup a special case
        */
 
@@ -6738,10 +6716,10 @@
   exo_icon_view_get_drag_dest_item (icon_view,
                                     &old_dest_path,
                                     &old_pos);
-  
+
   if (old_dest_path)
     gtk_tree_path_free (old_dest_path);
-  
+
   if (TRUE /* FIXME if the location droppable predicate */)
     {
       can_drop = TRUE;
@@ -6774,10 +6752,10 @@
                                         NULL,
                                         EXO_ICON_VIEW_DROP_LEFT);
     }
-  
+
   if (path)
     gtk_tree_path_free (path);
-  
+
   return TRUE;
 }
 
@@ -6788,7 +6766,7 @@
   /* adjust path to point to the row the drop goes in front of */
   GtkTreePath *path = NULL;
   ExoIconViewDropPosition pos;
-  
+
   *drop_append_mode = FALSE;
 
   exo_icon_view_get_drag_dest_item (icon_view, &path, &pos);
@@ -6796,7 +6774,7 @@
   if (path == NULL)
     return NULL;
 
-  if (pos == EXO_ICON_VIEW_DROP_RIGHT || 
+  if (pos == EXO_ICON_VIEW_DROP_RIGHT ||
       pos == EXO_ICON_VIEW_DROP_BELOW)
     {
       GtkTreeIter iter;
@@ -6809,7 +6787,7 @@
         {
           *drop_append_mode = FALSE;
           gtk_tree_path_next (path);
-        }      
+        }
     }
 
   return path;
@@ -6862,7 +6840,7 @@
    */
 
   /* Now we can begin the drag */
-  
+
   retval = TRUE;
 
   context = gtk_drag_begin (GTK_WIDGET (icon_view),
@@ -6872,7 +6850,7 @@
                             (GdkEvent*)event);
 
   set_source_row (context, model, path);
-  
+
  out:
   if (path)
     gtk_tree_path_free (path);
@@ -6881,7 +6859,7 @@
 }
 
 /* Source side drag signals */
-static void 
+static void
 exo_icon_view_drag_begin (GtkWidget      *widget,
                           GdkDragContext *context)
 {
@@ -6907,28 +6885,28 @@
 
   x = icon_view->priv->press_start_x - item->area.x + 1;
   y = icon_view->priv->press_start_y - item->area.y + 1;
-  
+
   path = gtk_tree_path_new_from_indices (g_list_index (icon_view->priv->items, item), -1);
   icon = exo_icon_view_create_drag_icon (icon_view, path);
   gtk_tree_path_free (path);
 
-  gtk_drag_set_icon_pixmap (context, 
+  gtk_drag_set_icon_pixmap (context,
                             gdk_drawable_get_colormap (icon),
-                            icon, 
-                            NULL, 
+                            icon,
+                            NULL,
                             x, y);
 
   g_object_unref (icon);
 }
 
-static void 
+static void
 exo_icon_view_drag_end (GtkWidget      *widget,
                         GdkDragContext *context)
 {
   /* do nothing */
 }
 
-static void 
+static void
 exo_icon_view_drag_data_get (GtkWidget        *widget,
                              GdkDragContext   *context,
                              GtkSelectionData *selection_data,
@@ -6974,7 +6952,7 @@
   gtk_tree_path_free (source_row);
 }
 
-static void 
+static void
 exo_icon_view_drag_data_delete (GtkWidget      *widget,
                                 GdkDragContext *context)
 {
@@ -7022,7 +7000,7 @@
   remove_scroll_timeout (icon_view);
 }
 
-static gboolean 
+static gboolean
 exo_icon_view_drag_motion (GtkWidget      *widget,
                            GdkDragContext *context,
                            gint            x,
@@ -7075,7 +7053,7 @@
   return TRUE;
 }
 
-static gboolean 
+static gboolean
 exo_icon_view_drag_drop (GtkWidget      *widget,
                          GdkDragContext *context,
                          gint            x,
@@ -7102,7 +7080,7 @@
 
   if (!set_destination (icon_view, context, x, y, &suggested_action, &target))
     return FALSE;
-  
+
   path = get_logical_destination (icon_view, &drop_append_mode);
 
   if (target != GDK_NONE && path != NULL)
@@ -7111,7 +7089,7 @@
        * treat drag data receives as a drop.
        */
       set_status_pending (context, 0);
-      set_dest_row (context, model, path, 
+      set_dest_row (context, model, path,
                     icon_view->priv->empty_view_drop, drop_append_mode);
     }
 
@@ -7146,8 +7124,8 @@
   GtkTreePath *dest_row;
   GdkDragAction suggested_action;
   gboolean drop_append_mode;
-  
-  icon_view = EXO_ICON_VIEW (widget);  
+
+  icon_view = EXO_ICON_VIEW (widget);
   model = exo_icon_view_get_model (icon_view);
 
   if (!check_model_dnd (model, GTK_TYPE_TREE_DRAG_DEST, "drag_data_received"))
@@ -7190,8 +7168,8 @@
                                           EXO_ICON_VIEW_DROP_LEFT);
       return;
     }
-  
 
+
   dest_row = get_dest_row (context);
 
   if (dest_row == NULL)
@@ -7225,7 +7203,7 @@
  * @targets           : the table of targets that the drag will support
  * @n_targets         : the number of items in @targets
  * @actions           : the bitmask of possible actions for a drag from this widget
- * 
+ *
  * Turns @icon_view into a drag source for automatic DND.
  *
  * Since: 0.3.1
@@ -7259,12 +7237,12 @@
  * @targets   : the table of targets that the drag will support
  * @n_targets : the number of items in @targets
  * @actions   : the bitmask of possible actions for a drag from this widget
- * 
+ *
  * Turns @icon_view into a drop destination for automatic DND.
  *
  * Since: 0.3.1
  **/
-void 
+void
 exo_icon_view_enable_model_drag_dest (ExoIconView          *icon_view,
                                       const GtkTargetEntry *targets,
                                       gint                  n_targets,
@@ -7281,7 +7259,7 @@
 
   icon_view->priv->dest_set = TRUE;
 
-  unset_reorderable (icon_view);  
+  unset_reorderable (icon_view);
 }
 
 
@@ -7289,7 +7267,7 @@
 /**
  * exo_icon_view_unset_model_drag_source:
  * @icon_view : a #ExoIconView
- * 
+ *
  * Undoes the effect of #exo_icon_view_enable_model_drag_source().
  *
  * Since: 0.3.1
@@ -7313,7 +7291,7 @@
 /**
  * exo_icon_view_unset_model_drag_dest:
  * @icon_view : a #ExoIconView
- * 
+ *
  * Undoes the effect of #exo_icon_view_enable_model_drag_dest().
  *
  * Since: 0.3.1
@@ -7339,7 +7317,7 @@
  * @icon_view : a #ExoIconView
  * @path      : The path of the item to highlight, or %NULL.
  * @pos       : Specifies whether to drop, relative to the item
- * 
+ *
  * Sets the item that is highlighted for feedback.
  *
  * Since: 0.3.1
@@ -7375,7 +7353,7 @@
           gtk_tree_path_free (previous_path);
         }
     }
-  
+
   /* special case a drop on an empty model */
   icon_view->priv->empty_view_drop = FALSE;
   if (pos == GTK_TREE_VIEW_DROP_BEFORE && path
@@ -7412,7 +7390,7 @@
  * @icon_view : a #ExoIconView
  * @path      : Return location for the path of the highlighted item, or %NULL.
  * @pos       : Return location for the drop position, or %NULL
- * 
+ *
  * Gets information about the item that is highlighted for feedback.
  *
  * Since: 0.3.1
@@ -7445,7 +7423,7 @@
  * @drag_y    : the position to determine the destination item for
  * @path      : Return location for the path of the highlighted item, or %NULL.
  * @pos       : Return location for the drop position, or %NULL
- * 
+ *
  * Determines the destination item for a given position.
  *
  * Both @drag_x and @drag_y are given in icon window coordinates. Use
@@ -7509,11 +7487,11 @@
  * @icon_view : a #ExoIconView
  * @path      : a #GtkTreePath in @icon_view
  *
- * Creates a #GdkPixmap representation of the item at @path.  
+ * Creates a #GdkPixmap representation of the item at @path.
  * This image is used for a drag icon.
  *
  * Return value: a newly-allocated pixmap of the drag icon.
- * 
+ *
  * Since: 0.3.1
  **/
 GdkPixmap*
@@ -7536,7 +7514,7 @@
 
   idx = gtk_tree_path_get_indices (path)[0];
 
-  for (lp = icon_view->priv->items; lp != NULL; lp = lp->next) 
+  for (lp = icon_view->priv->items; lp != NULL; lp = lp->next)
     {
       ExoIconViewItem *item = lp->data;
       if (G_UNLIKELY (idx == g_list_index (icon_view->priv->items, item)))
@@ -7555,7 +7533,7 @@
           area.width = item->area.width;
           area.height = item->area.height;
 
-          exo_icon_view_paint_item (icon_view, item, &area, drawable, 1, 1, FALSE); 
+          exo_icon_view_paint_item (icon_view, item, &area, drawable, 1, 1, FALSE);
 
           gdk_gc_set_rgb_fg_color (gc, &widget->style->black);
           gdk_draw_rectangle (drawable, gc, FALSE, 1, 1, item->area.width + 1, item->area.height + 1);
@@ -7565,7 +7543,7 @@
           return drawable;
         }
     }
-  
+
   return NULL;
 }
 
@@ -7575,7 +7553,7 @@
  * exo_icon_view_get_reorderable:
  * @icon_view : a #ExoIconView
  *
- * Retrieves whether the user can reorder the list via drag-and-drop. 
+ * Retrieves whether the user can reorder the list via drag-and-drop.
  * See exo_icon_view_set_reorderable().
  *
  * Return value: %TRUE if the list can be reordered.
@@ -7793,7 +7771,7 @@
           exo_icon_view_set_cursor_item (icon_view, item, -1);
           if (icon_view->priv->anchor_item == NULL)
             icon_view->priv->anchor_item = item;
-          else 
+          else
             exo_icon_view_select_all_between (icon_view, icon_view->priv->anchor_item, item);
 
           /* selection was changed */

Modified: libexo/trunk/exo/exo-icon-view.h
===================================================================
--- libexo/trunk/exo/exo-icon-view.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-icon-view.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -30,7 +30,7 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _ExoIconViewPrivate    ExoIconViewPrivate;
 typedef struct _ExoIconViewClass      ExoIconViewClass;
@@ -142,7 +142,7 @@
   void     (*set_scroll_adjustments)    (ExoIconView     *icon_view,
                                          GtkAdjustment   *hadjustment,
                                          GtkAdjustment   *vadjustment);
-  
+
   /* signals */
   void     (*item_activated)            (ExoIconView     *icon_view,
                                          GtkTreePath     *path);
@@ -206,19 +206,19 @@
                                                                gint                      item_width);
 
 gint                  exo_icon_view_get_spacing               (const ExoIconView        *icon_view);
-void                  exo_icon_view_set_spacing               (ExoIconView              *icon_view, 
+void                  exo_icon_view_set_spacing               (ExoIconView              *icon_view,
                                                                gint                      spacing);
 
 gint                  exo_icon_view_get_row_spacing           (const ExoIconView        *icon_view);
-void                  exo_icon_view_set_row_spacing           (ExoIconView              *icon_view, 
+void                  exo_icon_view_set_row_spacing           (ExoIconView              *icon_view,
                                                                gint                      row_spacing);
 
 gint                  exo_icon_view_get_column_spacing        (const ExoIconView        *icon_view);
-void                  exo_icon_view_set_column_spacing        (ExoIconView              *icon_view, 
+void                  exo_icon_view_set_column_spacing        (ExoIconView              *icon_view,
                                                                gint                      column_spacing);
 
 gint                  exo_icon_view_get_margin                (const ExoIconView        *icon_view);
-void                  exo_icon_view_set_margin                (ExoIconView              *icon_view, 
+void                  exo_icon_view_set_margin                (ExoIconView              *icon_view,
                                                                gint                      margin);
 
 GtkSelectionMode      exo_icon_view_get_selection_mode        (const ExoIconView        *icon_view);
@@ -340,7 +340,7 @@
                                                                        ExoIconViewSearchPositionFunc search_position_func,
                                                                        gpointer                      search_position_data,
                                                                        GDestroyNotify                search_position_destroy);
- 
-G_END_DECLS;
 
+G_END_DECLS
+
 #endif /* __EXO_ICON_VIEW_H__ */

Modified: libexo/trunk/exo/exo-job.c
===================================================================
--- libexo/trunk/exo/exo-job.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-job.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -54,8 +54,6 @@
 
 
 
-static void exo_job_class_init (ExoJobClass  *klass);
-static void exo_job_init       (ExoJob       *job);
 static void exo_job_finalize   (GObject      *object);
 static void exo_job_error      (ExoJob       *job,
                                 GError       *error);
@@ -80,32 +78,14 @@
 
 
 
-static GObjectClass *exo_job_parent_class = NULL;
-static guint         job_signals[LAST_SIGNAL];
+static guint job_signals[LAST_SIGNAL];
 
 
 
-GType
-exo_job_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
+G_DEFINE_ABSTRACT_TYPE (ExoJob, exo_job, G_TYPE_OBJECT)
 
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = g_type_register_static_simple (G_TYPE_OBJECT, 
-                                            "ExoJob",
-                                            sizeof (ExoJobClass),
-                                            (GClassInitFunc) exo_job_class_init,
-                                            sizeof (ExoJob),
-                                            (GInstanceInitFunc) exo_job_init,
-                                            G_TYPE_FLAG_ABSTRACT);
-    }
 
-  return type;
-}
 
-
-
 static void
 exo_job_class_init (ExoJobClass *klass)
 {
@@ -113,11 +93,8 @@
 
   g_type_class_add_private (klass, sizeof (ExoJobPrivate));
 
-  /* Determine the parent type class */
-  exo_job_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize = exo_job_finalize; 
+  gobject_class->finalize = exo_job_finalize;
 
   klass->execute = NULL;
   klass->error = NULL;
@@ -135,8 +112,8 @@
   job_signals[ERROR] =
     g_signal_new (I_("error"),
                   G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_NO_HOOKS, 
-                  G_STRUCT_OFFSET (ExoJobClass, error), 
+                  G_SIGNAL_NO_HOOKS,
+                  G_STRUCT_OFFSET (ExoJobClass, error),
                   NULL, NULL,
                   g_cclosure_marshal_VOID__POINTER,
                   G_TYPE_NONE, 1, G_TYPE_POINTER);
@@ -145,15 +122,15 @@
    * ExoJob::finished:
    * @job : an #ExoJob.
    *
-   * This signal will be automatically emitted once the @job finishes 
-   * its execution, no matter whether @job completed successfully or 
+   * This signal will be automatically emitted once the @job finishes
+   * its execution, no matter whether @job completed successfully or
    * was cancelled by the user.
    **/
   job_signals[FINISHED] =
     g_signal_new (I_("finished"),
                   G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_NO_HOOKS, 
-                  G_STRUCT_OFFSET (ExoJobClass, finished), 
+                  G_SIGNAL_NO_HOOKS,
+                  G_STRUCT_OFFSET (ExoJobClass, finished),
                   NULL, NULL,
                   g_cclosure_marshal_VOID__VOID,
                   G_TYPE_NONE, 0);
@@ -166,14 +143,14 @@
    * This signal is emitted to display information about the * @job.
    * Examples of messages are "Preparing..." or "Cleaning up...".
    *
-   * The @message is garanteed to contain valid UTF-8, so it can be 
+   * The @message is garanteed to contain valid UTF-8, so it can be
    * displayed by #GtkWidget<!---->s out of the box.
    **/
   job_signals[INFO_MESSAGE] =
     g_signal_new (I_("info-message"),
                   G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_NO_HOOKS, 
-                  G_STRUCT_OFFSET (ExoJobClass, info_message), 
+                  G_SIGNAL_NO_HOOKS,
+                  G_STRUCT_OFFSET (ExoJobClass, info_message),
                   NULL, NULL,
                   g_cclosure_marshal_VOID__STRING,
                   G_TYPE_NONE, 1, G_TYPE_STRING);
@@ -183,15 +160,15 @@
    * @job     : an #ExoJob.
    * @percent : the percentage of completeness.
    *
-   * This signal is emitted to present the state of the overall 
-   * progress. The @percent value is garantied to be in the range 0.0 
+   * This signal is emitted to present the state of the overall
+   * progress. The @percent value is garantied to be in the range 0.0
    * to 100.0.
    **/
   job_signals[PERCENT] =
     g_signal_new (I_("percent"),
                   G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_NO_HOOKS, 
-                  G_STRUCT_OFFSET (ExoJobClass, percent), 
+                  G_SIGNAL_NO_HOOKS,
+                  G_STRUCT_OFFSET (ExoJobClass, percent),
                   NULL, NULL,
                   g_cclosure_marshal_VOID__DOUBLE,
                   G_TYPE_NONE, 1, G_TYPE_DOUBLE);
@@ -254,7 +231,7 @@
  * @object : an #ExoJob.
  * @result : the #GAsyncResult of the job.
  *
- * This function is called by the #GIOScheduler at the end of the 
+ * This function is called by the #GIOScheduler at the end of the
  * operation. It checks if there were errors during the operation
  * and emits "error" and "finished" signals.
  **/
@@ -291,7 +268,7 @@
  * @user_data     : a #GSimpleAsyncResult.
  *
  * This function is called by the #GIOScheduler to execute the
- * operation associated with the job. It basically calls the 
+ * operation associated with the job. It basically calls the
  * ExoJobClass#execute function.
  *
  * Return value: %FALSE, to stop the thread at the end of the
@@ -313,7 +290,7 @@
   success = (*EXO_JOB_GET_CLASS (job)->execute) (job, &error);
 
   /* TODO why was this necessary again? */
-  g_io_scheduler_job_send_to_mainloop (scheduler_job, (GSourceFunc) gtk_false, 
+  g_io_scheduler_job_send_to_mainloop (scheduler_job, (GSourceFunc) gtk_false,
                                        NULL, NULL);
 
   if (!success)
@@ -344,7 +321,7 @@
 {
   ExoJobSignalData *data = user_data;
 
-  g_signal_emit_valist (data->instance, data->signal_id, data->signal_detail, 
+  g_signal_emit_valist (data->instance, data->signal_id, data->signal_detail,
                         data->var_args);
 
   return FALSE;
@@ -361,8 +338,8 @@
  *                  return type of the signal is G_TYPE_NONE, the return
  *                  value location can be omitted.
  *
- * Send a the signal with the given @signal_id and @signal_detail to the 
- * main loop of the application and waits for the listeners to handle 
+ * Send a the signal with the given @signal_id and @signal_detail to the
+ * main loop of the application and waits for the listeners to handle
  * it.
  **/
 static void
@@ -379,7 +356,7 @@
   data.instance = job;
   data.signal_id = signal_id;
   data.signal_detail = signal_detail;
-  
+
   /* copy the variable argument list */
   G_VA_COPY (data.var_args, var_args);
 
@@ -419,7 +396,7 @@
  * @job : an #ExoJob.
  *
  * Emits the "finished" signal to notify listeners of the end of the
- * operation. 
+ * operation.
  *
  * This function should never be called from outside the application's
  * main loop.
@@ -476,9 +453,9 @@
  * exo_job_cancel:
  * @job : a #ExoJob.
  *
- * Attempts to cancel the operation currently performed by @job. Even 
+ * Attempts to cancel the operation currently performed by @job. Even
  * after the cancellation of @job, it may still emit signals, so you
- * must take care of disconnecting all handlers appropriately if you 
+ * must take care of disconnecting all handlers appropriately if you
  * cannot handle signals after cancellation.
  **/
 void
@@ -532,7 +509,7 @@
  * @error : error to be set if the @job was cancelled.
  *
  * Sets the @error if the @job was cancelled. This is a convenience
- * function that is equivalent to 
+ * function that is equivalent to
  * <informalexample><programlisting>
  * GCancellable *cancellable;
  * cancellable = exo_job_get_cancllable (job);
@@ -641,7 +618,7 @@
                           GDestroyNotify destroy_notify)
 {
   _exo_return_val_if_fail (EXO_IS_JOB (job), FALSE);
-  
+
   return g_io_scheduler_job_send_to_mainloop (job->priv->scheduler_job, func, user_data,
                                               destroy_notify);
 }

Modified: libexo/trunk/exo/exo-job.h
===================================================================
--- libexo/trunk/exo/exo-job.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-job.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -46,7 +46,7 @@
 
   /* virtual methods */
   gboolean   (*execute)      (ExoJob      *job,
-                              GError     **error); 
+                              GError     **error);
 
   /* signals */
   void       (*error)        (ExoJob      *job,

Modified: libexo/trunk/exo/exo-md5.c
===================================================================
--- libexo/trunk/exo/exo-md5.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-md5.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -47,7 +47,7 @@
  * This code implements the MD5 message-digest algorithm.
  * The algorithm is due to Ron Rivest. The original code was
  * written by Colin Plumb in 1993, and put in the public domain.
- * 
+ *
  * Modified to use glib datatypes. Put under GPL to simplify
  * licensing for ROX-Filer. Taken from Debian's dpkg package.
  */
@@ -57,9 +57,9 @@
 typedef struct _MD5_CTX MD5_CTX;
 
 struct _MD5_CTX {
-	guint32 buf[4];
-	guint32 bytes[2];
-	guint32 in[16];
+  guint32 buf[4];
+  guint32 bytes[2];
+  guint32 in[16];
 };
 
 
@@ -68,13 +68,15 @@
 static void
 byteSwap (guint32 *buf, unsigned words)
 {
-	md5byte *p = (md5byte *)buf;
+  md5byte *p = (md5byte *)buf;
 
-	do {
-		*buf++ = (guint32)((unsigned)p[3] << 8 | p[2]) << 16 |
-			((unsigned)p[1] << 8 | p[0]);
-		p += 4;
-	} while (--words);
+  do
+    {
+      *buf++ = (guint32)((unsigned)p[3] << 8 | p[2]) << 16 |
+                ((unsigned)p[1] << 8 | p[0]);
+      p += 4;
+    }
+  while (--words);
 }
 #else
 #define byteSwap(buf,words)
@@ -89,13 +91,13 @@
 static void
 MD5Init (MD5_CTX *ctx)
 {
-	ctx->buf[0] = 0x67452301;
-	ctx->buf[1] = 0xefcdab89;
-	ctx->buf[2] = 0x98badcfe;
-	ctx->buf[3] = 0x10325476;
+  ctx->buf[0] = 0x67452301;
+  ctx->buf[1] = 0xefcdab89;
+  ctx->buf[2] = 0x98badcfe;
+  ctx->buf[3] = 0x10325476;
 
-	ctx->bytes[0] = 0;
-	ctx->bytes[1] = 0;
+  ctx->bytes[0] = 0;
+  ctx->bytes[1] = 0;
 }
 
 
@@ -112,7 +114,7 @@
 
 /* This is the central step in the MD5 algorithm. */
 #define MD5STEP(f,w,x,y,z,in,s) \
-	 (w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
+         (w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
 
 
 
@@ -124,85 +126,85 @@
 static void
 MD5Transform (guint32 buf[4], guint32 const in[16])
 {
-	register guint32 a, b, c, d;
+  register guint32 a, b, c, d;
 
-	a = buf[0];
-	b = buf[1];
-	c = buf[2];
-	d = buf[3];
+  a = buf[0];
+  b = buf[1];
+  c = buf[2];
+  d = buf[3];
 
-	MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
-	MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
-	MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
-	MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
-	MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
-	MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
-	MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
-	MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
-	MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
-	MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
-	MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
-	MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
-	MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
-	MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
-	MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
-	MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
+  MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+  MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+  MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
+  MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+  MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+  MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+  MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
+  MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
+  MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
+  MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+  MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+  MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+  MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
+  MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
+  MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
+  MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
 
-	MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
-	MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
-	MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
-	MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
-	MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
-	MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
-	MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
-	MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
-	MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
-	MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
-	MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
-	MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
-	MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
-	MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
-	MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
-	MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+  MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+  MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
+  MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+  MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+  MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+  MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
+  MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+  MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+  MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+  MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+  MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+  MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+  MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+  MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+  MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+  MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
 
-	MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
-	MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
-	MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
-	MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
-	MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
-	MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
-	MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
-	MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
-	MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
-	MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
-	MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
-	MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
-	MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
-	MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
-	MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
-	MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+  MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+  MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
+  MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+  MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+  MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+  MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+  MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+  MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+  MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+  MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+  MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+  MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
+  MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+  MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+  MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+  MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
 
-	MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
-	MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
-	MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
-	MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
-	MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
-	MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
-	MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
-	MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
-	MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
-	MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
-	MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
-	MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
-	MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
-	MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
-	MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
-	MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+  MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
+  MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
+  MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+  MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+  MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+  MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+  MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+  MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+  MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+  MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+  MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
+  MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+  MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+  MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+  MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+  MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
 
-	buf[0] += a;
-	buf[1] += b;
-	buf[2] += c;
-	buf[3] += d;
+  buf[0] += a;
+  buf[1] += b;
+  buf[2] += c;
+  buf[3] += d;
 }
 
 
@@ -214,74 +216,77 @@
 static void
 MD5Update (MD5_CTX *ctx, md5byte const *buf, unsigned len)
 {
-	guint32 t;
+  guint32 t;
 
-	/* Update byte count */
+  /* Update byte count */
 
-	t = ctx->bytes[0];
-	if ((ctx->bytes[0] = t + len) < t)
-		ctx->bytes[1]++;	/* Carry from low to high */
+  t = ctx->bytes[0];
+  if ((ctx->bytes[0] = t + len) < t)
+    ctx->bytes[1]++;        /* Carry from low to high */
 
-	t = 64 - (t & 0x3f);	/* Space available in ctx->in (at least 1) */
-	if (t > len) {
-		memcpy((md5byte *)ctx->in + 64 - t, buf, len);
-		return;
-	}
-	/* First chunk is an odd size */
-	memcpy((md5byte *)ctx->in + 64 - t, buf, t);
-	byteSwap(ctx->in, 16);
-	MD5Transform(ctx->buf, ctx->in);
-	buf += t;
-	len -= t;
+  t = 64 - (t & 0x3f);    /* Space available in ctx->in (at least 1) */
+  if (t > len)
+    {
+      memcpy((md5byte *)ctx->in + 64 - t, buf, len);
+      return;
+    }
+  /* First chunk is an odd size */
+  memcpy((md5byte *)ctx->in + 64 - t, buf, t);
+  byteSwap(ctx->in, 16);
+  MD5Transform(ctx->buf, ctx->in);
+  buf += t;
+  len -= t;
 
-	/* Process data in 64-byte chunks */
-	while (len >= 64) {
-		memcpy(ctx->in, buf, 64);
-		byteSwap(ctx->in, 16);
-		MD5Transform(ctx->buf, ctx->in);
-		buf += 64;
-		len -= 64;
-	}
+  /* Process data in 64-byte chunks */
+  while (len >= 64)
+    {
+      memcpy(ctx->in, buf, 64);
+      byteSwap(ctx->in, 16);
+      MD5Transform(ctx->buf, ctx->in);
+      buf += 64;
+      len -= 64;
+    }
 
-	/* Handle any remaining bytes of data. */
-	memcpy(ctx->in, buf, len);
+  /* Handle any remaining bytes of data. */
+  memcpy(ctx->in, buf, len);
 }
 
 
 
 /*
- * Final wrapup - pad to 64-byte boundary with the bit pattern 
+ * Final wrapup - pad to 64-byte boundary with the bit pattern
  * 1 0* (64-bit count of bits processed, MSB-first)
  * Returns the newly allocated string of the hash.
  */
 static void
 MD5Final (unsigned char digest[16], MD5_CTX *ctx)
 {
-	int count = ctx->bytes[0] & 0x3f;	/* Number of bytes in ctx->in */
-	md5byte *p = (md5byte *)ctx->in + count;
+  int count = ctx->bytes[0] & 0x3f;       /* Number of bytes in ctx->in */
+  md5byte *p = (md5byte *)ctx->in + count;
 
-	/* Set the first char of padding to 0x80.  There is always room. */
-	*p++ = 0x80;
+  /* Set the first char of padding to 0x80.  There is always room. */
+  *p++ = 0x80;
 
-	/* Bytes of padding needed to make 56 bytes (-8..55) */
-	count = 56 - 1 - count;
+  /* Bytes of padding needed to make 56 bytes (-8..55) */
+  count = 56 - 1 - count;
 
-	if (count < 0) {	/* Padding forces an extra block */
-		memset(p, 0, count + 8);
-		byteSwap(ctx->in, 16);
-		MD5Transform(ctx->buf, ctx->in);
-		p = (md5byte *)ctx->in;
-		count = 56;
-	}
-	memset(p, 0, count);
-	byteSwap(ctx->in, 14);
+  if (count < 0)        /* Padding forces an extra block */
+    {
+      memset(p, 0, count + 8);
+      byteSwap(ctx->in, 16);
+      MD5Transform(ctx->buf, ctx->in);
+      p = (md5byte *)ctx->in;
+      count = 56;
+    }
+  memset(p, 0, count);
+  byteSwap(ctx->in, 14);
 
-	/* Append length in bits and transform */
-	ctx->in[14] = ctx->bytes[0] << 3;
-	ctx->in[15] = ctx->bytes[1] << 3 | ctx->bytes[0] >> 29;
-	MD5Transform (ctx->buf, ctx->in);
+  /* Append length in bits and transform */
+  ctx->in[14] = ctx->bytes[0] << 3;
+  ctx->in[15] = ctx->bytes[1] << 3 | ctx->bytes[0] >> 29;
+  MD5Transform (ctx->buf, ctx->in);
 
-	byteSwap(ctx->buf, 4);
+  byteSwap(ctx->buf, 4);
 
   memcpy (digest, ctx->buf, 16);
 }
@@ -503,10 +508,10 @@
  * exo_md5_digest_equal:
  * @digest1: the first #ExoMd5Digest to compare.
  * @digest2: the second #ExoMd5Digest to compare.
- * 
+ *
  * Tests the equality of @digest1 and @digest2, useful for #GHashTable and
  * #GCashe.
- * 
+ *
  * Returns: %TRUE if both digests are equal, %FALSE otherwise.
  **/
 gboolean

Modified: libexo/trunk/exo/exo-md5.h
===================================================================
--- libexo/trunk/exo/exo-md5.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-md5.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -30,7 +30,7 @@
 
 #include <exo/exo-config.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 #define EXO_TYPE_MD5_DIGEST (exo_md5_digest_get_type ())
 
@@ -55,6 +55,6 @@
 gboolean      exo_md5_digest_equal    (gconstpointer       digest1,
                                        gconstpointer       digest2);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_MD5_H__ */

Modified: libexo/trunk/exo/exo-mount-point.c
===================================================================
--- libexo/trunk/exo/exo-mount-point.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-mount-point.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -552,7 +552,7 @@
   g_return_val_if_fail ((mask & EXO_MOUNT_POINT_MATCH_FSTYPE) == 0 || fstype != NULL, NULL);
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
-#if defined(HAVE_GETFSSTAT) && !defined(HAVE_GETMNTENT) && !defined(HAVE_SETMNTENT) 
+#if defined(HAVE_GETFSSTAT) && !defined(HAVE_GETMNTENT) && !defined(HAVE_SETMNTENT)
   /* getfsstat(2) is really thread-safe, so we can skip locking there */
   if ((mask & EXO_MOUNT_POINT_MATCH_CONFIGURED) == EXO_MOUNT_POINT_MATCH_CONFIGURED)
 #endif
@@ -566,7 +566,7 @@
                ? exo_mount_point_list_match_active (mask, device, folder, fstype, error)
                : exo_mount_point_list_match_configured (mask, device, folder, fstype, error);
 
-#if defined(HAVE_GETFSSTAT) && !defined(HAVE_GETMNTENT) && !defined(HAVE_SETMNTENT) 
+#if defined(HAVE_GETFSSTAT) && !defined(HAVE_GETMNTENT) && !defined(HAVE_SETMNTENT)
   /* getfsstat(2) is really thread-safe, so we can skip locking there */
   if ((mask & EXO_MOUNT_POINT_MATCH_CONFIGURED) == EXO_MOUNT_POINT_MATCH_CONFIGURED)
 #endif

Modified: libexo/trunk/exo/exo-mount-point.h
===================================================================
--- libexo/trunk/exo/exo-mount-point.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-mount-point.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -27,7 +27,7 @@
 
 #include <exo/exo-config.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 /**
  * ExoMountPointFlags:
@@ -128,6 +128,6 @@
  **/
 #define exo_mount_point_list_configured(error) (exo_mount_point_list_matched (EXO_MOUNT_POINT_MATCH_CONFIGURED, NULL, NULL, NULL, (error)))
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_MOUNT_POINT_H__ */

Modified: libexo/trunk/exo/exo-pango-extensions.c
===================================================================
--- libexo/trunk/exo/exo-pango-extensions.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-pango-extensions.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -44,7 +44,7 @@
  * @string : The string to ellipsize.
  * @width  : The maximal width for the @layout.
  * @mode   : The ellipsize mode.
- * 
+ *
  * Truncates a string if required to fit in @width and sets it on the
  * layout. Truncation involves removing characters from the start, middle or end
  * respectively and replacing them with "...". Algorithm is a bit

Modified: libexo/trunk/exo/exo-pango-extensions.h
===================================================================
--- libexo/trunk/exo/exo-pango-extensions.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-pango-extensions.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -33,7 +33,7 @@
 
 #include <pango/pango.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 /* define ExoPangoEllipsizeMode for backward compatibility */
 typedef PangoEllipsizeMode ExoPangoEllipsizeMode;
@@ -51,7 +51,7 @@
                                                gint               width,
                                                PangoEllipsizeMode mode);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_PANGO_EXTENSIONS_H__ */
 

Modified: libexo/trunk/exo/exo-private.c
===================================================================
--- libexo/trunk/exo/exo-private.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-private.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -60,9 +60,9 @@
                                    gboolean   in)
 {
   GdkEvent *fevent;
-  
+
   g_object_ref (G_OBJECT (widget));
-   
+
  if (in)
     GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
   else
@@ -72,84 +72,12 @@
   fevent->focus_change.type = GDK_FOCUS_CHANGE;
   fevent->focus_change.window = g_object_ref (widget->window);
   fevent->focus_change.in = in;
-  
+
   gtk_widget_event (widget, fevent);
-  
+
   g_object_notify (G_OBJECT (widget), "has-focus");
 
   g_object_unref (G_OBJECT (widget));
   gdk_event_free (fevent);
 }
 
-
-
-/**
- * _exo_g_type_register_simple:
- * @type_parent      : the parent #GType.
- * @type_name_static : the name of the new #GType, must reside in static
- *                     storage and remain unchanged during the lifetime
- *                     of the process.
- * @class_size       : the size of the class structure in bytes.
- * @class_init       : the class init function or %NULL.
- * @instance_size    : the size of the instance structure in bytes.
- * @instance_init    : the constructor function or %NULL.
- *
- * Simple wrapper for g_type_register_static(), which takes the most
- * important aspects of the type as parameters to avoid relocations
- * when using static constant #GTypeInfo<!---->s.
- *
- * Return value: the newly registered #GType.
- **/
-GType
-_exo_g_type_register_simple (GType        type_parent,
-                             const gchar *type_name_static,
-                             guint        class_size,
-                             gpointer     class_init,
-                             guint        instance_size,
-                             gpointer     instance_init)
-{
-  /* generate the type info (on the stack) */
-  GTypeInfo info =
-  {
-    class_size,
-    NULL,
-    NULL,
-    class_init,
-    NULL,
-    NULL,
-    instance_size,
-    0,
-    instance_init,
-    NULL,
-  };
-
-  /* register the static type */
-  return g_type_register_static (type_parent, I_(type_name_static), &info, 0);
-}
-
-
-
-/**
- * _exo_g_type_add_interface_simple:
- * @instance_type       : the #GType which should implement the @interface_type.
- * @interface_type      : the #GType of the interface.
- * @interface_init_func : initialization function for the interface.
- *
- * Simple wrapper for g_type_add_interface_static(), which helps to avoid unnecessary
- * relocations for the #GInterfaceInfo<!---->s.
- **/
-void
-_exo_g_type_add_interface_simple (GType              instance_type,
-                                  GType              interface_type,
-                                  GInterfaceInitFunc interface_init_func)
-{
-  GInterfaceInfo info =
-  {
-    interface_init_func,
-    NULL,
-    NULL,
-  };
-
-  g_type_add_interface_static (instance_type, interface_type, &info);
-}
-

Modified: libexo/trunk/exo/exo-private.h
===================================================================
--- libexo/trunk/exo/exo-private.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-private.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -31,7 +31,7 @@
 
 #include <glib/gi18n-lib.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 /* support macros for debugging */
 #ifndef NDEBUG
@@ -68,22 +68,11 @@
 #define g_value_get_object(v)   (((const GValue *) (v))->data[0].v_pointer)
 #endif
 
-void  _exo_i18n_init                    (void) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void  _exo_i18n_init                    (void);
 
-void  _exo_gtk_widget_send_focus_change (GtkWidget         *widget,
-                                         gboolean           in) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void  _exo_gtk_widget_send_focus_change (GtkWidget         *widget,
+                                                         gboolean           in);
 
-GType _exo_g_type_register_simple       (GType              type_parent,
-                                         const gchar       *type_name_static,
-                                         guint              class_size,
-                                         gpointer           class_init,
-                                         guint              instance_size,
-                                         gpointer           instance_init) G_GNUC_INTERNAL;
+G_END_DECLS
 
-void  _exo_g_type_add_interface_simple  (GType              instance_type,
-                                         GType              interface_type,
-                                         GInterfaceInitFunc interface_init_func) G_GNUC_INTERNAL;
-
-G_END_DECLS;
-
 #endif /* !__EXO_PRIVATE_H__ */

Modified: libexo/trunk/exo/exo-simple-job.c
===================================================================
--- libexo/trunk/exo/exo-simple-job.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-simple-job.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -41,7 +41,6 @@
 
 
 
-static void     exo_simple_job_class_init (ExoSimpleJobClass *klass);
 static void     exo_simple_job_finalize   (GObject           *object);
 static gboolean exo_simple_job_execute    (ExoJob            *job,
                                            GError           **error);
@@ -62,40 +61,16 @@
 
 
 
-static GObjectClass *exo_simple_job_parent_class;
+G_DEFINE_TYPE (ExoSimpleJob, exo_simple_job, EXO_TYPE_JOB)
 
 
 
-GType
-exo_simple_job_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
-
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = g_type_register_static_simple (EXO_TYPE_JOB, 
-                                            "ExoSimpleJob",
-                                            sizeof (ExoSimpleJobClass),
-                                            (GClassInitFunc) exo_simple_job_class_init,
-                                            sizeof (ExoSimpleJob),
-                                            NULL, 
-                                            0);
-    }
-
-  return type;
-}
-
-
-
 static void
 exo_simple_job_class_init (ExoSimpleJobClass *klass)
 {
-  ExoJobClass *exojob_class;
-  GObjectClass   *gobject_class;
+  ExoJobClass  *exojob_class;
+  GObjectClass *gobject_class;
 
-  /* determine the parent type class */
-  exo_simple_job_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = exo_simple_job_finalize;
 
@@ -106,6 +81,13 @@
 
 
 static void
+exo_simple_job_init (ExoSimpleJob *simple_job)
+{
+}
+
+
+
+static void
 exo_simple_job_finalize (GObject *object)
 {
   ExoSimpleJob *simple_job = EXO_SIMPLE_JOB (object);
@@ -136,7 +118,7 @@
     {
       g_assert (err != NULL || exo_job_is_cancelled (job));
 
-      /* set error if the job was cancelled. otherwise just propagate 
+      /* set error if the job was cancelled. otherwise just propagate
        * the results of the processing function */
       if (exo_job_set_error_if_cancelled (job, error))
         {
@@ -163,8 +145,8 @@
  * @...            : a list of #GType and parameter pairs (exactly
  *                   @n_param_values pairs) that are passed to @func.
  *
- * Allocates a new #ExoJob which executes the specified @func with 
- * the specified parameters. 
+ * Allocates a new #ExoJob which executes the specified @func with
+ * the specified parameters.
  *
  * An example could be:
  *

Modified: libexo/trunk/exo/exo-simple-job.h
===================================================================
--- libexo/trunk/exo/exo-simple-job.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-simple-job.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -32,7 +32,7 @@
 /**
  * ExoSimpleJobFunc:
  * @job            : an #ExoJob.
- * @param_values   : a #GValueArray of the #GValue<!---->s passed to 
+ * @param_values   : a #GValueArray of the #GValue<!---->s passed to
  *                   exo_simple_job_launch().
  * @error          : return location for errors.
  *

Modified: libexo/trunk/exo/exo-string.c
===================================================================
--- libexo/trunk/exo/exo-string.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-string.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -56,7 +56,7 @@
   gchar       *t;
 
   g_return_val_if_fail (text != NULL, NULL);
-  
+
   result = g_malloc (strlen (text) + 1);
 
   for (s = text, t = result; *s != '\0'; ++s)
@@ -224,7 +224,7 @@
   converted = g_locale_from_utf8 (format, -1, NULL, NULL, NULL);
   if (G_UNLIKELY (converted == NULL))
     return NULL;
-  
+
   /* start processing the format */
   string = g_string_new ("");
   remainder = converted;
@@ -285,8 +285,8 @@
               g_warning ("Unfinished %%%c modifier passed to exo_strdup_strftime", modifier);
               break;
             }
-        } 
-      
+        }
+
       if (strchr (C_STANDARD_STRFTIME_CHARACTERS, *remainder) == NULL)
         g_warning ("exo_strdup_strftime does not support non-standard escape code %%%c", *remainder);
 
@@ -340,7 +340,7 @@
       /* add this piece */
       g_string_append (string, piece);
     }
-  
+
   /* Convert the string back into UTF-8 */
   result = g_locale_to_utf8 (string->str, -1, NULL, NULL, NULL);
 
@@ -388,12 +388,12 @@
 /**
  * exo_intern_string:
  * @string: a string
- * 
+ *
  * Returns a canonical representation for @string. Interned strings can
  * be compared for equality by comparing the pointers, instead of using strcmp()
  * or exo_str_is_equal(). exo_intern_string() takes a copy of the @string for its
  * internal usage, so @string does not need to be static.
- * 
+ *
  * Return value: a canonical representation for the string
  *
  * Since: 0.3.1.1
@@ -413,12 +413,12 @@
 /**
  * exo_intern_static_string:
  * @string: a static string
- * 
+ *
  * Returns a canonical representation for @string. Interned strings can
  * be compared for equality by comparing the pointers, instead of using strcmp()
  * or exo_str_is_equal(). exo_intern_static_string() does not copy the string,
- * therefore @string must not be freed or modified. 
- * 
+ * therefore @string must not be freed or modified.
+ *
  * Return value: a canonical representation for the string
  *
  * Since: 0.3.1.1

Modified: libexo/trunk/exo/exo-string.h
===================================================================
--- libexo/trunk/exo/exo-string.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-string.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -29,7 +29,7 @@
 
 #include <exo/exo-config.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 gchar                *exo_str_elide_underscores  (const gchar     *text) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
 
@@ -55,6 +55,6 @@
 #define I_(string) (exo_intern_static_string ((string)))
 #endif
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_STRING_H__ */

Modified: libexo/trunk/exo/exo-thumbnail-preview.c
===================================================================
--- libexo/trunk/exo/exo-thumbnail-preview.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-thumbnail-preview.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -45,7 +45,6 @@
 
 
 
-static void exo_thumbnail_preview_init      (ExoThumbnailPreview *thumbnail_preview);
 static void exo_thumbnail_preview_style_set (GtkWidget           *ebox,
                                              GtkStyle            *previous_style,
                                              ExoThumbnailPreview *thumbnail_preview);
@@ -67,22 +66,13 @@
 
 
 
-GType
-_exo_thumbnail_preview_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (ExoThumbnailPreview, exo_thumbnail_preview, GTK_TYPE_FRAME)
 
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (GTK_TYPE_FRAME,
-                                          "ExoThumbnailPreview",
-                                          sizeof (ExoThumbnailPreviewClass),
-                                          NULL,
-                                          sizeof (ExoThumbnailPreview),
-                                          exo_thumbnail_preview_init);
-    }
 
-  return type;
+
+static void
+exo_thumbnail_preview_class_init (ExoThumbnailPreviewClass *klass)
+{
 }
 
 

Modified: libexo/trunk/exo/exo-thumbnail-preview.h
===================================================================
--- libexo/trunk/exo/exo-thumbnail-preview.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-thumbnail-preview.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -29,25 +29,25 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _ExoThumbnailPreviewClass ExoThumbnailPreviewClass;
 typedef struct _ExoThumbnailPreview      ExoThumbnailPreview;
 
-#define EXO_TYPE_THUMBNAIL_PREVIEW            (_exo_thumbnail_preview_get_type ())
+#define EXO_TYPE_THUMBNAIL_PREVIEW            (exo_thumbnail_preview_get_type ())
 #define EXO_THUMBNAIL_PREVIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXO_TYPE_THUMBNAIL_PREVIEW, ExoThumbnailPreview))
 #define EXO_THUMBNAIL_PREVIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EXO_TYPE_THUMBNAIL_PREVIEW, ExoThumbnailPreviewClass))
 #define EXO_IS_THUMBNAIL_PREVIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EXO_TYPE_THUMBNAIL_PREVIEW))
 #define EXO_IS_THUMBNAIL_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EXO_TYPE_THUMBNAIL_PREVIEW))
 #define EXO_THUMBNAIL_PREVIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), EXO_TYPE_THUMBNAIL_PREVIEW, ExoThumbnailPreviewClass))
 
-GType      _exo_thumbnail_preview_get_type (void) G_GNUC_CONST G_GNUC_INTERNAL;
+G_GNUC_INTERNAL GType      exo_thumbnail_preview_get_type  (void) G_GNUC_CONST;
 
-GtkWidget *_exo_thumbnail_preview_new      (void) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+G_GNUC_INTERNAL GtkWidget *_exo_thumbnail_preview_new      (void) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
 
-void       _exo_thumbnail_preview_set_uri  (ExoThumbnailPreview *thumbnail_preview,
-                                            const gchar         *uri) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void       _exo_thumbnail_preview_set_uri  (ExoThumbnailPreview *thumbnail_preview,
+                                                            const gchar         *uri);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_THUMBNAIL_PREVIEW_H__ */

Modified: libexo/trunk/exo/exo-thumbnail.h
===================================================================
--- libexo/trunk/exo/exo-thumbnail.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-thumbnail.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -29,7 +29,7 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 /**
  * ExoThumbnailSize:
@@ -44,13 +44,13 @@
   EXO_THUMBNAIL_SIZE_LARGE  = 256,
 } ExoThumbnailSize;
 
-GdkPixbuf *_exo_thumbnail_get_for_file (const gchar     *filename,
-                                        ExoThumbnailSize size,
-                                        GError         **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-GdkPixbuf *_exo_thumbnail_get_for_uri  (const gchar     *uri,
-                                        ExoThumbnailSize size,
-                                        GError         **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+G_GNUC_INTERNAL GdkPixbuf *_exo_thumbnail_get_for_file (const gchar     *filename,
+                                                        ExoThumbnailSize size,
+                                                        GError         **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+G_GNUC_INTERNAL GdkPixbuf *_exo_thumbnail_get_for_uri  (const gchar     *uri,
+                                                        ExoThumbnailSize size,
+                                                        GError         **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_THUMBNAIL_H__ */

Modified: libexo/trunk/exo/exo-toolbars-editor-dialog.c
===================================================================
--- libexo/trunk/exo/exo-toolbars-editor-dialog.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-toolbars-editor-dialog.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -46,8 +46,6 @@
 
 
 
-static void exo_toolbars_editor_dialog_class_init   (ExoToolbarsEditorDialogClass *klass);
-static void exo_toolbars_editor_dialog_init         (ExoToolbarsEditorDialog      *dialog);
 static void exo_toolbars_editor_dialog_add_toolbar  (ExoToolbarsEditorDialog      *dialog);
 
 
@@ -59,26 +57,10 @@
 
 
 
-GType
-exo_toolbars_editor_dialog_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (ExoToolbarsEditorDialog, exo_toolbars_editor_dialog, GTK_TYPE_DIALOG)
 
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (GTK_TYPE_DIALOG,
-                                          "ExoToolbarsEditorDialog",
-                                          sizeof (ExoToolbarsEditorDialogClass),
-                                          exo_toolbars_editor_dialog_class_init,
-                                          sizeof (ExoToolbarsEditorDialog),
-                                          exo_toolbars_editor_dialog_init);
-    }
 
-  return type;
-}
 
-
-
 static void
 exo_toolbars_editor_dialog_class_init (ExoToolbarsEditorDialogClass *klass)
 {
@@ -118,7 +100,7 @@
   hbox = gtk_hbox_new (FALSE, 2);
   gtk_container_add (GTK_CONTAINER (align), hbox);
   gtk_widget_show (hbox);
-  
+
   image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON);
   gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
   gtk_widget_show (image);

Modified: libexo/trunk/exo/exo-toolbars-editor-dialog.h
===================================================================
--- libexo/trunk/exo/exo-toolbars-editor-dialog.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-toolbars-editor-dialog.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -30,7 +30,7 @@
 
 #include <exo/exo-toolbars-model.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 #define EXO_TYPE_TOOLBARS_EDITOR_DIALOG             (exo_toolbars_editor_dialog_get_type ())
 #define EXO_TOOLBARS_EDITOR_DIALOG(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXO_TYPE_TOOLBARS_EDITOR_DIALOG, ExoToolbarsEditorDialog))
@@ -65,6 +65,6 @@
 GtkWidget *exo_toolbars_editor_dialog_new_with_model (GtkUIManager     *ui_manager,
                                                       ExoToolbarsModel *model);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_TOOLBARS_EDITOR_DIALOG_H__ */

Modified: libexo/trunk/exo/exo-toolbars-editor.c
===================================================================
--- libexo/trunk/exo/exo-toolbars-editor.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-toolbars-editor.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -56,8 +56,6 @@
 
 
 
-static void       exo_toolbars_editor_class_init          (ExoToolbarsEditorClass *klass);
-static void       exo_toolbars_editor_init                (ExoToolbarsEditor      *editor);
 static void       exo_toolbars_editor_finalize            (GObject                *object);
 static void       exo_toolbars_editor_get_property        (GObject                *object,
                                                            guint                   prop_id,
@@ -102,38 +100,16 @@
 
 
 
-static GObjectClass *exo_toolbars_editor_parent_class;
+G_DEFINE_TYPE (ExoToolbarsEditor, exo_toolbars_editor, GTK_TYPE_VBOX)
 
 
 
-GType
-exo_toolbars_editor_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
-
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (GTK_TYPE_VBOX,
-                                          "ExoToolbarsEditor",
-                                          sizeof (ExoToolbarsEditorClass),
-                                          exo_toolbars_editor_class_init,
-                                          sizeof (ExoToolbarsEditor),
-                                          exo_toolbars_editor_init);
-    }
-
-  return type;
-}
-
-
-
 static void
 exo_toolbars_editor_class_init (ExoToolbarsEditorClass *klass)
 {
   GObjectClass *gobject_class;
 
   g_type_class_add_private (klass, sizeof (ExoToolbarsEditorPrivate));
-  
-  exo_toolbars_editor_parent_class = g_type_class_peek_parent (klass);
 
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = exo_toolbars_editor_finalize;
@@ -571,7 +547,7 @@
 exo_toolbars_editor_new (GtkUIManager *ui_manager)
 {
   g_return_val_if_fail (GTK_IS_UI_MANAGER (ui_manager), NULL);
-  
+
   return g_object_new (EXO_TYPE_TOOLBARS_EDITOR,
                        "ui-manager", ui_manager,
                        NULL);

Modified: libexo/trunk/exo/exo-toolbars-editor.h
===================================================================
--- libexo/trunk/exo/exo-toolbars-editor.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-toolbars-editor.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -30,7 +30,7 @@
 
 #include <exo/exo-toolbars-view.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 #define EXO_TYPE_TOOLBARS_EDITOR            (exo_toolbars_editor_get_type ())
 #define EXO_TOOLBARS_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXO_TYPE_TOOLBARS_EDITOR, ExoToolbarsEditor))
@@ -75,6 +75,6 @@
 void              exo_toolbars_editor_set_ui_manager  (ExoToolbarsEditor  *editor,
                                                        GtkUIManager       *ui_manager);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_TOOLBARS_EDITOR_H__ */

Modified: libexo/trunk/exo/exo-toolbars-model.c
===================================================================
--- libexo/trunk/exo/exo-toolbars-model.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-toolbars-model.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -75,8 +75,6 @@
 
 
 
-static void             exo_toolbars_model_class_init           (ExoToolbarsModelClass  *klass);
-static void             exo_toolbars_model_init                 (ExoToolbarsModel       *model);
 static void             exo_toolbars_model_finalize             (GObject                *object);
 static gboolean         exo_toolbars_model_real_add_item        (ExoToolbarsModel       *model,
                                                                  gint                    toolbar_position,
@@ -136,38 +134,21 @@
 struct _UiParser
 {
   UiParserStack     *stack;
-  
+
   ExoToolbarsModel  *model;
   gint               toolbar_position;
 };
 
 
 
-static GObjectClass *exo_toolbars_model_parent_class;
-static guint         toolbars_model_signals[LAST_SIGNAL];
+static guint toolbars_model_signals[LAST_SIGNAL];
 
 
 
-GType
-exo_toolbars_model_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (ExoToolbarsModel, exo_toolbars_model, G_TYPE_OBJECT)
 
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (G_TYPE_OBJECT,
-                                          "ExoToolbarsModel",
-                                          sizeof (ExoToolbarsModelClass),
-                                          exo_toolbars_model_class_init,
-                                          sizeof (ExoToolbarsModel),
-                                          exo_toolbars_model_init);
-    }
 
-  return type;
-}
 
-
-
 static gboolean
 _exo_accumulator_STRING (GSignalInvocationHint *hint,
                          GValue                *return_accu,
@@ -189,8 +170,6 @@
 
   g_type_class_add_private (klass, sizeof (ExoToolbarsModelPrivate));
 
-  exo_toolbars_model_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = exo_toolbars_model_finalize;
 
@@ -381,7 +360,7 @@
   g_return_val_if_fail (EXO_IS_TOOLBARS_MODEL (model), FALSE);
   g_return_val_if_fail (type != NULL, FALSE);
   g_return_val_if_fail (id != NULL, FALSE);
-  
+
   if (!exo_toolbars_model_has_action (model, id))
     {
       g_warning ("Tried to add action \"%s\" to an ExoToolbarsModel, "
@@ -487,7 +466,7 @@
       g_free (item->id);
       g_slice_free (ExoToolbarsItem, item);
     }
-  
+
   g_list_free (toolbar->items);
   g_free (toolbar->name);
   g_slice_free (ExoToolbarsToolbar, toolbar);
@@ -642,7 +621,7 @@
       if (!exo_str_is_equal (element_name, "separator"))
         goto unknown_element;
       break;
-      
+
     default:
       goto unknown_element;
     }
@@ -693,7 +672,7 @@
                                 guint                  n_actions)
 {
   guint n;
-  
+
   g_return_if_fail (EXO_IS_TOOLBARS_MODEL (model));
   g_return_if_fail (actions != NULL);
 
@@ -964,7 +943,7 @@
                                 gint              toolbar_position)
 {
   ExoToolbarsToolbar *toolbar;
-  
+
   g_return_if_fail (EXO_IS_TOOLBARS_MODEL (model));
 
   toolbar = g_list_nth_data (model->priv->toolbars, toolbar_position);
@@ -985,7 +964,7 @@
  * @model             : An #ExoToolbarsModel.
  * @toolbar_position  : The index of a toolbar in @model.
  *
- * Returns the #ExoToolbarsModelFlags associated with the 
+ * Returns the #ExoToolbarsModelFlags associated with the
  * toolbar at @toolbar_position.
  *
  * Return value: The #ExoToolbarsModelFlags associated
@@ -1195,7 +1174,7 @@
 
   toolbar_index = g_list_index (model->priv->toolbars, toolbar);
   g_signal_emit (G_OBJECT (model), toolbars_model_signals[TOOLBAR_ADDED],
-                 0, toolbar_index); 
+                 0, toolbar_index);
 
   return toolbar_index;
 }
@@ -1302,7 +1281,7 @@
   ExoToolbarsToolbar *toolbar;
 
   g_return_if_fail (EXO_IS_TOOLBARS_MODEL (model));
-  
+
   toolbar = g_list_nth_data (model->priv->toolbars, toolbar_position);
   g_return_if_fail (toolbar != NULL);
 
@@ -1365,7 +1344,7 @@
 {
   ExoToolbarsToolbar *toolbar;
   ExoToolbarsItem    *item;
-  
+
   g_return_if_fail (EXO_IS_TOOLBARS_MODEL (model));
 
   toolbar = g_list_nth_data (model->priv->toolbars, toolbar_position);

Modified: libexo/trunk/exo/exo-toolbars-model.h
===================================================================
--- libexo/trunk/exo/exo-toolbars-model.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-toolbars-model.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -30,7 +30,7 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 #define EXO_TYPE_TOOLBARS_MODEL             (exo_toolbars_model_get_type ())
 #define EXO_TOOLBARS_MODEL(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXO_TYPE_TOOLBARS_MODEL, ExoToolbarsModel))
@@ -180,6 +180,6 @@
 const gchar          *exo_toolbars_model_toolbar_nth    (ExoToolbarsModel      *model,
                                                          gint                   toolbar_position);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_TOOLBARS_MODEL_H__ */

Modified: libexo/trunk/exo/exo-toolbars-private.c
===================================================================
--- libexo/trunk/exo/exo-toolbars-private.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-toolbars-private.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -68,16 +68,15 @@
 
   icon_width = DEFAULT_ICON_WIDTH;
 
-  if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_default (), 
-					  GTK_ICON_SIZE_LARGE_TOOLBAR,
-					  NULL, 
-					  &icon_height))
+  if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_default (),
+                                          GTK_ICON_SIZE_LARGE_TOOLBAR,
+                                          NULL, &icon_height))
     {
       icon_height = DEFAULT_ICON_HEIGHT;
     }
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  
+
   gtk_container_add (GTK_CONTAINER (window), widget);
   gtk_widget_realize (window);
   gtk_widget_show (widget);
@@ -99,7 +98,7 @@
   allocation.height = icon_height;
   gtk_widget_size_allocate (window, &allocation);
   gtk_widget_size_request (window, &requisition);
-  
+
   /* Create a pixmap */
   pixmap = gdk_pixmap_new (GDK_DRAWABLE (window->window), icon_width, icon_height, -1);
   gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (window));
@@ -108,10 +107,10 @@
   gtk_widget_ensure_style (window);
   g_assert (window->style);
   g_assert (window->style->font_desc);
-  
+
   fake_expose_widget (window, pixmap);
   fake_expose_widget (widget, pixmap);
-  
+
   pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, icon_width, icon_height);
   gdk_pixbuf_get_from_drawable (pixbuf, pixmap, NULL, 0, 0, 0, 0, icon_width, icon_height);
 
@@ -222,9 +221,9 @@
 #pragma align 4 (drag_cursor_data)
 #endif
 #ifdef __GNUC__
-static const guint8 drag_cursor_data[] __attribute__ ((__aligned__ (4))) = 
+static const guint8 drag_cursor_data[] __attribute__ ((__aligned__ (4))) =
 #else
-static const guint8 drag_cursor_data[] = 
+static const guint8 drag_cursor_data[] =
 #endif
 { ""
   /* Pixbuf magic (0x47646b50) */

Modified: libexo/trunk/exo/exo-toolbars-private.h
===================================================================
--- libexo/trunk/exo/exo-toolbars-private.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-toolbars-private.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -30,17 +30,17 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
-GdkPixbuf *_exo_toolbars_new_separator_pixbuf (void) G_GNUC_INTERNAL G_GNUC_MALLOC;
-GtkWidget *_exo_toolbars_new_separator_image  (void) G_GNUC_INTERNAL G_GNUC_MALLOC;
+G_GNUC_INTERNAL GdkPixbuf *_exo_toolbars_new_separator_pixbuf (void) G_GNUC_MALLOC;
+G_GNUC_INTERNAL GtkWidget *_exo_toolbars_new_separator_image  (void) G_GNUC_MALLOC;
 
-GtkAction *_exo_toolbars_find_action          (GtkUIManager *ui_manager,
-                                               const gchar  *name) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL GtkAction *_exo_toolbars_find_action          (GtkUIManager *ui_manager,
+                                                               const gchar  *name);
 
-void       _exo_toolbars_set_drag_cursor      (GtkWidget    *widget) G_GNUC_INTERNAL;
-void       _exo_toolbars_unset_drag_cursor    (GtkWidget    *widget) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void       _exo_toolbars_set_drag_cursor      (GtkWidget    *widget);
+G_GNUC_INTERNAL void       _exo_toolbars_unset_drag_cursor    (GtkWidget    *widget);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_TOOLBARS_PRIVATE_H__ */

Modified: libexo/trunk/exo/exo-toolbars-view.c
===================================================================
--- libexo/trunk/exo/exo-toolbars-view.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-toolbars-view.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -67,8 +67,6 @@
 
 
 
-static void         exo_toolbars_view_class_init            (ExoToolbarsViewClass *klass);
-static void         exo_toolbars_view_init                  (ExoToolbarsView      *view);
 static void         exo_toolbars_view_finalize              (GObject              *object);
 static void         exo_toolbars_view_get_property          (GObject              *object,
                                                              guint                 prop_id,
@@ -177,31 +175,14 @@
   { EXO_TOOLBARS_ITEM_TYPE, GTK_TARGET_SAME_APP, 0 },
 };
 
-static GObjectClass *exo_toolbars_view_parent_class;
-static guint         toolbars_view_signals[LAST_SIGNAL];
+static guint  toolbars_view_signals[LAST_SIGNAL];
 
 
 
-GType
-exo_toolbars_view_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (ExoToolbarsView, exo_toolbars_view, GTK_TYPE_VBOX)
 
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (GTK_TYPE_VBOX,
-                                          "ExoToolbarsView",
-                                          sizeof (ExoToolbarsViewClass),
-                                          exo_toolbars_view_class_init,
-                                          sizeof (ExoToolbarsView),
-                                          exo_toolbars_view_init);
-    }
 
-  return type;
-}
 
-
-
 static void
 exo_toolbars_view_class_init (ExoToolbarsViewClass *klass)
 {
@@ -212,8 +193,6 @@
 
   g_type_class_add_private (klass, sizeof (ExoToolbarsViewPrivate));
 
-  exo_toolbars_view_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = exo_toolbars_view_finalize;
   gobject_class->get_property = exo_toolbars_view_get_property;

Modified: libexo/trunk/exo/exo-toolbars-view.h
===================================================================
--- libexo/trunk/exo/exo-toolbars-view.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-toolbars-view.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -30,7 +30,7 @@
 
 #include <exo/exo-toolbars-model.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 #define EXO_TYPE_TOOLBARS_VIEW            (exo_toolbars_view_get_type ())
 #define EXO_TOOLBARS_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXO_TYPE_TOOLBARS_VIEW, ExoToolbarsView))
@@ -84,6 +84,6 @@
 void              exo_toolbars_view_set_ui_manager  (ExoToolbarsView      *view,
                                                      GtkUIManager         *ui_manager);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_TOOLBARS_VIEW_H__ */

Modified: libexo/trunk/exo/exo-tree-view.c
===================================================================
--- libexo/trunk/exo/exo-tree-view.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-tree-view.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -45,8 +45,6 @@
 
 
 
-static void     exo_tree_view_class_init                    (ExoTreeViewClass *klass);
-static void     exo_tree_view_init                          (ExoTreeView      *tree_view);
 static void     exo_tree_view_finalize                      (GObject          *object);
 static void     exo_tree_view_get_property                  (GObject          *object,
                                                              guint             prop_id,
@@ -97,30 +95,10 @@
 
 
 
-static GObjectClass *exo_tree_view_parent_class;
+G_DEFINE_TYPE (ExoTreeView, exo_tree_view, GTK_TYPE_TREE_VIEW)
 
 
 
-GType
-exo_tree_view_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
-
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (GTK_TYPE_TREE_VIEW,
-                                          "ExoTreeView",
-                                          sizeof (ExoTreeViewClass),
-                                          exo_tree_view_class_init,
-                                          sizeof (ExoTreeView),
-                                          exo_tree_view_init);
-    }
-
-  return type;
-}
-
-
-
 static void
 exo_tree_view_class_init (ExoTreeViewClass *klass)
 {
@@ -131,9 +109,6 @@
   /* add our private data to the class */
   g_type_class_add_private (klass, sizeof (ExoTreeViewPrivate));
 
-  /* determine our parent type class */
-  exo_tree_view_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = exo_tree_view_finalize;
   gobject_class->get_property = exo_tree_view_get_property;

Modified: libexo/trunk/exo/exo-tree-view.h
===================================================================
--- libexo/trunk/exo/exo-tree-view.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-tree-view.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -27,7 +27,7 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _ExoTreeViewPrivate ExoTreeViewPrivate;
 typedef struct _ExoTreeViewClass   ExoTreeViewClass;
@@ -77,6 +77,6 @@
 void       exo_tree_view_set_single_click_timeout (ExoTreeView       *tree_view,
                                                    guint              single_click_timeout);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_TREE_VIEW_H__ */

Modified: libexo/trunk/exo/exo-url.c
===================================================================
--- libexo/trunk/exo/exo-url.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-url.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -187,7 +187,7 @@
  * @error  : return location for errors or %NULL.
  *
  * Tries to find a suitable handler for @url in the list of
- * preferred application categories and runs that handler 
+ * preferred application categories and runs that handler
  * with @url on @screen.
  *
  * Return value: %TRUE on success, %FALSE on error.
@@ -227,7 +227,7 @@
     {
       /* determine the display name for the screen */
       display_name = gdk_screen_make_display_name (screen);
-      
+
       /* check if we have a local HTML file here */
       if (fnmatch ("*.xhtml", local_path, FNM_CASEFOLD) == 0
           || fnmatch ("*.htm", local_path, FNM_CASEFOLD) == 0
@@ -390,7 +390,7 @@
   GtkWidget *message;
   GdkScreen *screen;
   GError    *error = NULL;
-  
+
   g_return_if_fail (GTK_IS_ABOUT_DIALOG (about_dialog));
   g_return_if_fail (link != NULL);
 

Modified: libexo/trunk/exo/exo-url.h
===================================================================
--- libexo/trunk/exo/exo-url.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-url.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -27,7 +27,7 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 #define EXO_URL_ERROR (exo_url_error_quark ())
 GQuark exo_url_error_quark (void) G_GNUC_CONST;
@@ -35,7 +35,7 @@
 /**
  * ExoUrlError:
  * @EXO_URL_ERROR_NOT_SUPPORTED : a given URL is not supported.
- * 
+ *
  * The errors that can be returned due to bad parameters being
  * passed to exo_url_show() or exo_url_show_on_screen().
  **/
@@ -57,6 +57,6 @@
                                      const gchar    *link,
                                      gpointer        user_data);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_URL_H__ */

Modified: libexo/trunk/exo/exo-utils.h
===================================================================
--- libexo/trunk/exo/exo-utils.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-utils.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -27,7 +27,7 @@
 
 #include <glib.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 void                    exo_noop        (void) G_GNUC_PURE;
 gint                    exo_noop_one    (void) G_GNUC_PURE;
@@ -82,6 +82,6 @@
 
 #endif /* (G_CAN_INLINE && __GNUC__ && __i386__ && __OPTIMIZE__) || __EXO_UTILS_C__ */
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_UTILS_H__ */

Modified: libexo/trunk/exo/exo-wrap-table.c
===================================================================
--- libexo/trunk/exo/exo-wrap-table.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-wrap-table.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -46,8 +46,6 @@
 
 
 
-static void exo_wrap_table_class_init         (ExoWrapTableClass  *klass);
-static void exo_wrap_table_init               (ExoWrapTable       *table);
 static void exo_wrap_table_get_property       (GObject            *object,
                                                guint               prop_id,
                                                GValue             *value,
@@ -94,30 +92,10 @@
 
 
 
-static GObjectClass *exo_wrap_table_parent_class;
+G_DEFINE_TYPE (ExoWrapTable, exo_wrap_table, GTK_TYPE_CONTAINER)
 
 
 
-GType
-exo_wrap_table_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
-
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (GTK_TYPE_CONTAINER,
-                                          "ExoWrapTable",
-                                          sizeof (ExoWrapTableClass),
-                                          exo_wrap_table_class_init,
-                                          sizeof (ExoWrapTable),
-                                          exo_wrap_table_init);
-    }
-
-  return type;
-}
-
-
-
 static void
 exo_wrap_table_class_init (ExoWrapTableClass *klass)
 {
@@ -128,9 +106,6 @@
   /* add our private data to the class */
   g_type_class_add_private (klass, sizeof (ExoWrapTablePrivate));
 
-  /* determine our parent type class */
-  exo_wrap_table_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->get_property = exo_wrap_table_get_property;
   gobject_class->set_property = exo_wrap_table_set_property;
@@ -627,7 +602,7 @@
                                 guint         col_spacing)
 {
   g_return_if_fail (EXO_IS_WRAP_TABLE (table));
-  
+
   if (G_LIKELY (table->priv->col_spacing != col_spacing))
     {
       table->priv->col_spacing = col_spacing;

Modified: libexo/trunk/exo/exo-wrap-table.h
===================================================================
--- libexo/trunk/exo/exo-wrap-table.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-wrap-table.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -28,7 +28,7 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _ExoWrapTablePrivate ExoWrapTablePrivate;
 typedef struct _ExoWrapTableClass   ExoWrapTableClass;
@@ -76,6 +76,6 @@
 void       exo_wrap_table_set_homogeneous (ExoWrapTable       *table,
                                            gboolean            homogeneous);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_WRAP_TABLE_H__ */

Modified: libexo/trunk/exo/exo-xsession-client.c
===================================================================
--- libexo/trunk/exo/exo-xsession-client.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-xsession-client.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -62,8 +62,6 @@
 
 
 
-static void             exo_xsession_client_class_init    (ExoXsessionClientClass *klass);
-static void             exo_xsession_client_init          (ExoXsessionClient      *client);
 static void             exo_xsession_client_dispose       (GObject                *object);
 static void             exo_xsession_client_get_property  (GObject                *object,
                                                            guint                   prop_id,
@@ -92,31 +90,14 @@
 
 
 
-static GObjectClass *exo_xsession_client_parent_class;
-static guint         client_signals[LAST_SIGNAL];
+static guint client_signals[LAST_SIGNAL];
 
 
 
-GType
-exo_xsession_client_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (ExoXsessionClient, exo_xsession_client, G_TYPE_OBJECT)
 
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      type = _exo_g_type_register_simple (G_TYPE_OBJECT,
-                                          "ExoXsessionClient",
-                                          sizeof (ExoXsessionClientClass),
-                                          exo_xsession_client_class_init,
-                                          sizeof (ExoXsessionClient),
-                                          exo_xsession_client_init);
-    }
 
-  return type;
-}
 
-
-
 static void
 exo_xsession_client_class_init (ExoXsessionClientClass *klass)
 {
@@ -127,8 +108,6 @@
 
   g_type_class_add_private (klass, sizeof (ExoXsessionClientPrivate));
 
-  exo_xsession_client_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->dispose = exo_xsession_client_dispose;
   gobject_class->get_property = exo_xsession_client_get_property;
@@ -161,7 +140,7 @@
    * @client  : An #ExoXsessionClient.
    *
    * This signal is emitted when @client receives a %WM_SAVE_YOURSELF
-   * message from the session manager or the window manager on the 
+   * message from the session manager or the window manager on the
    * specified client leader window.
    **/
   client_signals[SAVE_YOURSELF] =
@@ -417,7 +396,7 @@
  *            to or %NULL.
  *
  * Retrieves the restart command previously set on @client. The
- * result is stored in @argv and should be freed using 
+ * result is stored in @argv and should be freed using
  * g_strfreev() when no longer needed.
  *
  * See exo_xsession_client_set_restart_command() for further

Modified: libexo/trunk/exo/exo-xsession-client.h
===================================================================
--- libexo/trunk/exo/exo-xsession-client.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo/exo-xsession-client.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -29,7 +29,7 @@
 
 #include <gdk/gdk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _ExoXsessionClientPrivate ExoXsessionClientPrivate;
 typedef struct _ExoXsessionClientClass   ExoXsessionClientClass;
@@ -76,6 +76,6 @@
                                                              gchar             **argv,
                                                              gint                argc);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_XSESSION_CLIENT_H__ */

Modified: libexo/trunk/exo-desktop-item-edit/exo-die-command-entry.c
===================================================================
--- libexo/trunk/exo-desktop-item-edit/exo-die-command-entry.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-desktop-item-edit/exo-die-command-entry.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -43,8 +43,6 @@
 
 
 
-static void exo_die_command_entry_class_init      (ExoDieCommandEntryClass  *klass);
-static void exo_die_command_entry_init            (ExoDieCommandEntry       *command_entry);
 static void exo_die_command_entry_finalize        (GObject                  *object);
 static void exo_die_command_entry_get_property    (GObject                  *object,
                                                    guint                     prop_id,
@@ -80,48 +78,16 @@
 
 
 
-static GObjectClass *exo_die_command_entry_parent_class;
+G_DEFINE_TYPE (ExoDieCommandEntry, exo_die_command_entry, GTK_TYPE_HBOX)
 
 
 
-GType
-exo_die_command_entry_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
-
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      static const GTypeInfo info =
-      {
-        sizeof (ExoDieCommandEntryClass),
-        NULL,
-        NULL,
-        (GClassInitFunc) exo_die_command_entry_class_init,
-        NULL,
-        NULL,
-        sizeof (ExoDieCommandEntry),
-        0,
-        (GInstanceInitFunc) exo_die_command_entry_init,
-        NULL,
-      };
-
-      type = g_type_register_static (GTK_TYPE_HBOX, I_("ExoDieCommandEntry"), &info, 0);
-    }
-
-  return type;
-}
-
-
-
 static void
 exo_die_command_entry_class_init (ExoDieCommandEntryClass *klass)
 {
   GtkWidgetClass *gtkwidget_class;
   GObjectClass   *gobject_class;
 
-  /* determine the parent type class */
-  exo_die_command_entry_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = exo_die_command_entry_finalize;
   gobject_class->get_property = exo_die_command_entry_get_property;

Modified: libexo/trunk/exo-desktop-item-edit/exo-die-command-model.c
===================================================================
--- libexo/trunk/exo-desktop-item-edit/exo-die-command-model.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-desktop-item-edit/exo-die-command-model.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -35,9 +35,7 @@
 
 
 
-static void               exo_die_command_model_class_init            (ExoDieCommandModelClass  *klass);
 static void               exo_die_command_model_tree_model_init       (GtkTreeModelIface        *iface);
-static void               exo_die_command_model_init                  (ExoDieCommandModel       *command_model);
 static void               exo_die_command_model_finalize              (GObject                  *object);
 static GtkTreeModelFlags  exo_die_command_model_get_flags             (GtkTreeModel             *tree_model);
 static gint               exo_die_command_model_get_n_columns         (GtkTreeModel             *tree_model);
@@ -93,56 +91,20 @@
 
 
 
-static GObjectClass *exo_die_command_model_parent_class;
-static guint         command_model_signals[LAST_SIGNAL];
+static guint command_model_signals[LAST_SIGNAL];
 
 
 
-GType
-exo_die_command_model_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE_WITH_CODE (ExoDieCommandModel, exo_die_command_model, G_TYPE_OBJECT,
+    G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, exo_die_command_model_tree_model_init))
 
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      static const GTypeInfo info =
-      {
-        sizeof (ExoDieCommandModelClass),
-        NULL,
-        NULL,
-        (GClassInitFunc) exo_die_command_model_class_init,
-        NULL,
-        NULL,
-        sizeof (ExoDieCommandModel),
-        0,
-        (GInstanceInitFunc) exo_die_command_model_init,
-        NULL,
-      };
 
-      static const GInterfaceInfo tree_model_info =
-      {
-        (GInterfaceInitFunc) exo_die_command_model_tree_model_init,
-        NULL,
-        NULL,
-      };
 
-      type = g_type_register_static (G_TYPE_OBJECT, I_("ExoDieCommandModel"), &info, 0);
-      g_type_add_interface_static (type, GTK_TYPE_TREE_MODEL, &tree_model_info);
-    }
-
-  return type;
-}
-
-
-
 static void
 exo_die_command_model_class_init (ExoDieCommandModelClass *klass)
 {
   GObjectClass *gobject_class;
 
-  /* determine the parent type class */
-  exo_die_command_model_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = exo_die_command_model_finalize;
 

Modified: libexo/trunk/exo-desktop-item-edit/exo-die-desktop-model.c
===================================================================
--- libexo/trunk/exo-desktop-item-edit/exo-die-desktop-model.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-desktop-item-edit/exo-die-desktop-model.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -37,9 +37,7 @@
 
 
 
-static void               exo_die_desktop_model_class_init            (ExoDieDesktopModelClass  *klass);
 static void               exo_die_desktop_model_tree_model_init       (GtkTreeModelIface        *iface);
-static void               exo_die_desktop_model_init                  (ExoDieDesktopModel       *desktop_model);
 static void               exo_die_desktop_model_finalize              (GObject                  *object);
 static GtkTreeModelFlags  exo_die_desktop_model_get_flags             (GtkTreeModel             *tree_model);
 static gint               exo_die_desktop_model_get_n_columns         (GtkTreeModel             *tree_model);
@@ -111,55 +109,16 @@
 
 
 
-static GObjectClass *exo_die_desktop_model_parent_class;
+G_DEFINE_TYPE_WITH_CODE (ExoDieDesktopModel, exo_die_desktop_model, G_TYPE_OBJECT,
+    G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, exo_die_desktop_model_tree_model_init))
 
 
 
-GType
-exo_die_desktop_model_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
-
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      static const GTypeInfo info =
-      {
-        sizeof (ExoDieDesktopModelClass),
-        NULL,
-        NULL,
-        (GClassInitFunc) exo_die_desktop_model_class_init,
-        NULL,
-        NULL,
-        sizeof (ExoDieDesktopModel),
-        0,
-        (GInstanceInitFunc) exo_die_desktop_model_init,
-        NULL,
-      };
-
-      static const GInterfaceInfo tree_model_info =
-      {
-        (GInterfaceInitFunc) exo_die_desktop_model_tree_model_init,
-        NULL,
-        NULL,
-      };
-
-      type = g_type_register_static (G_TYPE_OBJECT, I_("ExoDieDesktopModel"), &info, 0);
-      g_type_add_interface_static (type, GTK_TYPE_TREE_MODEL, &tree_model_info);
-    }
-
-  return type;
-}
-
-
-
 static void
 exo_die_desktop_model_class_init (ExoDieDesktopModelClass *klass)
 {
   GObjectClass *gobject_class;
 
-  /* determine the parent type class */
-  exo_die_desktop_model_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = exo_die_desktop_model_finalize;
 }

Modified: libexo/trunk/exo-desktop-item-edit/exo-die-editor.c
===================================================================
--- libexo/trunk/exo-desktop-item-edit/exo-die-editor.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-desktop-item-edit/exo-die-editor.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -45,8 +45,6 @@
 
 
 
-static void     exo_die_editor_class_init     (ExoDieEditorClass  *klass);
-static void     exo_die_editor_init           (ExoDieEditor       *editor);
 static void     exo_die_editor_finalize       (GObject            *object);
 static void     exo_die_editor_get_property   (GObject            *object,
                                                guint               prop_id,
@@ -93,47 +91,15 @@
 
 
 
-static GObjectClass *exo_die_editor_parent_class;
+G_DEFINE_TYPE (ExoDieEditor, exo_die_editor, GTK_TYPE_TABLE)
 
 
 
-GType
-exo_die_editor_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
-
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      static const GTypeInfo info =
-      {
-        sizeof (ExoDieEditorClass),
-        NULL,
-        NULL,
-        (GClassInitFunc) exo_die_editor_class_init,
-        NULL,
-        NULL,
-        sizeof (ExoDieEditor),
-        0,
-        (GInstanceInitFunc) exo_die_editor_init,
-        NULL,
-      };
-
-      type = g_type_register_static (GTK_TYPE_TABLE, I_("ExoDieEditor"), &info, 0);
-    }
-
-  return type;
-}
-
-
-
 static void
 exo_die_editor_class_init (ExoDieEditorClass *klass)
 {
   GObjectClass *gobject_class;
 
-  /* determine the parent type class */
-  exo_die_editor_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = exo_die_editor_finalize;
   gobject_class->get_property = exo_die_editor_get_property;
@@ -408,7 +374,7 @@
   label = gtk_label_new (_("No icon"));
   gtk_container_add (GTK_CONTAINER (editor->icon_button), label);
   gtk_widget_show (label);
-  
+
   row += 1;
 
   /* add an empty row to get some spacing before the options */

Modified: libexo/trunk/exo-desktop-item-edit/exo-die-enum-types.h
===================================================================
--- libexo/trunk/exo-desktop-item-edit/exo-die-enum-types.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-desktop-item-edit/exo-die-enum-types.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -23,7 +23,7 @@
 
 #include <exo/exo.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 #define EXO_DIE_TYPE_EDITOR_MODE (exo_die_editor_mode_get_type ())
 
@@ -40,6 +40,6 @@
 
 GType exo_die_editor_mode_get_type (void) G_GNUC_CONST;
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_DIE_ENUM_TYPES_H__ */

Modified: libexo/trunk/exo-desktop-item-edit/exo-die-utils.h
===================================================================
--- libexo/trunk/exo-desktop-item-edit/exo-die-utils.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-desktop-item-edit/exo-die-utils.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -23,18 +23,18 @@
 
 #include <exo/exo.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 void      exo_die_g_key_file_set_locale_value (GKeyFile    *key_file,
                                                const gchar *group,
                                                const gchar *key,
-                                               const gchar *value) G_GNUC_INTERNAL;
+                                               const gchar *value);
 
 gboolean  exo_die_g_key_file_save             (GKeyFile    *key_file,
                                                gboolean     create,
                                                const gchar *base,
-                                               GError     **error) G_GNUC_INTERNAL;
+                                               GError     **error);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_DIE_UTILS_H__ */

Modified: libexo/trunk/exo-helper/exo-helper-chooser-dialog.h
===================================================================
--- libexo/trunk/exo-helper/exo-helper-chooser-dialog.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-helper/exo-helper-chooser-dialog.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -22,7 +22,7 @@
 
 #include <exo-helper/exo-helper-chooser.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _ExoHelperChooserDialogClass ExoHelperChooserDialogClass;
 typedef struct _ExoHelperChooserDialog      ExoHelperChooserDialog;
@@ -40,6 +40,6 @@
 
 GtkWidget *exo_helper_chooser_dialog_get_plug_child (ExoHelperChooserDialog *dialog);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_HELPER_CHOOSER_DIALOG_H__ */

Modified: libexo/trunk/exo-helper/exo-helper-chooser.c
===================================================================
--- libexo/trunk/exo-helper/exo-helper-chooser.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-helper/exo-helper-chooser.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -44,8 +44,6 @@
 
 
 
-static void exo_helper_chooser_class_init   (ExoHelperChooserClass  *klass);
-static void exo_helper_chooser_init         (ExoHelperChooser       *chooser);
 static void exo_helper_chooser_finalize     (GObject                *object);
 static void exo_helper_chooser_get_property (GObject                *object,
                                              guint                   prop_id,
@@ -82,47 +80,15 @@
 
 
 
-static GObjectClass *exo_helper_chooser_parent_class;
+G_DEFINE_TYPE (ExoHelperChooser, exo_helper_chooser, GTK_TYPE_ALIGNMENT)
 
 
 
-GType
-exo_helper_chooser_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
-
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      static const GTypeInfo info =
-      {
-        sizeof (ExoHelperChooserClass),
-        NULL,
-        NULL,
-        (GClassInitFunc) exo_helper_chooser_class_init,
-        NULL,
-        NULL,
-        sizeof (ExoHelperChooser),
-        0,
-        (GInstanceInitFunc) exo_helper_chooser_init,
-        NULL,
-      };
-
-      type = g_type_register_static (GTK_TYPE_ALIGNMENT, I_("ExoHelperChooser"), &info, 0);
-    }
-
-  return type;
-}
-
-
-
 static void
 exo_helper_chooser_class_init (ExoHelperChooserClass *klass)
 {
   GObjectClass *gobject_class;
 
-  /* determine the parent type class */
-  exo_helper_chooser_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = exo_helper_chooser_finalize;
   gobject_class->get_property = exo_helper_chooser_get_property;
@@ -589,7 +555,7 @@
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
-  label = g_object_new (GTK_TYPE_LABEL, 
+  label = g_object_new (GTK_TYPE_LABEL,
                         "label", _(BROWSE_MESSAGES[chooser->category]),
                         "xalign", 0.0,
                         "yalign", 0.0,
@@ -746,7 +712,7 @@
     {
       /* determine the helper */
       helper = EXO_HELPER (lp->data);
-      
+
       /* add a menu item for the helper */
       item = gtk_image_menu_item_new_with_label (exo_helper_get_name (helper));
       g_object_set_data_full (G_OBJECT (item), I_("exo-helper"), helper, g_object_unref);

Modified: libexo/trunk/exo-helper/exo-helper-chooser.h
===================================================================
--- libexo/trunk/exo-helper/exo-helper-chooser.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-helper/exo-helper-chooser.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -22,7 +22,7 @@
 
 #include <exo-helper/exo-helper.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 #define EXO_TYPE_HELPER_CHOOSER            (exo_helper_chooser_get_type ())
 #define EXO_HELPER_CHOOSER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXO_TYPE_HELPER_CHOOSER, ExoHelperChooser))
@@ -44,6 +44,6 @@
 
 gboolean           exo_helper_chooser_get_is_valid  (const ExoHelperChooser *chooser);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_HELPER_CHOOSER_H__ */

Modified: libexo/trunk/exo-helper/exo-helper-launcher-dialog.c
===================================================================
--- libexo/trunk/exo-helper/exo-helper-launcher-dialog.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-helper/exo-helper-launcher-dialog.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -36,8 +36,6 @@
 
 
 
-static void exo_helper_launcher_dialog_class_init       (ExoHelperLauncherDialogClass *klass);
-static void exo_helper_launcher_dialog_init             (ExoHelperLauncherDialog      *launcher_dialog);
 static void exo_helper_launcher_dialog_get_property     (GObject                      *object,
                                                          guint                         prop_id,
                                                          GValue                       *value,
@@ -66,35 +64,10 @@
 
 
 
-GType
-exo_helper_launcher_dialog_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
+G_DEFINE_TYPE (ExoHelperLauncherDialog, exo_helper_launcher_dialog, GTK_TYPE_DIALOG)
 
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      static const GTypeInfo info =
-      {
-        sizeof (ExoHelperLauncherDialogClass),
-        NULL,
-        NULL,
-        (GClassInitFunc) exo_helper_launcher_dialog_class_init,
-        NULL,
-        NULL,
-        sizeof (ExoHelperLauncherDialog),
-        0,
-        (GInstanceInitFunc) exo_helper_launcher_dialog_init,
-        NULL,
-      };
 
-      type = g_type_register_static (GTK_TYPE_DIALOG, I_("ExoHelperLauncherDialog"), &info, 0);
-    }
 
-  return type;
-}
-
-
-
 static void
 exo_helper_launcher_dialog_class_init (ExoHelperLauncherDialogClass *klass)
 {

Modified: libexo/trunk/exo-helper/exo-helper-launcher-dialog.h
===================================================================
--- libexo/trunk/exo-helper/exo-helper-launcher-dialog.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-helper/exo-helper-launcher-dialog.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -22,7 +22,7 @@
 
 #include <exo-helper/exo-helper.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _ExoHelperLauncherDialogClass ExoHelperLauncherDialogClass;
 typedef struct _ExoHelperLauncherDialog      ExoHelperLauncherDialog;
@@ -42,6 +42,6 @@
 void              exo_helper_launcher_dialog_set_category (ExoHelperLauncherDialog       *launcher_dialog,
                                                            ExoHelperCategory              category);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_HELPER_LAUNCHER_DIALOG_H__ */

Modified: libexo/trunk/exo-helper/exo-helper-utils.h
===================================================================
--- libexo/trunk/exo-helper/exo-helper-utils.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-helper/exo-helper-utils.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -22,12 +22,12 @@
 
 #include <exo-helper/exo-helper.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 gboolean exo_helper_category_from_string (const gchar       *string,
-                                          ExoHelperCategory *category_return) G_GNUC_INTERNAL;
-gchar   *exo_helper_category_to_string   (ExoHelperCategory  category) G_GNUC_INTERNAL G_GNUC_MALLOC;
+                                          ExoHelperCategory *category_return);
+gchar   *exo_helper_category_to_string   (ExoHelperCategory  category) G_GNUC_MALLOC;
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_HELPER_UTILS_H__ */

Modified: libexo/trunk/exo-helper/exo-helper.c
===================================================================
--- libexo/trunk/exo-helper/exo-helper.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-helper/exo-helper.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -49,7 +49,6 @@
 
 
 
-static void       exo_helper_class_init (ExoHelperClass *klass);
 static void       exo_helper_finalize   (GObject        *object);
 static ExoHelper *exo_helper_new        (const gchar    *id,
                                          XfceRc         *rc);
@@ -77,49 +76,24 @@
 
 
 
-static GObjectClass *exo_helper_parent_class;
+G_DEFINE_TYPE (ExoHelper, exo_helper, G_TYPE_OBJECT)
 
 
 
-GType
-exo_helper_get_type (void)
+static void
+exo_helper_class_init (ExoHelperClass *klass)
 {
-  static GType type = G_TYPE_INVALID;
+  GObjectClass *gobject_class;
 
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      static const GTypeInfo info =
-      {
-        sizeof (ExoHelperClass),
-        NULL,
-        NULL,
-        (GClassInitFunc) exo_helper_class_init,
-        NULL,
-        NULL,
-        sizeof (ExoHelper),
-        0,
-        NULL,
-        NULL,
-      };
-
-      type = g_type_register_static (G_TYPE_OBJECT, I_("ExoHelper"), &info, 0);
-    }
-
-  return type;
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->finalize = exo_helper_finalize;
 }
 
 
 
 static void
-exo_helper_class_init (ExoHelperClass *klass)
+exo_helper_init (ExoHelper *helpers)
 {
-  GObjectClass *gobject_class;
-
-  /* determine the parent type class */
-  exo_helper_parent_class = g_type_class_peek_parent (klass);
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize = exo_helper_finalize;
 }
 
 
@@ -485,8 +459,6 @@
 
 
 
-static void       exo_helper_database_class_init  (ExoHelperDatabaseClass *klass);
-static void       exo_helper_database_init        (ExoHelperDatabase      *database);
 static void       exo_helper_database_finalize    (GObject                *object);
 static ExoHelper *exo_helper_database_lookup      (ExoHelperDatabase      *database,
                                                    ExoHelperCategory       category,
@@ -507,47 +479,15 @@
 
 
 
-static GObjectClass *exo_helper_database_parent_class;
+G_DEFINE_TYPE (ExoHelperDatabase, exo_helper_database, G_TYPE_OBJECT)
 
 
 
-GType
-exo_helper_database_get_type (void)
-{
-  static GType type = G_TYPE_INVALID;
-
-  if (G_UNLIKELY (type == G_TYPE_INVALID))
-    {
-      static const GTypeInfo info =
-      {
-        sizeof (ExoHelperDatabaseClass),
-        NULL,
-        NULL,
-        (GClassInitFunc) exo_helper_database_class_init,
-        NULL,
-        NULL,
-        sizeof (ExoHelperDatabase),
-        0,
-        (GInstanceInitFunc) exo_helper_database_init,
-        NULL,
-      };
-
-      type = g_type_register_static (G_TYPE_OBJECT, I_("ExoHelperDatabase"), &info, 0);
-    }
-
-  return type;
-}
-
-
-
 static void
 exo_helper_database_class_init (ExoHelperDatabaseClass *klass)
 {
   GObjectClass *gobject_class;
 
-  /* determine the parent type class */
-  exo_helper_database_parent_class = g_type_class_peek_parent (klass);
-
   gobject_class = G_OBJECT_CLASS (klass);
   gobject_class->finalize = exo_helper_database_finalize;
 }

Modified: libexo/trunk/exo-helper/exo-helper.h
===================================================================
--- libexo/trunk/exo-helper/exo-helper.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-helper/exo-helper.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -22,7 +22,7 @@
 
 #include <exo/exo.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef enum /*< enum,prefix=EXO_HELPER >*/
 {
@@ -80,6 +80,6 @@
                                                          ExoHelperCategory  category,
                                                          const gchar       *command);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_HELPER_H__ */

Modified: libexo/trunk/exo-mount/exo-mount-fstab.h
===================================================================
--- libexo/trunk/exo-mount/exo-mount-fstab.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-mount/exo-mount-fstab.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -22,19 +22,19 @@
 
 #include <exo/exo.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
-gboolean exo_mount_fstab_contains (const gchar *device_file) G_GNUC_INTERNAL;
+gboolean exo_mount_fstab_contains (const gchar *device_file);
 
 gboolean exo_mount_fstab_eject    (const gchar *device_file,
-                                   GError     **error) G_GNUC_INTERNAL;
+                                   GError     **error);
 
 gboolean exo_mount_fstab_mount    (const gchar *device_file,
-                                   GError     **error) G_GNUC_INTERNAL;
+                                   GError     **error);
 
 gboolean exo_mount_fstab_unmount  (const gchar *device_file,
-                                   GError     **error) G_GNUC_INTERNAL;
+                                   GError     **error);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_MOUNT_FSTAB_H__ */

Modified: libexo/trunk/exo-mount/exo-mount-hal.c
===================================================================
--- libexo/trunk/exo-mount/exo-mount-hal.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-mount/exo-mount-hal.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -703,7 +703,7 @@
 
   /* make sure that the mount point is usable (i.e. does not contain G_DIR_SEPARATOR's) */
   mount_point = (mount_point != NULL && *mount_point != '\0')
-              ? exo_str_replace (mount_point, G_DIR_SEPARATOR_S, "_") 
+              ? exo_str_replace (mount_point, G_DIR_SEPARATOR_S, "_")
               : g_strdup ("");
 
   /* let HAL guess the fstype */
@@ -731,7 +731,7 @@
                                      DBUS_TYPE_STRING, &mount_point,
                                      DBUS_TYPE_STRING, &fstype,
                                      DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, n,
-				                             DBUS_TYPE_INVALID))
+                                     DBUS_TYPE_INVALID))
         {
           dbus_message_unref (message);
           goto oom;
@@ -835,7 +835,7 @@
   if (dbus_error_is_set (&derror))
     {
       /* try to translate the error appropriately */
-      if (strcmp (derror.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied") == 0) 
+      if (strcmp (derror.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied") == 0)
         {
           /* TRANSLATORS: User tried to mount a volume, but is not privileged to do so. */
           g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("You are not privileged to mount the volume \"%s\""), device->name);
@@ -1015,7 +1015,7 @@
   if (G_UNLIKELY (dbus_error_is_set (&derror)))
     {
       /* try to translate the error appropriately */
-      if (strcmp (derror.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied") == 0) 
+      if (strcmp (derror.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied") == 0)
         {
           /* TRANSLATORS: User tried to unmount a volume, but is not privileged to do so. */
           g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("You are not privileged to unmount the volume \"%s\""), device->name);

Modified: libexo/trunk/exo-mount/exo-mount-hal.h
===================================================================
--- libexo/trunk/exo-mount/exo-mount-hal.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-mount/exo-mount-hal.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -22,30 +22,30 @@
 
 #include <exo/exo.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _ExoMountHalDevice ExoMountHalDevice;
 
 ExoMountHalDevice *exo_mount_hal_device_from_udi    (const gchar       *udi,
-                                                     GError           **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+                                                     GError           **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
 ExoMountHalDevice *exo_mount_hal_device_from_file   (const gchar       *file,
-                                                     GError           **error) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+                                                     GError           **error) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
 
-void               exo_mount_hal_device_free        (ExoMountHalDevice *device) G_GNUC_INTERNAL;
+void               exo_mount_hal_device_free        (ExoMountHalDevice *device);
 
-gchar             *exo_mount_hal_device_get_file    (ExoMountHalDevice *device) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-gchar             *exo_mount_hal_device_get_name    (ExoMountHalDevice *device) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-gchar             *exo_mount_hal_device_get_icon    (ExoMountHalDevice *device) G_GNUC_INTERNAL G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar             *exo_mount_hal_device_get_file    (ExoMountHalDevice *device) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar             *exo_mount_hal_device_get_name    (ExoMountHalDevice *device) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+gchar             *exo_mount_hal_device_get_icon    (ExoMountHalDevice *device) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
 
-gboolean           exo_mount_hal_device_is_readonly (ExoMountHalDevice *device) G_GNUC_INTERNAL;
+gboolean           exo_mount_hal_device_is_readonly (ExoMountHalDevice *device);
 
 gboolean           exo_mount_hal_device_eject       (ExoMountHalDevice *device,
-                                                     GError           **error) G_GNUC_INTERNAL;
+                                                     GError           **error);
 gboolean           exo_mount_hal_device_mount       (ExoMountHalDevice *device,
-                                                     GError           **error) G_GNUC_INTERNAL;
+                                                     GError           **error);
 gboolean           exo_mount_hal_device_unmount     (ExoMountHalDevice *device,
-                                                     GError           **error) G_GNUC_INTERNAL;
+                                                     GError           **error);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_MOUNT_HAL_H__ */

Modified: libexo/trunk/exo-mount/exo-mount-utils.h
===================================================================
--- libexo/trunk/exo-mount/exo-mount-utils.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-mount/exo-mount-utils.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -22,11 +22,11 @@
 
 #include <exo/exo.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 gboolean exo_mount_utils_is_mounted (const gchar *device_file,
-                                     gboolean    *readonly_return) G_GNUC_INTERNAL;
+                                     gboolean    *readonly_return);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__EXO_MOUNT_UTILS_H__ */

Modified: libexo/trunk/exo-open/main.c
===================================================================
--- libexo/trunk/exo-open/main.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-open/main.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -39,7 +39,7 @@
 
 /**
  * For testing this code the following commands should work:
- * 
+ *
  * exo-open --launch WebBrowser http://xfce.org (bug #5461).
  * exo-open --launch WebBrowser http://xfce.org bugs.xfce.org 'http://www.google.com/search?q=what is a space' 'http://wiki.xfce.org'
  * exo-open http://xfce.org
@@ -166,7 +166,7 @@
               /* separate the arguments */
               if (i > 1)
                 join = g_string_append_c (join, ' ');
-              
+
               /* only quote arguments with spaces if there are multiple
                * arguments to be merged, this is a bit of magic to make
                * common cares work property, see sample above with xfrun4 */

Modified: libexo/trunk/exo-support/xfce-heading.c
===================================================================
--- libexo/trunk/exo-support/xfce-heading.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-support/xfce-heading.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -85,7 +85,7 @@
 
 
 
-G_DEFINE_TYPE (XfceHeading, xfce_heading, GTK_TYPE_WIDGET);
+G_DEFINE_TYPE (XfceHeading, xfce_heading, GTK_TYPE_WIDGET)
 
 
 
@@ -485,7 +485,7 @@
 }
 
 
-  
+
 static GdkPixbuf*
 xfce_heading_make_pixbuf (XfceHeading *heading)
 {

Modified: libexo/trunk/exo-support/xfce-heading.h
===================================================================
--- libexo/trunk/exo-support/xfce-heading.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-support/xfce-heading.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -23,7 +23,7 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _XfceHeadingPrivate XfceHeadingPrivate;
 typedef struct _XfceHeadingClass   XfceHeadingClass;
@@ -77,6 +77,6 @@
 void                  xfce_heading_set_title     (XfceHeading *heading,
                                                   const gchar *title);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__XFCE_HEADING_H__ */

Modified: libexo/trunk/exo-support/xfce-titled-dialog.c
===================================================================
--- libexo/trunk/exo-support/xfce-titled-dialog.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-support/xfce-titled-dialog.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -68,7 +68,7 @@
 
 
 
-G_DEFINE_TYPE (XfceTitledDialog, xfce_titled_dialog, GTK_TYPE_DIALOG);
+G_DEFINE_TYPE (XfceTitledDialog, xfce_titled_dialog, GTK_TYPE_DIALOG)
 
 
 

Modified: libexo/trunk/exo-support/xfce-titled-dialog.h
===================================================================
--- libexo/trunk/exo-support/xfce-titled-dialog.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/exo-support/xfce-titled-dialog.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -23,7 +23,7 @@
 
 #include <gtk/gtk.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 typedef struct _XfceTitledDialogPrivate XfceTitledDialogPrivate;
 typedef struct _XfceTitledDialogClass   XfceTitledDialogClass;
@@ -70,6 +70,6 @@
 void                  xfce_titled_dialog_set_subtitle     (XfceTitledDialog *titled_dialog,
                                                            const gchar      *subtitle);
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__XFCE_TITLED_DIALOG_H__ */

Modified: libexo/trunk/python/exo.override
===================================================================
--- libexo/trunk/python/exo.override	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/python/exo.override	2009-07-17 21:37:29 UTC (rev 30340)
@@ -28,9 +28,9 @@
 #include "pyexo.h"
 
 /* mark internal symbols with G_GNUC_INTERNAL */
-void exo_add_constants    (PyObject    *module,
-                           const gchar *strip_prefix) G_GNUC_INTERNAL;
-void exo_register_classes (PyObject    *d) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void exo_add_constants    (PyObject    *module,
+                                           const gchar *strip_prefix);
+G_GNUC_INTERNAL void exo_register_classes (PyObject    *d);
 
 %%
 modulename exo

Modified: libexo/trunk/python/exomodule.c
===================================================================
--- libexo/trunk/python/exomodule.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/python/exomodule.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -29,9 +29,9 @@
 
 G_MODULE_EXPORT void init_exo (void);
 /* mark internal symbols with G_GNUC_INTERNAL */
-void exo_add_constants    (PyObject    *module,
-                           const gchar *strip_prefix) G_GNUC_INTERNAL;
-void exo_register_classes (PyObject    *d) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL void exo_add_constants    (PyObject    *module,
+                                           const gchar *strip_prefix);
+G_GNUC_INTERNAL void exo_register_classes (PyObject    *d);
 
 extern PyMethodDef exo_functions[];
 
@@ -47,14 +47,14 @@
   if (PyString_Check(object))
     {
       GtkTreePath *path;
-      
+
       path = gtk_tree_path_new_from_string (PyString_AsString (object));
       return path;
     }
   else if (PyInt_Check(object))
     {
       GtkTreePath *path;
-      
+
       path = gtk_tree_path_new();
       gtk_tree_path_append_index(path, PyInt_AsLong(object));
       return path;
@@ -63,7 +63,7 @@
     {
       GtkTreePath *path;
       guint len, i;
-      
+
       len = PyTuple_Size(object);
       if (len < 1)
         return NULL;
@@ -73,7 +73,7 @@
         {
           PyObject *item = PyTuple_GetItem(object, i);
           gint index = PyInt_AsLong(item);
-          
+
           if (PyErr_Occurred())
             {
               gtk_tree_path_free(path);
@@ -85,7 +85,7 @@
 
       return path;
     }
-  
+
   return NULL;
 }
 #endif

Modified: libexo/trunk/python/pyexo.h
===================================================================
--- libexo/trunk/python/pyexo.h	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/python/pyexo.h	2009-07-17 21:37:29 UTC (rev 30340)
@@ -28,7 +28,7 @@
 
 #include <exo/exo.h>
 
-G_BEGIN_DECLS;
+G_BEGIN_DECLS
 
 /* ---------- ExoBinding ---------- */
 typedef struct
@@ -53,13 +53,13 @@
 
 /* ---------- PyGTK helpers ---------- */
 #if !defined(pygtk_tree_path_from_pyobject)
-GtkTreePath *pygtk_tree_path_from_pyobject (PyObject *object) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL GtkTreePath *pygtk_tree_path_from_pyobject (PyObject *object);
 #endif
 
 #if !defined(pygtk_tree_path_to_pyobject)
-PyObject *pygtk_tree_path_to_pyobject (GtkTreePath *path) G_GNUC_INTERNAL;
+G_GNUC_INTERNAL PyObject *pygtk_tree_path_to_pyobject (GtkTreePath *path);
 #endif
 
-G_END_DECLS;
+G_END_DECLS
 
 #endif /* !__PYEXO_H__ */

Modified: libexo/trunk/tests/test-exo-csource.c
===================================================================
--- libexo/trunk/tests/test-exo-csource.c	2009-07-17 13:39:07 UTC (rev 30339)
+++ libexo/trunk/tests/test-exo-csource.c	2009-07-17 21:37:29 UTC (rev 30340)
@@ -61,7 +61,7 @@
       dp = (const guint8 *) data;
       cp = (const guint8 *) contents;
 
-      for (n = 0; n < contents_length; ++n) 
+      for (n = 0; n < contents_length; ++n)
         if (dp[n] != cp[n])
           {
             g_warning ("Contents for \"%s\" differ: data[%u]=0x%02x, contents[%u]=0x%02x",




More information about the Xfce4-commits mailing list