[Gnash-commit] /srv/bzr/gnash/trunk r9980: Set default stream timeout to 60 seconds because sites like youtube redirect

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9980
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Fri 2008-10-10 18:56:12 +0200
message:
  Set default stream timeout to 60 seconds because sites like youtube redirect
  a lot and with poor network performance (e.g. DNS lookups) 10 isn't enough.
  
  Change stream timeout chooser in the preferences box to a spin box with a 
  max of 300.
modified:
  configure.ac
  gui/gtk.cpp

=== modified file 'configure.ac'
--- a/configure.ac      2008-10-10 15:19:16 +0000
+++ b/configure.ac      2008-10-10 16:56:12 +0000
@@ -110,7 +110,7 @@
 AC_SUBST(DEFAULT_FLASH_PLATFORM_ID)
 AC_SUBST(DEFAULT_FLASH_SYSTEM_OS)
 
-DEFAULT_STREAMS_TIMEOUT=10
+DEFAULT_STREAMS_TIMEOUT=60
 AC_SUBST(DEFAULT_STREAMS_TIMEOUT)
 AC_DEFINE_UNQUOTED([DEFAULT_STREAMS_TIMEOUT], [${DEFAULT_STREAMS_TIMEOUT}], 
[Default streams timeout in seconds])
 

=== modified file 'gui/gtk.cpp'
--- a/gui/gtk.cpp       2008-10-05 00:43:20 +0000
+++ b/gui/gtk.cpp       2008-10-10 16:56:12 +0000
@@ -1244,16 +1244,17 @@
     gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 
     // Streams timeout
-    label = gtk_label_new (_("Streams timeout (in seconds -- 0 to never 
timeout):"));
-    gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+    GtkWidget *timeoutbox = gtk_hbox_new (FALSE, 2);
+    gtk_box_pack_start(GTK_BOX(vbox), timeoutbox, FALSE, FALSE, 0);
+    
+    label = gtk_label_new (_("Network timeout in seconds (0 for no 
timeout):"));
+    gtk_box_pack_start(GTK_BOX(timeoutbox), label, FALSE, FALSE, 0);
     gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
 
-    GtkWidget* scale = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new 
(_rcfile.getStreamsTimeout(), 0, 10, 1, 0, 0)));
-    gtk_scale_set_digits (GTK_SCALE (scale), 0);
-    gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DISCONTINUOUS);
-    gtk_box_pack_start(GTK_BOX(vbox), scale, FALSE, FALSE, 0);
-
-    _prefs->streamsTimeoutScale = scale;
+    _prefs->streamsTimeoutScale = gtk_spin_button_new_with_range(0, 300, 1);
+    gtk_box_pack_start(GTK_BOX(timeoutbox), _prefs->streamsTimeoutScale, 
FALSE, FALSE, 0);
+    // Align to _rcfile value:
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(_prefs->streamsTimeoutScale), 
_rcfile.getStreamsTimeout());
 
 }