f-spot r4551 - in trunk: . libeog

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Fri Oct 31 11:06:17 2008
New Revision: 4551
URL: http://svn.gnome.org/viewvc/f-spot?rev=4551&view=rev

Log:
2008-10-31  Stephane Delcroix  <sdelcroix novell com>

	* libeog/eog-image.c:
	* libeog/eog-scroll-view.c:
	* libeog/image-view.c:
	* libeog/ui-image.cs: remove the gnome-i18n.h header, replace with
	gi18n.h where appropriate. Replace GNOME_BOILERPLATE and
	GNOME_CALL_PARENT by GObject macros or code. Drop the gnome-macro.h
	header too.

Modified:
   trunk/ChangeLog
   trunk/libeog/eog-image.c
   trunk/libeog/eog-scroll-view.c
   trunk/libeog/image-view.c
   trunk/libeog/ui-image.c

Modified: trunk/libeog/eog-image.c
==============================================================================
--- trunk/libeog/eog-image.c	(original)
+++ trunk/libeog/eog-image.c	Fri Oct 31 11:06:17 2008
@@ -1,7 +1,6 @@
+#include <glib/gi18n.h>
 #include <glib/gthread.h>
 #include <glib/gqueue.h>
-#include <libgnome/gnome-macros.h>
-#include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-thumbnail.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
@@ -247,10 +246,7 @@
 
    ------------------------------------*/
 
-GNOME_CLASS_BOILERPLATE (EogImage,
-			 eog_image,
-			 GObject,
-			 G_TYPE_OBJECT);
+G_DEFINE_TYPE (EogImage, eog_image, G_TYPE_OBJECT);
 
 static void
 eog_image_dispose (GObject *object)
@@ -370,7 +366,7 @@
 }
 
 static void
-eog_image_instance_init (EogImage *img)
+eog_image_init (EogImage *img)
 {
 	EogImagePrivate *priv;
 

Modified: trunk/libeog/eog-scroll-view.c
==============================================================================
--- trunk/libeog/eog-scroll-view.c	(original)
+++ trunk/libeog/eog-scroll-view.c	Fri Oct 31 11:06:17 2008
@@ -1,5 +1,4 @@
 #include <math.h>
-#include <libgnome/gnome-macros.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk/gdkkeysyms.h>
 
@@ -105,10 +104,7 @@
 static void set_zoom_fit (EogScrollView *view);
 static void request_paint_area (EogScrollView *view, GdkRectangle *area);
 
-GNOME_CLASS_BOILERPLATE (EogScrollView,
-			 eog_scroll_view,
-			 GtkTable,
-			 GTK_TYPE_TABLE);
+G_DEFINE_TYPE (EogScrollView, eog_scroll_view, GTK_TYPE_TABLE);
 
 
 /*===================================
@@ -1294,7 +1290,7 @@
 	view = EOG_SCROLL_VIEW (widget);
 	check_scrollbar_visibility (view, alloc);
 
-	GNOME_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, alloc)); 
+	GTK_WIDGET_CLASS (eog_scroll_view_parent_class)->size_allocate (widget, alloc);
 }
 
 static void
@@ -1804,7 +1800,7 @@
 
 
 static void 
-eog_scroll_view_instance_init (EogScrollView *view)
+eog_scroll_view_init (EogScrollView *view)
 {
 	EogScrollViewPrivate *priv;
 
@@ -1826,7 +1822,7 @@
 static void
 eog_scroll_view_dispose (GObject *object)
 {
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
+	G_OBJECT_CLASS (eog_scroll_view_parent_class)->dispose (object);
 }
 
 static void
@@ -1840,7 +1836,7 @@
 		view->priv = 0;
 	}
 
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+	G_OBJECT_CLASS (eog_scroll_view_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/libeog/image-view.c
==============================================================================
--- trunk/libeog/image-view.c	(original)
+++ trunk/libeog/image-view.c	Fri Oct 31 11:06:17 2008
@@ -27,8 +27,7 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkmain.h>
-#include <libgnome/gnome-macros.h>
-#include <libgnome/gnome-i18n.h>
+#include <glib/gi18n.h>
 #include "cursors.h"
 #include "image-view.h"
 #include "uta.h"
@@ -142,10 +141,7 @@
 
 static guint image_view_signals[LAST_SIGNAL];
 
-GNOME_CLASS_BOILERPLATE (ImageView,
-			 image_view,
-			 GtkWidget,
-			 GTK_TYPE_WIDGET);
+G_DEFINE_TYPE (ImageView, image_view, GTK_TYPE_WIDGET);
 
 /* VOID:OBJECT,OBJECT (gtkmarshalers.list:69) */
 void
@@ -241,7 +237,7 @@
 
 /* Object initialization function for the image view */
 static void
-image_view_instance_init (ImageView *view)
+image_view_init (ImageView *view)
 {
 	ImageViewPrivate *priv;
 
@@ -321,7 +317,7 @@
 
 	remove_dirty_region (view);
 
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
+	G_OBJECT_CLASS (image_view_parent_class)->dispose (object);
 }
 
 /* Finalize handler for the image view */
@@ -339,7 +335,7 @@
 
 	g_free (priv);
 
-	GNOME_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+	G_OBJECT_CLASS (image_view_parent_class)->finalize (object);
 }
 
 
@@ -1084,8 +1080,8 @@
 
 	remove_dirty_region (IMAGE_VIEW (widget));
 
-	if (GTK_WIDGET_CLASS (parent_class)->unmap)
-		(* GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
+	if (GTK_WIDGET_CLASS (image_view_parent_class)->unmap)
+		(* GTK_WIDGET_CLASS (image_view_parent_class)->unmap) (widget);
 }
 
 /* Realize handler for the image view */
@@ -1141,8 +1137,8 @@
 
 	remove_dirty_region (IMAGE_VIEW (widget));
 
-	if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-		(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
+	if (GTK_WIDGET_CLASS (image_view_parent_class)->unrealize)
+		(* GTK_WIDGET_CLASS (image_view_parent_class)->unrealize) (widget);
 }
 
 /* Size_request handler for the image view */
@@ -1621,7 +1617,7 @@
 	if (handled)
 		return TRUE;
 	else
-		return (* GTK_WIDGET_CLASS (parent_class)->key_press_event) (widget, event);
+		return (* GTK_WIDGET_CLASS (image_view_parent_class)->key_press_event) (widget, event);
 }
 
 /* Callback used when an adjustment is changed */

Modified: trunk/libeog/ui-image.c
==============================================================================
--- trunk/libeog/ui-image.c	(original)
+++ trunk/libeog/ui-image.c	Fri Oct 31 11:06:17 2008
@@ -22,7 +22,6 @@
 #include <config.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkwindow.h>
-#include <libgnome/gnome-i18n.h>
 #include "image-view.h"
 #include "ui-image.h"
 #include "zoom.h"