[gthumb] renamed _g_object_clear as _g_clear_object

[Paolo Bacchilega <paobac src gnome org>]

commit f26ecba24b6fde1c49752e469407c73fd9a97e68
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Jan 17 11:21:54 2010 +0100

    renamed _g_object_clear as _g_clear_object

 extensions/image_print/gth-image-info.c        |   12 ++++++------
 extensions/photo_importer/dlg-photo-importer.c |   10 +++++-----
 gthumb/glib-utils.c                            |    2 +-
 gthumb/glib-utils.h                            |    2 +-
 gthumb/gth-browser.c                           |    4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/extensions/image_print/gth-image-info.c b/extensions/image_print/gth-image-info.c
index 5e86d5a..a73e972 100644
--- a/extensions/image_print/gth-image-info.c
+++ b/extensions/image_print/gth-image-info.c
@@ -101,10 +101,10 @@ gth_image_info_set_pixbuf (GthImageInfo *image_info,
 
 	g_return_if_fail (pixbuf != NULL);
 
-	_g_object_clear (&image_info->pixbuf);
-	_g_object_clear (&image_info->thumbnail_original);
-	_g_object_clear (&image_info->thumbnail);
-	_g_object_clear (&image_info->thumbnail_active);
+	_g_clear_object (&image_info->pixbuf);
+	_g_clear_object (&image_info->thumbnail_original);
+	_g_clear_object (&image_info->thumbnail);
+	_g_clear_object (&image_info->thumbnail_active);
 
 	image_info->pixbuf = g_object_ref (pixbuf);
 	thumb_w = image_info->original_width = image_info->pixbuf_width = gdk_pixbuf_get_width (pixbuf);
@@ -150,11 +150,11 @@ gth_image_info_rotate (GthImageInfo *image_info,
 		break;
 	}
 
-	_g_object_clear (&image_info->thumbnail);
+	_g_clear_object (&image_info->thumbnail);
 	if (image_info->thumbnail_original != NULL)
 		image_info->thumbnail = _gdk_pixbuf_transform (image_info->thumbnail_original, image_info->rotation);
 
-	_g_object_clear (&image_info->thumbnail_active);
+	_g_clear_object (&image_info->thumbnail_active);
 	if (image_info->thumbnail != NULL) {
 		image_info->thumbnail_active = gdk_pixbuf_copy (image_info->thumbnail);
 		_gdk_pixbuf_colorshift (image_info->thumbnail_active, image_info->thumbnail_active, 30);
diff --git a/extensions/photo_importer/dlg-photo-importer.c b/extensions/photo_importer/dlg-photo-importer.c
index ce09f13..4cd7414 100644
--- a/extensions/photo_importer/dlg-photo-importer.c
+++ b/extensions/photo_importer/dlg-photo-importer.c
@@ -334,7 +334,7 @@ list_source_files (gpointer user_data)
 	DialogData *data = user_data;
 	GList      *list;
 
-	_g_object_clear (&data->last_source);
+	_g_clear_object (&data->last_source);
 	_g_object_list_unref (data->files);
 	data->files = NULL;
 
@@ -379,8 +379,8 @@ source_list_changed_cb (GtkWidget  *widget,
 	GMount      *mount;
 
 	if (! gtk_combo_box_get_active_iter (GTK_COMBO_BOX (data->source_list), &iter)) {
-		_g_object_clear (&data->source);
-		_g_object_clear (&data->last_source);
+		_g_clear_object (&data->source);
+		_g_clear_object (&data->last_source);
 		gth_file_list_clear (GTH_FILE_LIST (data->file_list), _("(Empty)"));
 		return;
 	}
@@ -390,8 +390,8 @@ source_list_changed_cb (GtkWidget  *widget,
 			    -1);
 
 	if (volume == NULL) {
-		_g_object_clear (&data->source);
-		_g_object_clear (&data->last_source);
+		_g_clear_object (&data->source);
+		_g_clear_object (&data->last_source);
 		gth_file_list_clear (GTH_FILE_LIST (data->file_list), _("Empty"));
 		return;
 	}
diff --git a/gthumb/glib-utils.c b/gthumb/glib-utils.c
index 25f302c..81e6022 100644
--- a/gthumb/glib-utils.c
+++ b/gthumb/glib-utils.c
@@ -55,7 +55,7 @@ _g_object_unref (gpointer object)
 
 
 void
-_g_object_clear (gpointer p)
+_g_clear_object (gpointer p)
 {
 	gpointer *object_p = (gpointer *) p;
 
diff --git a/gthumb/glib-utils.h b/gthumb/glib-utils.h
index b2ec4dc..062f8cf 100644
--- a/gthumb/glib-utils.h
+++ b/gthumb/glib-utils.h
@@ -78,7 +78,7 @@ G_BEGIN_DECLS
 
 gpointer      _g_object_ref                  (gpointer     object);
 void          _g_object_unref                (gpointer     object);
-void          _g_object_clear                (gpointer     object_p);
+void          _g_clear_object                (gpointer     object_p);
 GList *       _g_object_list_ref             (GList       *list);
 void          _g_object_list_unref           (GList       *list);
 GType         g_object_list_get_type         (void);
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index ae93e87..bb2060e 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -1541,8 +1541,8 @@ _gth_browser_load (GthBrowser *browser,
 			gth_file_source_monitor_directory (browser->priv->location_source,
 							   browser->priv->monitor_location,
 							   FALSE);
-			_g_object_clear (&browser->priv->location_source);
-			_g_object_clear (&browser->priv->monitor_location);
+			_g_clear_object (&browser->priv->location_source);
+			_g_clear_object (&browser->priv->monitor_location);
 		}
 		break;
 	default: