diff options
| author | Tim Janik <timj@gtk.org> | 1998-08-17 14:48:51 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 1998-08-17 14:48:51 +0000 |
| commit | 47215ba40332127afcaed8c9b7f21d9591af59a0 (patch) | |
| tree | d20b932ea561a5eeb76718e18f5abb7740ecaff0 /gtk/gtkitemfactory.c | |
| parent | 690a18f03288d8053a6c3f32f38b288ade30cde9 (diff) | |
| download | gtk+-47215ba40332127afcaed8c9b7f21d9591af59a0.tar.gz | |
removed gtk_input_add_interp.merge-to-themes-2-2
Mon Aug 17 15:31:38 1998 Tim Janik <timj@gtk.org>
* gtk/gtkmain.c: removed gtk_input_add_interp.
* gtk/gtkeditable.c (gtk_editable_set_position): fixed bogus "return"
keyword.
(gtk_editable_get_event_time): fix default: case.
* gtk/gtkclist.c (gtk_clist_swap_rows): fixes for lvalue casts.
* gdk/gdkpixmap.c: made a bunch of unexported functions static.
* gdk/gdkcolor.c:
* gdk/gdkvisual.c: include "gdkx.h", since it exports prototypes
of our functions.
* various minor compilation cleanups, such as bogus commas in
enums and similar things.
M
Diffstat (limited to 'gtk/gtkitemfactory.c')
| -rw-r--r-- | gtk/gtkitemfactory.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c index dd605d2344..0aab1b0977 100644 --- a/gtk/gtkitemfactory.c +++ b/gtk/gtkitemfactory.c @@ -319,15 +319,15 @@ gtk_item_factory_propagate_accelerator (GtkItemFactoryItem *item, GTK_ACCEL_VISIBLE); else { - GSList *slist; + GSList *work; - slist = gtk_accel_group_entries_from_object (GTK_OBJECT (widget)); - while (slist) + work = gtk_accel_group_entries_from_object (GTK_OBJECT (widget)); + while (work) { GtkAccelEntry *ac_entry; - ac_entry = slist->data; - slist = slist->next; + ac_entry = work->data; + work = work->next; if (ac_entry->accel_flags & GTK_ACCEL_VISIBLE && ac_entry->accel_group == ifactory->accel_group && ac_entry->signal_id == signal_id) @@ -636,7 +636,7 @@ gtk_item_factory_from_path (const gchar *path) } static void -gtk_item_factory_destroy (GtkObject *object) +gtk_item_factory_destroy (GtkObject *object) { GtkItemFactory *ifactory; GSList *slist; @@ -648,14 +648,14 @@ gtk_item_factory_destroy (GtkObject *object) if (ifactory->widget) { - GtkObject *object; + GtkObject *dobj; - object = GTK_OBJECT (ifactory->widget); + dobj = GTK_OBJECT (ifactory->widget); - gtk_object_ref (object); - gtk_object_sink (object); - gtk_object_destroy (object); - gtk_object_unref (object); + gtk_object_ref (dobj); + gtk_object_sink (dobj); + gtk_object_destroy (dobj); + gtk_object_unref (dobj); ifactory->widget = NULL; } |