[gimp] Remove web-browser gimprc option

[Martin Nordholts <martinn src gnome org>]

commit 6e483e95b292626c0ad846a1d866a1f589c60e4a
Author: Martin Nordholts <martinn src gnome org>
Date:   Sat Aug 8 15:21:10 2009 +0200

    Remove web-browser gimprc option
    
    The web-browser plug-in uses gtk_show_uri() now.

 app/config/gimpguiconfig.c       |   20 ++++++++------------
 app/config/gimprc-blurbs.h       |    7 -------
 app/dialogs/preferences-dialog.c |   10 ----------
 docs/gimprc.5.in                 |    9 ---------
 etc/gimprc                       |    8 --------
 5 files changed, 8 insertions(+), 46 deletions(-)
---
diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
index 6c05d5c..39a8a1f 100644
--- a/app/config/gimpguiconfig.c
+++ b/app/config/gimpguiconfig.c
@@ -235,11 +235,6 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
                                  GIMP_TYPE_HELP_BROWSER_TYPE,
                                  DEFAULT_HELP_BROWSER,
                                  GIMP_PARAM_STATIC_STRINGS);
-  GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_WEB_BROWSER,
-                                 "web-browser", WEB_BROWSER_BLURB,
-                                 GIMP_CONFIG_PATH_FILE,
-                                 DEFAULT_WEB_BROWSER,
-                                 GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_USER_MANUAL_ONLINE,
                                     "user-manual-online",
                                     USER_MANUAL_ONLINE_BLURB,
@@ -297,6 +292,12 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS |
                                     GIMP_CONFIG_PARAM_IGNORE);
+  GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_WEB_BROWSER,
+                                 "web-browser", NULL,
+                                 GIMP_CONFIG_PATH_FILE,
+                                 DEFAULT_WEB_BROWSER,
+                                 GIMP_PARAM_STATIC_STRINGS |
+                                 GIMP_CONFIG_PARAM_IGNORE);
 }
 
 static void
@@ -406,10 +407,6 @@ gimp_gui_config_set_property (GObject      *object,
     case PROP_HELP_BROWSER:
       gui_config->help_browser = g_value_get_enum (value);
       break;
-    case PROP_WEB_BROWSER:
-      g_free (gui_config->web_browser);
-      gui_config->web_browser = g_value_dup_string (value);
-      break;
     case PROP_USER_MANUAL_ONLINE:
       gui_config->user_manual_online = g_value_get_boolean (value);
       break;
@@ -432,6 +429,7 @@ gimp_gui_config_set_property (GObject      *object,
     case PROP_SHOW_TOOL_TIPS:
     case PROP_SHOW_TIPS:
     case PROP_TRANSIENT_DOCKS:
+    case PROP_WEB_BROWSER:
       /* ignored */
       break;
 
@@ -526,9 +524,6 @@ gimp_gui_config_get_property (GObject    *object,
     case PROP_HELP_BROWSER:
       g_value_set_enum (value, gui_config->help_browser);
       break;
-    case PROP_WEB_BROWSER:
-      g_value_set_string (value, gui_config->web_browser);
-      break;
     case PROP_USER_MANUAL_ONLINE:
       g_value_set_boolean (value, gui_config->user_manual_online);
       break;
@@ -550,6 +545,7 @@ gimp_gui_config_get_property (GObject    *object,
     case PROP_SHOW_TOOL_TIPS:
     case PROP_SHOW_TIPS:
     case PROP_TRANSIENT_DOCKS:
+    case PROP_WEB_BROWSER:
       /* ignored */
       break;
 
diff --git a/app/config/gimprc-blurbs.h b/app/config/gimprc-blurbs.h
index 9f45771..26f014f 100644
--- a/app/config/gimprc-blurbs.h
+++ b/app/config/gimprc-blurbs.h
@@ -441,13 +441,6 @@ N_("When enabled, pressing F1 will open the help browser.")
 "The location of the online user manual. This is used if " \
 "'user-manual-online' is enabled."
 
-#define WEB_BROWSER_BLURB \
-N_("Sets the external web browser to be used.  This can be an absolute " \
-   "path or the name of an executable to search for in the user's PATH. " \
-   "If the command contains '%s' it will be replaced with the URL, otherwise " \
-   "the URL will be appended to the command with a space separating the " \
-   "two.")
-
 #define XOR_COLOR_BLURB \
 "Sets the color that is used for XOR drawing. This setting only exists as " \
 "a workaround for buggy display drivers. If lines on the canvas are not " \
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 0785326..d9d4377 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -1861,16 +1861,6 @@ prefs_dialog_new (Gimp       *gimp,
                             _("H_elp browser to use:"),
                             GTK_TABLE (table), 0, size_group);
 
-  /*  Web Browser  (unused on win32)  */
-#ifndef G_OS_WIN32
-  vbox2 = prefs_frame_new (_("Web Browser"), GTK_CONTAINER (vbox), FALSE);
-  table = prefs_table_new (1, GTK_CONTAINER (vbox2));
-
-  prefs_widget_add_aligned (gimp_prop_entry_new (object, "web-browser", 0),
-                            _("_Web browser to use:"),
-                            GTK_TABLE (table), 0, FALSE, size_group);
-#endif
-
   g_object_unref (size_group);
   size_group = NULL;
 
diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in
index c59799a..873ed9e 100644
--- a/docs/gimprc.5.in
+++ b/docs/gimprc.5.in
@@ -812,15 +812,6 @@ Sets the browser used by the help system.  Possible values are gimp and
 web-browser.
 
 .TP
-(web-browser "xdg-open %s")
-
-Sets the external web browser to be used.  This can be an absolute path or the
-name of an executable to search for in the user's PATH. If the command
-contains '%s' it will be replaced with the URL, otherwise the URL will be
-appended to the command with a space separating the two.  This is a single
-filename.
-
-.TP
 (user-manual-online no)
 
 When enabled, the online user manual will be used by the help system.
diff --git a/etc/gimprc b/etc/gimprc
index ff558b0..9953427 100644
--- a/etc/gimprc
+++ b/etc/gimprc
@@ -639,14 +639,6 @@
 # 
 # (help-browser gimp)
 
-# Sets the external web browser to be used.  This can be an absolute path or
-# the name of an executable to search for in the user's PATH. If the command
-# contains '%s' it will be replaced with the URL, otherwise the URL will be
-# appended to the command with a space separating the two.  This is a single
-# filename.
-# 
-# (web-browser "xdg-open %s")
-
 # When enabled, the online user manual will be used by the help system.
 # Otherwise the locally installed copy is used.  Possible values are yes and
 # no.