properly initialize translate_* fields. (gtk_item_factory_finalize):
Wed Apr 21 21:26:11 1999 Tim Janik <timj@gtk.org> * gtk/gtkitemfactory.c (gtk_item_factory_init): properly initialize translate_* fields. (gtk_item_factory_finalize): invoke translate_notify independant from translate_data. (gtk_item_factory_set_translate_func): likewise. (gtk_item_factory_destroy): only ifactory pointer from those widgets that belong to us (stupid me).
This commit is contained in:
10
ChangeLog
10
ChangeLog
@@ -1,3 +1,13 @@
|
||||
Wed Apr 21 21:26:11 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkitemfactory.c (gtk_item_factory_init): properly initialize
|
||||
translate_* fields.
|
||||
(gtk_item_factory_finalize): invoke translate_notify independant from
|
||||
translate_data.
|
||||
(gtk_item_factory_set_translate_func): likewise.
|
||||
(gtk_item_factory_destroy): only ifactory pointer from those widgets
|
||||
that belong to us (stupid me).
|
||||
|
||||
Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com>
|
||||
|
||||
* gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the
|
||||
|
||||
@@ -1,3 +1,13 @@
|
||||
Wed Apr 21 21:26:11 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkitemfactory.c (gtk_item_factory_init): properly initialize
|
||||
translate_* fields.
|
||||
(gtk_item_factory_finalize): invoke translate_notify independant from
|
||||
translate_data.
|
||||
(gtk_item_factory_set_translate_func): likewise.
|
||||
(gtk_item_factory_destroy): only ifactory pointer from those widgets
|
||||
that belong to us (stupid me).
|
||||
|
||||
Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com>
|
||||
|
||||
* gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the
|
||||
|
||||
@@ -1,3 +1,13 @@
|
||||
Wed Apr 21 21:26:11 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkitemfactory.c (gtk_item_factory_init): properly initialize
|
||||
translate_* fields.
|
||||
(gtk_item_factory_finalize): invoke translate_notify independant from
|
||||
translate_data.
|
||||
(gtk_item_factory_set_translate_func): likewise.
|
||||
(gtk_item_factory_destroy): only ifactory pointer from those widgets
|
||||
that belong to us (stupid me).
|
||||
|
||||
Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com>
|
||||
|
||||
* gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the
|
||||
|
||||
@@ -1,3 +1,13 @@
|
||||
Wed Apr 21 21:26:11 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkitemfactory.c (gtk_item_factory_init): properly initialize
|
||||
translate_* fields.
|
||||
(gtk_item_factory_finalize): invoke translate_notify independant from
|
||||
translate_data.
|
||||
(gtk_item_factory_set_translate_func): likewise.
|
||||
(gtk_item_factory_destroy): only ifactory pointer from those widgets
|
||||
that belong to us (stupid me).
|
||||
|
||||
Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com>
|
||||
|
||||
* gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the
|
||||
|
||||
@@ -1,3 +1,13 @@
|
||||
Wed Apr 21 21:26:11 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkitemfactory.c (gtk_item_factory_init): properly initialize
|
||||
translate_* fields.
|
||||
(gtk_item_factory_finalize): invoke translate_notify independant from
|
||||
translate_data.
|
||||
(gtk_item_factory_set_translate_func): likewise.
|
||||
(gtk_item_factory_destroy): only ifactory pointer from those widgets
|
||||
that belong to us (stupid me).
|
||||
|
||||
Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com>
|
||||
|
||||
* gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the
|
||||
|
||||
@@ -1,3 +1,13 @@
|
||||
Wed Apr 21 21:26:11 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkitemfactory.c (gtk_item_factory_init): properly initialize
|
||||
translate_* fields.
|
||||
(gtk_item_factory_finalize): invoke translate_notify independant from
|
||||
translate_data.
|
||||
(gtk_item_factory_set_translate_func): likewise.
|
||||
(gtk_item_factory_destroy): only ifactory pointer from those widgets
|
||||
that belong to us (stupid me).
|
||||
|
||||
Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com>
|
||||
|
||||
* gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the
|
||||
|
||||
@@ -1,3 +1,13 @@
|
||||
Wed Apr 21 21:26:11 1999 Tim Janik <timj@gtk.org>
|
||||
|
||||
* gtk/gtkitemfactory.c (gtk_item_factory_init): properly initialize
|
||||
translate_* fields.
|
||||
(gtk_item_factory_finalize): invoke translate_notify independant from
|
||||
translate_data.
|
||||
(gtk_item_factory_set_translate_func): likewise.
|
||||
(gtk_item_factory_destroy): only ifactory pointer from those widgets
|
||||
that belong to us (stupid me).
|
||||
|
||||
Wed Apr 21 14:20:22 1999 George Lebl <jirka@5z.com>
|
||||
|
||||
* gdk/gdkwindow.c: (gdk_window_remove_filter) correctly remove the
|
||||
|
||||
@@ -224,6 +224,9 @@ gtk_item_factory_init (GtkItemFactory *ifactory)
|
||||
ifactory->accel_group = NULL;
|
||||
ifactory->widget = NULL;
|
||||
ifactory->items = NULL;
|
||||
ifactory->translate_func = NULL;
|
||||
ifactory->translate_data = NULL;
|
||||
ifactory->translate_notify = NULL;
|
||||
}
|
||||
|
||||
GtkItemFactory*
|
||||
@@ -661,7 +664,7 @@ gtk_item_factory_destroy (GtkObject *object)
|
||||
GSList *link;
|
||||
|
||||
for (link = item->widgets; link; link = link->next)
|
||||
if (gtk_object_get_data_by_id (link->data, quark_item_factory))
|
||||
if (gtk_object_get_data_by_id (link->data, quark_item_factory) == ifactory)
|
||||
gtk_object_remove_data_by_id (link->data, quark_item_factory);
|
||||
}
|
||||
g_slist_free (ifactory->items);
|
||||
@@ -684,7 +687,7 @@ gtk_item_factory_finalize (GtkObject *object)
|
||||
g_free (ifactory->path);
|
||||
g_assert (ifactory->widget == NULL);
|
||||
|
||||
if (ifactory->translate_data && ifactory->translate_notify)
|
||||
if (ifactory->translate_notify)
|
||||
ifactory->translate_notify (ifactory->translate_data);
|
||||
|
||||
parent_class->finalize (object);
|
||||
@@ -1651,7 +1654,7 @@ gtk_item_factory_set_translate_func (GtkItemFactory *ifactory,
|
||||
{
|
||||
g_return_if_fail (ifactory != NULL);
|
||||
|
||||
if (ifactory->translate_data && ifactory->translate_notify)
|
||||
if (ifactory->translate_notify)
|
||||
ifactory->translate_notify (ifactory->translate_data);
|
||||
|
||||
ifactory->translate_func = func;
|
||||
|
||||
Reference in New Issue
Block a user