callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s/signal_newc/signal_new/

Browse Source 
Mon Jul  2 06:35:10 2001  Tim Janik  <timj@gtk.org>

        * gdk/gdkkeys.c (gdk_keymap_class_init): s/signal_newc/signal_new/

        * gtk/gtkobject.c (gtk_object_destroy): invoke
        g_object_run_dispose().

        * gtk/gtkwindow.c:
        * gtk/gtkwidget.c:
        * gtk/gtkobject.c:
        * gtk/gtklist.c: s/shutdown/dispose/ for the GObject
        method.
This commit is contained in:
Tim Janik
2001-07-02 05:03:21 +00:00
committed by Tim Janik
parent de985fb58e
commit 93db42e7a6
23 changed files with 219 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkobject.c
View File

@ -55,7 +55,7 @@ static void gtk_object_get_property (GObject *object,
guint property_id,
GValue *value,
GParamSpec *pspec);
static void gtk_object_shutdown (GObject *object);
static void gtk_object_dispose (GObject *object);
static void gtk_object_real_destroy (GtkObject *object);
static void gtk_object_finalize (GObject *object);
static void gtk_object_notify_weaks (GtkObject *object);
@ -317,7 +317,7 @@ gtk_object_class_init (GtkObjectClass *class)
gobject_class->set_property = gtk_object_set_property;
gobject_class->get_property = gtk_object_get_property;
gobject_class->shutdown = gtk_object_shutdown;
gobject_class->dispose = gtk_object_dispose;
gobject_class->finalize = gtk_object_finalize;
class->destroy = gtk_object_real_destroy;
@ -358,14 +358,12 @@ gtk_object_destroy (GtkObject *object)
/* need to hold a reference count around all class method
* invocations.
*/
gtk_object_ref (object);
G_OBJECT_GET_CLASS (object)->shutdown (G_OBJECT (object));
gtk_object_unref (object);
g_object_run_dispose (G_OBJECT (object));
}
}
static void
gtk_object_shutdown (GObject *gobject)
gtk_object_dispose (GObject *gobject)
{
GtkObject *object = GTK_OBJECT (gobject);
@ -381,7 +379,7 @@ gtk_object_shutdown (GObject *gobject)
GTK_OBJECT_UNSET_FLAGS (object, GTK_DESTROYED);
}
G_OBJECT_CLASS (parent_class)->shutdown (gobject);
G_OBJECT_CLASS (parent_class)->dispose (gobject);
}
static void