r10067 MarkieB - in /branches/MarkieB/javafront: desktop/netsurf.c
java/gui.c java/gui.h
netsurf at semichrome.net
netsurf at semichrome.net
Tue Feb 16 13:56:51 GMT 2010
Author: MarkieB
Date: Tue Feb 16 07:56:51 2010
New Revision: 10067
URL: http://source.netsurf-browser.org?rev=10067&view=rev
Log:
handle main() call in java directory
Modified:
branches/MarkieB/javafront/desktop/netsurf.c
branches/MarkieB/javafront/java/gui.c
branches/MarkieB/javafront/java/gui.h
Modified: branches/MarkieB/javafront/desktop/netsurf.c
URL: http://source.netsurf-browser.org/branches/MarkieB/javafront/desktop/netsurf.c?rev=10067&r1=10066&r2=10067&view=diff
==============================================================================
--- branches/MarkieB/javafront/desktop/netsurf.c (original)
+++ branches/MarkieB/javafront/desktop/netsurf.c Tue Feb 16 07:56:51 2010
@@ -52,7 +52,7 @@
* Gui NetSurf main().
*/
-int netsurf_main(int argc, char** argv)
+int netsurf_main(int argc, char **argv)
{
netsurf_init(argc, argv);
Modified: branches/MarkieB/javafront/java/gui.c
URL: http://source.netsurf-browser.org/branches/MarkieB/javafront/java/gui.c?rev=10067&r1=10066&r2=10067&view=diff
==============================================================================
--- branches/MarkieB/javafront/java/gui.c (original)
+++ branches/MarkieB/javafront/java/gui.c Tue Feb 16 07:56:51 2010
@@ -133,6 +133,13 @@
return realloc(ptr, len);
}
+/** link from java function call */
+
+int netsurf_java_main(int argc, char **argv)
+{
+ setbuf(stderr, NULL);
+ return netsurf_main(argc, argv);
+}
void gui_init(int argc, char** argv)
{
Modified: branches/MarkieB/javafront/java/gui.h
URL: http://source.netsurf-browser.org/branches/MarkieB/javafront/java/gui.h?rev=10067&r1=10066&r2=10067&view=diff
==============================================================================
--- branches/MarkieB/javafront/java/gui.h (original)
+++ branches/MarkieB/javafront/java/gui.h Tue Feb 16 07:56:51 2010
@@ -38,6 +38,8 @@
extern char *options_file_location;
extern JavaVM theVM;
+int netsurf_java_main(int argc, char **argv);
+
jobject gui_window_main_window(struct gui_window *);
void nsjava_gui_home_button(struct gui_window *);
void nsjava_gui_back_button(struct gui_window *);
More information about the netsurf-commits
mailing list