summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-11-14 20:20:03 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-11-14 20:20:03 +0000
commit82a6dc936528d482fe3878c6f87a1186dfb186d3 (patch)
tree2d108e76207eb6d735951781081bb1596e1da5d4 /gtk
parenta433d5c5c1da3b763236f4183501e018e5f59e79 (diff)
downloadgtk+-82a6dc936528d482fe3878c6f87a1186dfb186d3.tar.gz
Back out accidental commit of debugging timing code
Wed Nov 14 15:14:48 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkcontainer.c (gtk_container_idle_sizer): Back out accidental commit of debugging timing code
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkcontainer.c62
1 files changed, 21 insertions, 41 deletions
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 12915fa21b..279ff7bc1f 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -966,52 +966,32 @@ gtk_container_get_resize_container (GtkContainer *container)
static gboolean
gtk_container_idle_sizer (gpointer data)
{
- static gboolean initialized = 0;
- static GTimeVal last_time;
- GTimeVal current_time;
-
GDK_THREADS_ENTER ();
- if (container_resize_queue)
+ /* we may be invoked with a container_resize_queue of NULL, because
+ * queue_resize could have been adding an extra idle function while
+ * the queue still got processed. we better just ignore such case
+ * than trying to explicitely work around them with some extra flags,
+ * since it doesn't cause any actual harm.
+ */
+ while (container_resize_queue)
{
- /* we may be invoked with a container_resize_queue of NULL, because
- * queue_resize could have been adding an extra idle function while
- * the queue still got processed. we better just ignore such case
- * than trying to explicitely work around them with some extra flags,
- * since it doesn't cause any actual harm.
- */
- while (container_resize_queue)
- {
- GSList *slist;
- GtkWidget *widget;
-
- slist = container_resize_queue;
- container_resize_queue = slist->next;
- widget = slist->data;
- g_slist_free_1 (slist);
-
- GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_PENDING);
- gtk_container_check_resize (GTK_CONTAINER (widget));
- }
-
- gdk_window_process_all_updates ();
-
- g_get_current_time (&current_time);
-
- if (initialized)
- {
- gdouble diff = ((current_time.tv_usec - last_time.tv_usec) / 1000. +
- (current_time.tv_sec - last_time.tv_sec) * 1000.);
- /* g_print ("Frame time: %g msec\n", diff); */
- }
- else
- initialized = TRUE;
-
- last_time = current_time;
-
- GDK_THREADS_LEAVE ();
+ GSList *slist;
+ GtkWidget *widget;
+
+ slist = container_resize_queue;
+ container_resize_queue = slist->next;
+ widget = slist->data;
+ g_slist_free_1 (slist);
+
+ GTK_PRIVATE_UNSET_FLAG (widget, GTK_RESIZE_PENDING);
+ gtk_container_check_resize (GTK_CONTAINER (widget));
}
+ gdk_window_process_all_updates ();
+
+ GDK_THREADS_LEAVE ();
+
return FALSE;
}