pidgin: ab9aaff4: Fix some more GTK_CHECK_* macros and a G...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: ab9aaff4c39d9ec3f6cf0b01db8823028b3ef453
Ancestor: ff56b8db1e7d631b901a79b2d8ae6e4896639c7c
Author: qulogic at pidgin.im
Date: 2009-04-18T07:00:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ab9aaff4c39d9ec3f6cf0b01db8823028b3ef453

Modified files:
        pidgin/plugins/ticker/gtkticker.c
        pidgin/plugins/ticker/gtkticker.h

ChangeLog: 

Fix some more GTK_CHECK_* macros and a GtkType.

-------------- next part --------------
============================================================
--- pidgin/plugins/ticker/gtkticker.c	d0bda3e44b19118c3a8b2df588602dd431685f68
+++ pidgin/plugins/ticker/gtkticker.c	1d0526efbd5a3cf05fd1c72ac9e3eaacc88a57d3
@@ -41,7 +41,7 @@ static void gtk_ticker_forall        (Gt
 		gboolean	       include_internals,
 		GtkCallback       callback,
 		gpointer          callback_data);
-static GtkType gtk_ticker_child_type (GtkContainer     *container);
+static GType gtk_ticker_child_type   (GtkContainer     *container);
 
 
 static GtkContainerClass *parent_class = NULL;
@@ -97,7 +97,7 @@ static void gtk_ticker_class_init (GtkTi
 	widget_class = (GtkWidgetClass*) class;
 	container_class = (GtkContainerClass*) class;
 
-	parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
+	parent_class = g_type_class_ref (GTK_TYPE_CONTAINER);
 
 	gobject_class->finalize = gtk_ticker_finalize;
 
@@ -112,7 +112,7 @@ static void gtk_ticker_class_init (GtkTi
 	container_class->child_type = gtk_ticker_child_type;
 }
 
-static GtkType gtk_ticker_child_type (GtkContainer *container)
+static GType gtk_ticker_child_type (GtkContainer *container)
 {
 	return GTK_TYPE_WIDGET;
 }
============================================================
--- pidgin/plugins/ticker/gtkticker.h	80eb0ee04d1ebbc4fe28dd46c70eaeb53b975d75
+++ pidgin/plugins/ticker/gtkticker.h	4b69c5cc77d29f40fe63313a731ae14f27b45b27
@@ -33,11 +33,11 @@ extern "C" {
 extern "C" {
 #endif /* __cplusplus */
 
-#define GTK_TYPE_TICKER                  (gtk_ticker_get_type ())
-#define GTK_TICKER(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_TICKER, GtkTicker))
-#define GTK_TICKER_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TICKER, GtkTickerClass))
-#define GTK_IS_TICKER(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_TICKER))
-#define GTK_IS_TICKER_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_TICKER))
+#define GTK_TYPE_TICKER            (gtk_ticker_get_type())
+#define GTK_TICKER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_TICKER, GtkTicker))
+#define GTK_TICKER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_TICKER, GtkTickerClass))
+#define GTK_IS_TICKER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_TICKER))
+#define GTK_IS_TICKER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_TICKER))
 
 
 typedef struct _GtkTicker        GtkTicker;
@@ -72,7 +72,7 @@ struct _GtkTickerChild
 };
 
 
-GtkType    gtk_ticker_get_type          (void);
+GType      gtk_ticker_get_type          (void);
 GtkWidget* gtk_ticker_new               (void);
 void       gtk_ticker_add               (GtkTicker       *ticker,
                                         GtkWidget      *widget);