diff options
| author | Tim Janik <timj@gtk.org> | 2003-02-07 03:53:20 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2003-02-07 03:53:20 +0000 |
| commit | 10d67ceb23daa2c2cd6cdd7942b743d54b3364e0 (patch) | |
| tree | 955a00af12b9d30cf822b614a63a5e97f224f52f /gtk/gtkobject.c | |
| parent | f683ed9a0ae5265c81c928bab813e68592e58af3 (diff) | |
| download | gtk+-10d67ceb23daa2c2cd6cdd7942b743d54b3364e0.tar.gz | |
remove quark_user_data usage in gtk_object_{g|s}et_user_data(). fixes
Fri Feb 7 04:49:46 2003 Tim Janik <timj@gtk.org>
* gtk/gtkobject.c: remove quark_user_data usage in
gtk_object_{g|s}et_user_data(). fixes get_user_data()
returning NULL for user_data set through property interface.
* gtk/gtkitemfactory.c (gtk_item_factory_create_item): don't put out
warnings if a pixbuf couldn't be retrieved, since (a) this doesn't
need to be a programming error (in case of loaded data), (b) it breaks
with 2.0 behaviour where extra magic could be used to create empty
images. don't attempt to retrieve pixbufs from NULL extra_data.
Diffstat (limited to 'gtk/gtkobject.c')
| -rw-r--r-- | gtk/gtkobject.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c index 3ff349695f..02251f95f4 100644 --- a/gtk/gtkobject.c +++ b/gtk/gtkobject.c @@ -63,7 +63,6 @@ static void gtk_object_notify_weaks (GtkObject *object); static gpointer parent_class = NULL; static guint object_signals[LAST_SIGNAL] = { 0 }; -static GQuark quark_user_data = 0; static GQuark quark_weakrefs = 0; @@ -717,10 +716,7 @@ gtk_object_set_user_data (GtkObject *object, { g_return_if_fail (GTK_IS_OBJECT (object)); - if (!quark_user_data) - quark_user_data = g_quark_from_static_string ("user_data"); - - g_datalist_id_set_data (&G_OBJECT (object)->qdata, quark_user_data, data); + g_object_set_data (G_OBJECT (object), "user_data", data); } gpointer @@ -728,7 +724,7 @@ gtk_object_get_user_data (GtkObject *object) { g_return_val_if_fail (GTK_IS_OBJECT (object), NULL); - return g_datalist_id_get_data (&G_OBJECT (object)->qdata, quark_user_data); + return g_object_get_data (G_OBJECT (object), "user_data"); } GtkObject* |