diff --git a/ChangeLog b/ChangeLog index 1a6c82ff1d..0f9f44ad04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-05-13 Matthias Clasen + * gdk/*.c: Remove erroneous ; after G_DEFINE_TYPE + macros. (#341692, Yevgen Muntyan) + * gtk/gtktextbtree.c: * gtk/gtktextview.c: Move some asserts to the right place. (#341661, #341665, Pascal Terjan) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1a6c82ff1d..0f9f44ad04 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-05-13 Matthias Clasen + * gdk/*.c: Remove erroneous ; after G_DEFINE_TYPE + macros. (#341692, Yevgen Muntyan) + * gtk/gtktextbtree.c: * gtk/gtktextview.c: Move some asserts to the right place. (#341661, #341665, Pascal Terjan) diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c index 31e60db781..49ce308847 100644 --- a/gdk/gdkdisplay.c +++ b/gdk/gdkdisplay.c @@ -84,7 +84,7 @@ static const GdkPointerHooks singlehead_default_pointer_hooks = { static const GdkPointerHooks *singlehead_current_pointer_hooks = &singlehead_default_pointer_hooks; -G_DEFINE_TYPE (GdkDisplay, gdk_display, G_TYPE_OBJECT); +G_DEFINE_TYPE (GdkDisplay, gdk_display, G_TYPE_OBJECT) static void gdk_display_class_init (GdkDisplayClass *class) diff --git a/gdk/gdkdisplaymanager.c b/gdk/gdkdisplaymanager.c index b77805c421..dc98b1a28b 100644 --- a/gdk/gdkdisplaymanager.c +++ b/gdk/gdkdisplaymanager.c @@ -67,7 +67,7 @@ static guint signals[LAST_SIGNAL] = { 0 }; static GdkDisplay *default_display = NULL; -G_DEFINE_TYPE (GdkDisplayManager, gdk_display_manager, G_TYPE_OBJECT); +G_DEFINE_TYPE (GdkDisplayManager, gdk_display_manager, G_TYPE_OBJECT) static void gdk_display_manager_class_init (GdkDisplayManagerClass *klass) diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c index 250aea8d48..6905d510b8 100644 --- a/gdk/gdkdraw.c +++ b/gdk/gdkdraw.c @@ -63,7 +63,7 @@ static void gdk_drawable_real_draw_pixbuf (GdkDrawable *draw gint y_dither); -G_DEFINE_ABSTRACT_TYPE (GdkDrawable, gdk_drawable, G_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE (GdkDrawable, gdk_drawable, G_TYPE_OBJECT) static void gdk_drawable_class_init (GdkDrawableClass *klass) diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c index 664d5a03cc..0e03ae2913 100644 --- a/gdk/gdkgc.c +++ b/gdk/gdkgc.c @@ -53,7 +53,7 @@ struct _GdkGCPrivate #define GDK_GC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDK_TYPE_GC, GdkGCPrivate)) -G_DEFINE_TYPE (GdkGC, gdk_gc, G_TYPE_OBJECT); +G_DEFINE_TYPE (GdkGC, gdk_gc, G_TYPE_OBJECT) static void gdk_gc_class_init (GdkGCClass *class) diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c index a0cf33d782..5c1bbdd989 100644 --- a/gdk/gdkkeys.c +++ b/gdk/gdkkeys.c @@ -38,7 +38,7 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE (GdkKeymap, gdk_keymap, G_TYPE_OBJECT); +G_DEFINE_TYPE (GdkKeymap, gdk_keymap, G_TYPE_OBJECT) static void gdk_keymap_class_init (GdkKeymapClass *klass) diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c index bee1035915..cf5dc28872 100644 --- a/gdk/gdkpixmap.c +++ b/gdk/gdkpixmap.c @@ -155,7 +155,7 @@ static GdkScreen* gdk_pixmap_real_get_screen (GdkDrawable *drawable); static void gdk_pixmap_finalize (GObject *object); -G_DEFINE_TYPE (GdkPixmapObject, gdk_pixmap, GDK_TYPE_DRAWABLE); +G_DEFINE_TYPE (GdkPixmapObject, gdk_pixmap, GDK_TYPE_DRAWABLE) static void gdk_pixmap_init (GdkPixmapObject *pixmap) diff --git a/gdk/gdkscreen.c b/gdk/gdkscreen.c index 924ef531d0..986f9f5525 100644 --- a/gdk/gdkscreen.c +++ b/gdk/gdkscreen.c @@ -56,7 +56,7 @@ enum static guint signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE(GdkScreen, gdk_screen, G_TYPE_OBJECT); +G_DEFINE_TYPE (GdkScreen, gdk_screen, G_TYPE_OBJECT) static void gdk_screen_class_init (GdkScreenClass *klass) diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 68f88f5803..1f3f87b063 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -190,7 +190,7 @@ static void gdk_window_clear_backing_rect (GdkWindow *window, gint width, gint height); -G_DEFINE_TYPE (GdkWindowObject, gdk_window_object, GDK_TYPE_DRAWABLE); +G_DEFINE_TYPE (GdkWindowObject, gdk_window_object, GDK_TYPE_DRAWABLE) GType _gdk_paintable_get_type (void) diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c index 39aa41bc00..ab74d7b06a 100644 --- a/gdk/x11/gdkcolor-x11.c +++ b/gdk/x11/gdkcolor-x11.c @@ -68,7 +68,7 @@ static void gdk_colormap_sync (GdkColormap *colormap, static void gdk_colormap_finalize (GObject *object); -G_DEFINE_TYPE (GdkColormap, gdk_colormap, G_TYPE_OBJECT); +G_DEFINE_TYPE (GdkColormap, gdk_colormap, G_TYPE_OBJECT) static void gdk_colormap_init (GdkColormap *colormap) diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 6034379c09..dfa5791e82 100644 --- a/gdk/x11/gdkdisplay-x11.c +++ b/gdk/x11/gdkdisplay-x11.c @@ -97,7 +97,7 @@ static const char *const precache_atoms[] = { "_NET_VIRTUAL_ROOTS" }; -G_DEFINE_TYPE (GdkDisplayX11, _gdk_display_x11, GDK_TYPE_DISPLAY); +G_DEFINE_TYPE (GdkDisplayX11, _gdk_display_x11, GDK_TYPE_DISPLAY) static void _gdk_display_x11_class_init (GdkDisplayX11Class * class) diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 101d5590ad..ad816c9f5b 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -142,7 +142,7 @@ const static struct { { "XdndDrop", xdnd_drop_filter }, }; -G_DEFINE_TYPE (GdkDragContext, gdk_drag_context, G_TYPE_OBJECT); +G_DEFINE_TYPE (GdkDragContext, gdk_drag_context, G_TYPE_OBJECT) static void gdk_drag_context_init (GdkDragContext *dragcontext) diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c index ec4743b524..92278aead8 100644 --- a/gdk/x11/gdkdrawable-x11.c +++ b/gdk/x11/gdkdrawable-x11.c @@ -143,7 +143,7 @@ static void gdk_drawable_impl_x11_finalize (GObject *object); static const cairo_user_data_key_t gdk_x11_cairo_key; -G_DEFINE_TYPE (GdkDrawableImplX11, _gdk_drawable_impl_x11, GDK_TYPE_DRAWABLE); +G_DEFINE_TYPE (GdkDrawableImplX11, _gdk_drawable_impl_x11, GDK_TYPE_DRAWABLE) static void _gdk_drawable_impl_x11_class_init (GdkDrawableImplX11Class *klass) diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c index da0ff83a64..cff480201c 100644 --- a/gdk/x11/gdkgc-x11.c +++ b/gdk/x11/gdkgc-x11.c @@ -56,7 +56,7 @@ static void gdk_x11_gc_set_dashes (GdkGC *gc, static void gdk_gc_x11_finalize (GObject *object); -G_DEFINE_TYPE (GdkGCX11, _gdk_gc_x11, GDK_TYPE_GC); +G_DEFINE_TYPE (GdkGCX11, _gdk_gc_x11, GDK_TYPE_GC) static void _gdk_gc_x11_class_init (GdkGCX11Class *klass) diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c index ee2934f980..1c7e86d915 100644 --- a/gdk/x11/gdkimage-x11.c +++ b/gdk/x11/gdkimage-x11.c @@ -73,7 +73,7 @@ static void gdk_image_finalize (GObject *object); #define PRIVATE_DATA(image) ((GdkImagePrivateX11 *) GDK_IMAGE (image)->windowing_data) -G_DEFINE_TYPE(GdkImage, gdk_image, G_TYPE_OBJECT); +G_DEFINE_TYPE (GdkImage, gdk_image, G_TYPE_OBJECT) static void gdk_image_init (GdkImage *image) diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c index 837b94c0af..3dc72a6b19 100644 --- a/gdk/x11/gdkpixmap-x11.c +++ b/gdk/x11/gdkpixmap-x11.c @@ -63,7 +63,7 @@ static void gdk_pixmap_impl_x11_get_size (GdkDrawable *drawable, static void gdk_pixmap_impl_x11_dispose (GObject *object); static void gdk_pixmap_impl_x11_finalize (GObject *object); -G_DEFINE_TYPE (GdkPixmapImplX11, gdk_pixmap_impl_x11, GDK_TYPE_DRAWABLE_IMPL_X11); +G_DEFINE_TYPE (GdkPixmapImplX11, gdk_pixmap_impl_x11, GDK_TYPE_DRAWABLE_IMPL_X11) GType _gdk_pixmap_impl_get_type (void) diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c index d33c90a58c..ad06bee953 100644 --- a/gdk/x11/gdkscreen-x11.c +++ b/gdk/x11/gdkscreen-x11.c @@ -64,7 +64,7 @@ enum static guint signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE (GdkScreenX11, _gdk_screen_x11, GDK_TYPE_SCREEN); +G_DEFINE_TYPE (GdkScreenX11, _gdk_screen_x11, GDK_TYPE_SCREEN) static void _gdk_screen_x11_class_init (GdkScreenX11Class *klass) diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 52a85c71ee..af7835d6a0 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -110,7 +110,7 @@ static void gdk_window_impl_x11_finalize (GObject *object); (( time1 < time2 ) && ( time2 - time1 > ((guint32)-1)/2 )) \ ) -G_DEFINE_TYPE(GdkWindowImplX11, gdk_window_impl_x11, GDK_TYPE_DRAWABLE_IMPL_X11); +G_DEFINE_TYPE (GdkWindowImplX11, gdk_window_impl_x11, GDK_TYPE_DRAWABLE_IMPL_X11) GType _gdk_window_impl_get_type (void)