f-spot r4238 - trunk/libeog

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Mon Aug 11 12:53:57 2008
New Revision: 4238
URL: http://svn.gnome.org/viewvc/f-spot?rev=4238&view=rev

Log:
patch from sikon for bug543708. allow build on the upcoming gtk+


Modified:
   trunk/libeog/image-view.h
   trunk/libeog/ui-image.c
   trunk/libeog/ui-image.h

Modified: trunk/libeog/image-view.h
==============================================================================
--- trunk/libeog/image-view.h	(original)
+++ trunk/libeog/image-view.h	Mon Aug 11 12:53:57 2008
@@ -57,10 +57,10 @@
 
 
 #define TYPE_IMAGE_VIEW            (image_view_get_type ())
-#define IMAGE_VIEW(obj)            (GTK_CHECK_CAST ((obj), TYPE_IMAGE_VIEW, ImageView))
-#define IMAGE_VIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_IMAGE_VIEW, ImageViewClass))
-#define IS_IMAGE_VIEW(obj)         (GTK_CHECK_TYPE ((obj), TYPE_IMAGE_VIEW))
-#define IS_IMAGE_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_IMAGE_VIEW))
+#define IMAGE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_IMAGE_VIEW, ImageView))
+#define IMAGE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_IMAGE_VIEW, ImageViewClass))
+#define IS_IMAGE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_IMAGE_VIEW))
+#define IS_IMAGE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_IMAGE_VIEW))
 
 typedef struct _ImageView ImageView;
 typedef struct _ImageViewClass ImageViewClass;
@@ -94,7 +94,7 @@
 #endif
 };
 
-GtkType image_view_get_type (void);
+GType image_view_get_type (void);
 
 GtkWidget *image_view_new (void);
 

Modified: trunk/libeog/ui-image.c
==============================================================================
--- trunk/libeog/ui-image.c	(original)
+++ trunk/libeog/ui-image.c	Mon Aug 11 12:53:57 2008
@@ -60,7 +60,7 @@
  *
  * Return value: the type ID of the #UIImage class.
  **/
-GtkType
+GType
 ui_image_get_type (void)
 {
 	static GType ui_image_type = 0;

Modified: trunk/libeog/ui-image.h
==============================================================================
--- trunk/libeog/ui-image.h	(original)
+++ trunk/libeog/ui-image.h	Mon Aug 11 12:53:57 2008
@@ -27,10 +27,10 @@
 G_BEGIN_DECLS
 
 #define TYPE_UI_IMAGE            (ui_image_get_type ())
-#define UI_IMAGE(obj)            (GTK_CHECK_CAST ((obj), TYPE_UI_IMAGE, UIImage))
-#define UI_IMAGE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_UI_IMAGE, UIImageClass))
-#define IS_UI_IMAGE(obj)         (GTK_CHECK_TYPE ((obj), TYPE_UI_IMAGE))
-#define IS_UI_IMAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_UI_IMAGE))
+#define UI_IMAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_UI_IMAGE, UIImage))
+#define UI_IMAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_UI_IMAGE, UIImageClass))
+#define IS_UI_IMAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_UI_IMAGE))
+#define IS_UI_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_UI_IMAGE))
 
 
 typedef struct _UIImage UIImage;
@@ -50,7 +50,7 @@
 };
 
 
-GtkType ui_image_get_type (void);
+GType ui_image_get_type (void);
 
 GtkWidget *ui_image_new (void);
 GtkWidget *ui_image_construct (UIImage *ui);