File FlightGear-0.9.10-browser.patch of Package FlightGear

Overview Repositories Revisions Requests Users Attributes Meta

File FlightGear-0.9.10-browser.patch of Package FlightGear (Revision 4292205d8bde4cd08cd5612710ba58d7)

Currently displaying revision 4292205d8bde4cd08cd5612710ba58d7 , Show latest

--- autogen.sh
+++ autogen.sh
@@ -2,7 +2,7 @@
 
 OSTYPE=`uname -s`
 MACHINE=`uname -m`
-AUTO_MAKE_VERSION=`automake --version | head -1 | awk '{print $4}' | sed -e 's/\.$[0-9]*$.*/\1/'`
+AUTO_MAKE_VERSION=`automake --version | head -1 | awk '{print $4}' | sed -e 's/\.$[0-9]*$.*/\1/' | cut -c1,2`
 if test $AUTO_MAKE_VERSION -lt 15; then
     echo ""
     echo "You need to upgrade to automake version 1.5 or greater."
--- src/GUI/gui_funcs.cxx
+++ src/GUI/gui_funcs.cxx
@@ -222,6 +222,8 @@
 void helpCb (puObject *)
 {
     string command;
+    char help_app_str[30];
+    char dialog_str[120];
 	
 #if defined(FX) && !defined(WIN32)
 #  if defined(XMESA_FX_FULLSCREEN) && defined(XMESA_FX_WINDOW)
@@ -239,11 +241,18 @@
 
     string help_app = fgGetString("/sim/startup/browser-app");
 
-    if ( system("xwininfo -name Netscape > /dev/null 2>&1") == 0 ) {
-        command = help_app + " -remote \"openURL(" + path.str() + ")\"";
+    if (!strcmp(help_app.c_str(), "firefox") ) {
+	command = help_app + " " + path.str();
+    } else if (!strcmp(help_app.c_str(), "mozilla") ) {
+	if ( system("xwininfo -name Mozilla > /dev/null 2>&1") == 0 ) {
+	    command = help_app + " -remote \"openURL(" + path.str() + ")\"";
+	} else {
+	    command = help_app + " " + path.str();
+	}
     } else {
         command = help_app + " " + path.str();
     }
+
     command += " &";
     system( command.c_str() );
 
@@ -264,8 +273,13 @@
                    SW_SHOWNORMAL ) ;
 
 #endif
-	
-    mkDialog ("Help started in your web browser window.");
+
+    strncpy (help_app_str, help_app.c_str(), 30);
+    sprintf (dialog_str, "Help started in %s window.\nTry --browser-app option to specify\nbrowser.", help_app_str);
+    cout << "Running " << command.c_str() << endl;
+    cout << "Note:  words \"firefox\" and \"mozilla\" are recognized in --browser-app option, in order to supply URL in correct syntax\n";
+    system( command.c_str() );
+    mkDialog (dialog_str);
 }
 
 #if defined( TR_HIRES_SNAP)

Places

File FlightGear-0.9.10-browser.patch of Package FlightGear (Revision 4292205d8bde4cd08cd5612710ba58d7)

Places