18861N/A--- xsane-0.995/src/xsane.c.orig 2008-07-01 18:50:56.144479000 +0800

18861N/A+++ xsane-0.995/src/xsane.c 2008-07-01 19:35:41.122804000 +0800

18861N/A@@ -3751,7 +3751,11 @@

18861N/A else /* netscape not running */

18861N/A {

18861N/A DBG(DBG_proc, "xsane_show_doc_via_nsr: netscape is not running, trying to start netscape\n");

18861N/A+#if defined(sun) && defined(__SVR4)

18861N/A+ arg[0] = "firefox";

18861N/A+#else

18861N/A arg[0] = "netscape";

18861N/A+#endif

18861N/A arg[1] = name;

18861N/A arg[2] = 0;

18861N/A

18861N/A@@ -3860,13 +3864,17 @@

18861N/A /* translation of language_dir gives the name of the subdirectory in */

18861N/A /* which there may be a translation of a documentation */

18861N/A language_dir = XSANE_LANGUAGE_DIR;

18861N/A+#if defined(sun) && defined(__SVR4)

18861N/A+ snprintf(path, sizeof(path), "%s/%s-doc.html", STRINGIFY(PATH_XSANE_DOC_DIR), name);

18861N/A+#else

18861N/A snprintf(path, sizeof(path), "%s/%s/%s-doc.html", STRINGIFY(PATH_XSANE_DOC_DIR), language_dir, name);

18861N/A+#endif

18861N/A if (stat(path, &st) != 0) /* test if file does exist */

18861N/A {

18861N/A snprintf(path, sizeof(path), "%s/%s-doc.html", STRINGIFY(PATH_XSANE_DOC_DIR), name); /* no, we use original doc */

18861N/A }

18861N/A

18861N/A- if (!strcmp(preferences.browser, BROWSER_NETSCAPE))

18861N/A+ if (!strcmp(preferences.browser, BROWSER_NETSCAPE) || !strcmp(preferences.browser, BROWSER_FIREFOX))

18861N/A {

18861N/A xsane_show_doc_via_nsr(widget, (void *) path);

18861N/A }

18861N/A@@ -4246,9 +4254,8 @@

18861N/A gtk_menu_append(GTK_MENU(menu), item);

18861N/A gtk_widget_show(item);

18861N/A

18861N/A-

18861N/A+#if !defined(sun) || !defined(__SVR4)

18861N/A /* Backend doc -> html viewer */

18861N/A-

18861N/A if (xsane.backend)

18861N/A {

18861N/A item = gtk_menu_item_new_with_label(MENU_ITEM_BACKEND_DOC);

18861N/A@@ -4257,7 +4264,7 @@

18861N/A gtk_widget_add_accelerator(item, "activate", xsane.accelerator_group, GDK_F2, 0, GTK_ACCEL_VISIBLE | DEF_GTK_ACCEL_LOCKED);

18861N/A gtk_widget_show(item);

18861N/A }

18861N/A-

18861N/A+#endif

18861N/A

18861N/A /* available backends -> html viewer */

18861N/A

18861N/A--- xsane-0.995/src/xsane.h.orig 2008-07-01 18:51:52.865496000 +0800

18861N/A+++ xsane-0.995/src/xsane.h 2008-07-01 19:17:48.644923000 +0800

18861N/A@@ -250,6 +250,8 @@

18861N/A # define DEFAULT_BROWSER "iexplore.exe"

18861N/A # elif defined(HAVE_OS2_H)

18861N/A # define DEFAULT_BROWSER "netscape"

18861N/A+# elif defined(sun) && defined(__SVR4)

18861N/A+# define DEFAULT_BROWSER "firefox"

18861N/A # else

18861N/A # define DEFAULT_BROWSER "netscape"

18861N/A # endif

18861N/A@@ -530,6 +532,7 @@

18861N/A #define OCROUTFDOPT "-x"

18861N/A #define OCRPROGRESSKEY ""

18861N/A #define BROWSER_NETSCAPE "netscape"

18861N/A+#define BROWSER_FIREFOX "firefox"

18861N/A

18861N/A #define XSANE_MEDIUM_CALIB_BRIGHTNESS_MIN -1000.0

18861N/A #define XSANE_MEDIUM_CALIB_BRIGHTNESS_MAX 1000.0