diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | gtk/testgtk.c | 12 | ||||
| -rw-r--r-- | tests/testgtk.c | 12 |
9 files changed, 47 insertions, 12 deletions
@@ -1,3 +1,8 @@ +Thu Sep 30 13:55:25 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/testgtk.c (destroy_idle_test): Rename idle to + idle_id, to deal with obsolete, broken C libraries. + Wed Sep 29 15:41:08 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtktreeitem.c (gtk_tree_item_size_allocate): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5087b7997..e53adebb1 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Thu Sep 30 13:55:25 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/testgtk.c (destroy_idle_test): Rename idle to + idle_id, to deal with obsolete, broken C libraries. + Wed Sep 29 15:41:08 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtktreeitem.c (gtk_tree_item_size_allocate): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5087b7997..e53adebb1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Sep 30 13:55:25 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/testgtk.c (destroy_idle_test): Rename idle to + idle_id, to deal with obsolete, broken C libraries. + Wed Sep 29 15:41:08 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtktreeitem.c (gtk_tree_item_size_allocate): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5087b7997..e53adebb1 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Sep 30 13:55:25 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/testgtk.c (destroy_idle_test): Rename idle to + idle_id, to deal with obsolete, broken C libraries. + Wed Sep 29 15:41:08 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtktreeitem.c (gtk_tree_item_size_allocate): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5087b7997..e53adebb1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Sep 30 13:55:25 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/testgtk.c (destroy_idle_test): Rename idle to + idle_id, to deal with obsolete, broken C libraries. + Wed Sep 29 15:41:08 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtktreeitem.c (gtk_tree_item_size_allocate): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5087b7997..e53adebb1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Sep 30 13:55:25 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/testgtk.c (destroy_idle_test): Rename idle to + idle_id, to deal with obsolete, broken C libraries. + Wed Sep 29 15:41:08 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtktreeitem.c (gtk_tree_item_size_allocate): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5087b7997..e53adebb1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Sep 30 13:55:25 1999 Owen Taylor <otaylor@redhat.com> + + * gtk/testgtk.c (destroy_idle_test): Rename idle to + idle_id, to deal with obsolete, broken C libraries. + Wed Sep 29 15:41:08 1999 Owen Taylor <otaylor@redhat.com> * gtk/gtktreeitem.c (gtk_tree_item_size_allocate): diff --git a/gtk/testgtk.c b/gtk/testgtk.c index d638c6376..9ffed9244 100644 --- a/gtk/testgtk.c +++ b/gtk/testgtk.c @@ -7768,7 +7768,7 @@ create_timeout_test (void) * Idle Test */ -static int idle = 0; +static int idle_id = 0; static gint idle_test (GtkWidget *label) @@ -7786,9 +7786,9 @@ static void start_idle_test (GtkWidget *widget, GtkWidget *label) { - if (!idle) + if (!idle_id) { - idle = gtk_idle_add ((GtkFunction) idle_test, label); + idle_id = gtk_idle_add ((GtkFunction) idle_test, label); } } @@ -7796,10 +7796,10 @@ static void stop_idle_test (GtkWidget *widget, gpointer data) { - if (idle) + if (idle_id) { - gtk_idle_remove (idle); - idle = 0; + gtk_idle_remove (idle_id); + idle_id = 0; } } diff --git a/tests/testgtk.c b/tests/testgtk.c index d638c6376..9ffed9244 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -7768,7 +7768,7 @@ create_timeout_test (void) * Idle Test */ -static int idle = 0; +static int idle_id = 0; static gint idle_test (GtkWidget *label) @@ -7786,9 +7786,9 @@ static void start_idle_test (GtkWidget *widget, GtkWidget *label) { - if (!idle) + if (!idle_id) { - idle = gtk_idle_add ((GtkFunction) idle_test, label); + idle_id = gtk_idle_add ((GtkFunction) idle_test, label); } } @@ -7796,10 +7796,10 @@ static void stop_idle_test (GtkWidget *widget, gpointer data) { - if (idle) + if (idle_id) { - gtk_idle_remove (idle); - idle = 0; + gtk_idle_remove (idle_id); + idle_id = 0; } } |