r5418 dsilvers - in /branches/vince/netsurf-fb/framebuffer: fb_frontend.h fb_frontend_ablefb.c fb_frontend_linuxfb.c fb_gui.c

netsurf at semichrome.net netsurf at semichrome.net
Tue Sep 23 13:59:00 BST 2008


Author: dsilvers
Date: Tue Sep 23 07:59:00 2008
New Revision: 5418

URL: http://source.netsurf-browser.org?rev=5418&view=rev
Log:
Ensure options are overridden after load, and squash an fb_gui.c warning

Modified:
    branches/vince/netsurf-fb/framebuffer/fb_frontend.h
    branches/vince/netsurf-fb/framebuffer/fb_frontend_ablefb.c
    branches/vince/netsurf-fb/framebuffer/fb_frontend_linuxfb.c
    branches/vince/netsurf-fb/framebuffer/fb_gui.c

Modified: branches/vince/netsurf-fb/framebuffer/fb_frontend.h
URL: http://source.netsurf-browser.org/branches/vince/netsurf-fb/framebuffer/fb_frontend.h?rev=5418&r1=5417&r2=5418&view=diff
==============================================================================
--- branches/vince/netsurf-fb/framebuffer/fb_frontend.h (original)
+++ branches/vince/netsurf-fb/framebuffer/fb_frontend.h Tue Sep 23 07:59:00 2008
@@ -22,5 +22,6 @@
 extern framebuffer_t *fb_os_init(int argc, char** argv);
 extern void fb_os_quit(framebuffer_t *fb);
 extern void fb_os_input(struct gui_window *g);
+extern void fb_os_option_override(void);
 
 #endif /* NETSURF_FB_FRONTEND_H */

Modified: branches/vince/netsurf-fb/framebuffer/fb_frontend_ablefb.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-fb/framebuffer/fb_frontend_ablefb.c?rev=5418&r1=5417&r2=5418&view=diff
==============================================================================
--- branches/vince/netsurf-fb/framebuffer/fb_frontend_ablefb.c (original)
+++ branches/vince/netsurf-fb/framebuffer/fb_frontend_ablefb.c Tue Sep 23 07:59:00 2008
@@ -91,10 +91,6 @@
         /* set stdin to nonblocking */
         fcntl(0, F_SETFL, O_NONBLOCK);
 
-        /* override some options */
-        option_max_cached_fetch_handles = 1;
-        option_max_fetchers = option_max_fetchers_per_host = 1;
-
         return newfb;
 }
 
@@ -130,6 +126,14 @@
 
 }
 
+void
+fb_os_option_override(void)
+{
+        /* override some options */
+        option_max_cached_fetch_handles = 1;
+        option_max_fetchers = option_max_fetchers_per_host = 1;
+}
+
 /*
  * Local Variables:
  * c-basic-offset:8

Modified: branches/vince/netsurf-fb/framebuffer/fb_frontend_linuxfb.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-fb/framebuffer/fb_frontend_linuxfb.c?rev=5418&r1=5417&r2=5418&view=diff
==============================================================================
--- branches/vince/netsurf-fb/framebuffer/fb_frontend_linuxfb.c (original)
+++ branches/vince/netsurf-fb/framebuffer/fb_frontend_linuxfb.c Tue Sep 23 07:59:00 2008
@@ -40,7 +40,6 @@
 
 #include "css/css.h"
 #include "desktop/browser.h"
-#include "desktop/options.h"
 #include "desktop/gui.h"
 #include "framebuffer/fb_gui.h"
 #include "framebuffer/fb_plotters.h"
@@ -653,6 +652,12 @@
 
 }
 
+void
+fb_os_option_override(void)
+{
+}
+
+
 /*
  * Local Variables:
  * c-basic-offset:8

Modified: branches/vince/netsurf-fb/framebuffer/fb_gui.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-fb/framebuffer/fb_gui.c?rev=5418&r1=5417&r2=5418&view=diff
==============================================================================
--- branches/vince/netsurf-fb/framebuffer/fb_gui.c (original)
+++ branches/vince/netsurf-fb/framebuffer/fb_gui.c Tue Sep 23 07:59:00 2008
@@ -27,6 +27,7 @@
 #include "desktop/netsurf.h"
 #include "desktop/options.h"
 #include "utils/log.h"
+#include "utils/messages.h"
 
 #include "framebuffer/fb_bitmap.h"
 #include "framebuffer/fb_gui.h"
@@ -146,7 +147,9 @@
 	options_read(fb_findfile("Options"));
 
         default_stylesheet_url = fb_findfile_asurl("default.css");
-
+        
+        fb_os_option_override();
+        
         switch (framebuffer->bpp) {
                 /*        case 1:
                 plot = framebuffer_1bpp_plot;




More information about the netsurf-commits mailing list