[xine-cvs] HG: gxine: Unbreak time widget update. Only one was being updated, but all should be.

[<li...@yo...>]

# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1179883994 -3600
# Node ID 4b801eb5ce4575661c21d498836eac270649cb5b
# Parent  a1b86ff9547f818e2c41b723588c65424421d1c4
Unbreak time widget update. Only one was being updated, but all should be.

diff -r 4b801eb5ce4575661c21d498836eac270649cb5b -r a1b86ff9547f818e2c41b723588c65424421d1c4 src/info_widgets.c
--- a/src/info_widgets.c	Wed May 23 02:33:14 2007 +0100
+++ b/src/info_widgets.c	Wed May 16 21:38:57 2007 +0100
@@ -503,14 +503,17 @@ postinit_time_widget (gpointer widget)
   gdk_window_set_cursor (window, ptr);
   gdk_cursor_unref (ptr);
 
-  gtk_video_set_frame_cb (gtv, update_time_widget_cb, widget);
   return FALSE;
 }
 
 GtkWidget *
-create_time_widget (gboolean small)
-{
-  return gxineinfo_new (small ? 1 : 3, PANGO_ELLIPSIZE_NONE, small ? 16 : 8,
-			postinit_time_widget, update_time_widget_cb, "time",
-			1 /* line 0 has an event box */);
-}
+create_time_widget (gboolean small, const GList *const *const listp)
+{
+  GtkWidget *w = gxineinfo_new (small ? 1 : 3, PANGO_ELLIPSIZE_NONE,
+				small ? 16 : 8, postinit_time_widget,
+				update_time_widget_cb, "time",
+				1 /* line 0 has an event box */);
+  if (listp)
+    g_object_set_data ((GObject *) w, "gxine-chain", (gpointer) listp);
+  return w;
+}
diff -r 4b801eb5ce4575661c21d498836eac270649cb5b -r a1b86ff9547f818e2c41b723588c65424421d1c4 src/info_widgets.h
--- a/src/info_widgets.h	Wed May 23 02:33:14 2007 +0100
+++ b/src/info_widgets.h	Wed May 16 21:38:57 2007 +0100
@@ -27,7 +27,7 @@ typedef GtkAlignmentClass GtkGxineInfoCl
 typedef GtkAlignmentClass GtkGxineInfoClass;
 
 GtkWidget *create_infobar (gboolean small);
-GtkWidget *create_time_widget (gboolean small);
+GtkWidget *create_time_widget (gboolean small, const GList *const *const);
 
 void gxineinfo_update_line (GSList *, guint, const char *, ...)
   __attribute__ ((format (printf, 3, 4)));
diff -r 4b801eb5ce4575661c21d498836eac270649cb5b -r a1b86ff9547f818e2c41b723588c65424421d1c4 src/main.c
--- a/src/main.c	Wed May 23 02:33:14 2007 +0100
+++ b/src/main.c	Wed May 16 21:38:57 2007 +0100
@@ -23,6 +23,7 @@
 
 #include "globals.h"
 #include "version.h"
+#include <xine/xineutils.h>
 
 #include <string.h>
 #include <signal.h>
@@ -685,6 +686,8 @@ to the extent permitted by law.\n"));
     se_eval (gse, cmd, NULL, NULL, NULL, "--command");
 
   //gdk_threads_enter();
+xine_profiler_init ();
+xine_profiler_start_count (0);
   gtk_main();
   //gdk_threads_leave();
 
diff -r 4b801eb5ce4575661c21d498836eac270649cb5b -r a1b86ff9547f818e2c41b723588c65424421d1c4 src/noskin_window.c
--- a/src/noskin_window.c	Wed May 23 02:33:14 2007 +0100
+++ b/src/noskin_window.c	Wed May 16 21:38:57 2007 +0100
@@ -689,6 +689,8 @@ static gboolean noskin_main_init_cb (gpo
   gdk_window_add_filter (app->window, xevent_filter_cb, app);
   gtk_widget_grab_focus (app);
 
+  gtk_video_set_frame_cb ((GtkVideo *)gtv, gxineinfo_update, timewidgets);
+
   if (fullscreen)
     gtk_window_fullscreen (GTK_WINDOW (app));
 
diff -r 4b801eb5ce4575661c21d498836eac270649cb5b -r a1b86ff9547f818e2c41b723588c65424421d1c4 src/script_engine.c
--- a/src/script_engine.c	Wed May 23 02:33:14 2007 +0100
+++ b/src/script_engine.c	Wed May 16 21:38:57 2007 +0100
@@ -294,6 +294,7 @@ static JSBool controls_exit (JSContext *
   settings_clear ();
 
   gtk_main_quit();
+  sched_yield ();
 
   exit (0);
 }
diff -r 4b801eb5ce4575661c21d498836eac270649cb5b -r a1b86ff9547f818e2c41b723588c65424421d1c4 src/xml_widgets.c
--- a/src/xml_widgets.c	Wed May 23 02:33:14 2007 +0100
+++ b/src/xml_widgets.c	Wed May 16 21:38:57 2007 +0100
@@ -1186,7 +1186,8 @@ widget_parse (xml_node_t *node)
 #ifndef MAKE_TRANSLATION_SOURCE
     else if (!strcasecmp (node->name + 1, "ime"))
     {
-      widget = create_time_widget (xml_parser_get_bool (node, "small"));
+      widget = create_time_widget (xml_parser_get_bool (node, "small"),
+				   &timewidgets);
       timewidgets = g_slist_append (timewidgets, widget);
     }
     else if (!strcasecmp (node->name + 1, "itle"))