summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>2001-02-04 07:05:29 +0000
committerTim Janik <timj@src.gnome.org>2001-02-04 07:05:29 +0000
commit89a0a894bcffc29402d4f8add87168ddd5fc6b60 (patch)
treef642964ce0b8e5d648702c3d9cc53cfddb11b2f7 /gdk-pixbuf
parentf2ceb1c46a7b5dc9e2b6baa4bcf543601dc5d986 (diff)
downloadgtk+-89a0a894bcffc29402d4f8add87168ddd5fc6b60.tar.gz
removed gtk_signal_init() compat define.
Sun Feb 4 07:55:17 2001 Tim Janik <timj@gtk.org> * gtk/gtksignal.h: removed gtk_signal_init() compat define. * gtk/gtktypeutils.[hc]: gtk_tpye_init() take an additional argument GTypeDebugFlags debug_flags and pass it on to g_type_init (); deprecated this function. * gdk/gdk.c (gdk_init_check): call g_type_init () with 0 as argument. Sun Feb 4 07:45:45 2001 Tim Janik <timj@gtk.org> * gtk/gtkdebug.h: nuke GTK_DEBUG_OBJECTS and GTK_DEBUG_SIGNALS. Sun Feb 4 07:59:57 2001 Tim Janik <timj@gtk.org> * gdk-pixbuf.h: DOH! don't include glib/gobject.h but glib-object.h, we finally need the gobject->gruntime rename. * *.c: scratched calls to g_type_init(), there's simply no point in doing that, use gtk_init().
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r--gdk-pixbuf/ChangeLog8
-rw-r--r--gdk-pixbuf/gdk-pixbuf-animation.c12
-rw-r--r--gdk-pixbuf/gdk-pixbuf-loader.c2
-rw-r--r--gdk-pixbuf/gdk-pixbuf.c2
-rw-r--r--gdk-pixbuf/gdk-pixbuf.h2
5 files changed, 12 insertions, 14 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 239ea7cb32..dcaf43a2dc 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,11 @@
+Sun Feb 4 07:59:57 2001 Tim Janik <timj@gtk.org>
+
+ * gdk-pixbuf.h: DOH! don't include glib/gobject.h but glib-object.h,
+ we finally need the gobject->gruntime rename.
+
+ * *.c: scratched calls to g_type_init(), there's simply no point in
+ doing that, use gtk_init().
+
2001-02-01 Havoc Pennington <hp@pobox.com>
* gdk-pixbuf-loader.c, gdk-pixbuf-loader.h: rename "private" field
diff --git a/gdk-pixbuf/gdk-pixbuf-animation.c b/gdk-pixbuf/gdk-pixbuf-animation.c
index b833996fa5..d8d262aa9c 100644
--- a/gdk-pixbuf/gdk-pixbuf-animation.c
+++ b/gdk-pixbuf/gdk-pixbuf-animation.c
@@ -50,8 +50,6 @@ gdk_pixbuf_animation_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
-
- g_type_init ();
object_type = g_type_register_static (G_TYPE_OBJECT,
"GdkPixbufAnimation",
@@ -458,13 +456,9 @@ gdk_pixbuf_frame_get_type (void)
static GType our_type = 0;
if (our_type == 0)
- {
- g_type_init ();
-
- our_type = g_boxed_type_register_static ("GdkPixbufFrame",
- gdk_pixbuf_frame_copy,
- gdk_pixbuf_frame_free);
- }
+ our_type = g_boxed_type_register_static ("GdkPixbufFrame",
+ gdk_pixbuf_frame_copy,
+ gdk_pixbuf_frame_free);
return our_type;
}
diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
index 459da342aa..3ed9036782 100644
--- a/gdk-pixbuf/gdk-pixbuf-loader.c
+++ b/gdk-pixbuf/gdk-pixbuf-loader.c
@@ -93,8 +93,6 @@ gdk_pixbuf_loader_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) gdk_pixbuf_loader_init
};
-
- g_type_init ();
loader_type = g_type_register_static (G_TYPE_OBJECT,
"GdkPixbufLoader",
diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c
index 3168f76d4d..724753d2da 100644
--- a/gdk-pixbuf/gdk-pixbuf.c
+++ b/gdk-pixbuf/gdk-pixbuf.c
@@ -53,8 +53,6 @@ gdk_pixbuf_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) NULL,
};
-
- g_type_init ();
object_type = g_type_register_static (G_TYPE_OBJECT,
"GdkPixbuf",
diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h
index b8ffb48f78..dd40abbe43 100644
--- a/gdk-pixbuf/gdk-pixbuf.h
+++ b/gdk-pixbuf/gdk-pixbuf.h
@@ -28,7 +28,7 @@
#include <glib.h>
#include <gdk-pixbuf/gdk-pixbuf-features.h>
-#include <gobject/gobject.h>
+#include <glib-object.h>
#ifdef __cplusplus
extern "C" {