Commit 79753793 authored by Henrik Brix Andersen's avatar Henrik Brix Andersen Committed by Henrik Brix Andersen
Browse files

gimp/app/widgets/gimphelp.c gimp/app/config/gimpguiconfig.c

2003-11-12 Henrik Brix Andersen <brix@gimp.org>

* gimp/app/widgets/gimphelp.c
* gimp/app/config/gimpguiconfig.c
* gimp/app/widgets/widgets-enums.[ch] changed
GIMP_HELP_BROWSER_WEBBROWSER to GIMP_HELP_BROWSER_WEB_BROWSER and
changed all occurrences of webbrowser to web_browser for
consistency.
parent 13f02ef6
2003-11-12 Henrik Brix Andersen <brix@gimp.org>
* gimp/app/widgets/gimphelp.c
* gimp/app/config/gimpguiconfig.c
* gimp/app/widgets/widgets-enums.[ch] changed
GIMP_HELP_BROWSER_WEBBROWSER to GIMP_HELP_BROWSER_WEB_BROWSER and
changed all occurrences of webbrowser to web_browser for
consistency.
2003-11-12 Sven Neumann <sven@gimp.org>
 
* libgimpwidgets/gimpmemsizeentry.c: fixed a problem with the
......@@ -52,7 +52,7 @@ static void gimp_gui_config_get_property (GObject *object,
#define DEFAULT_THEME "Default"
#ifdef G_OS_WIN32
#define DEFAULT_GIMP_HELP_BROWSER GIMP_HELP_BROWSER_WEBBROWSER
#define DEFAULT_GIMP_HELP_BROWSER GIMP_HELP_BROWSER_WEB_BROWSER
#define DEFAULT_WEB_BROWSER "not used on Windows"
#else
#define DEFAULT_GIMP_HELP_BROWSER GIMP_HELP_BROWSER_GIMP
......
......@@ -66,15 +66,15 @@ struct _GimpIdleHelp
/* local function prototypes */
static gint gimp_idle_help (gpointer data);
static gboolean gimp_help_internal (Gimp *gimp,
const gchar *help_domain,
const gchar *help_locale,
const gchar *help_id);
static void gimp_help_webbrowser (Gimp *gimp,
const gchar *help_domain,
const gchar *help_locale,
const gchar *help_id);
static gint gimp_idle_help (gpointer data);
static gboolean gimp_help_internal (Gimp *gimp,
const gchar *help_domain,
const gchar *help_locale,
const gchar *help_id);
static void gimp_help_web_browser (Gimp *gimp,
const gchar *help_domain,
const gchar *help_locale,
const gchar *help_id);
/* public functions */
......@@ -142,11 +142,11 @@ gimp_idle_help (gpointer data)
idle_help->help_id))
break;
case GIMP_HELP_BROWSER_WEBBROWSER:
gimp_help_webbrowser (idle_help->gimp,
idle_help->help_domain,
idle_help->help_locale,
idle_help->help_id);
case GIMP_HELP_BROWSER_WEB_BROWSER:
gimp_help_web_browser (idle_help->gimp,
idle_help->help_domain,
idle_help->help_locale,
idle_help->help_id);
break;
default:
......@@ -163,14 +163,14 @@ gimp_idle_help (gpointer data)
static void
gimp_help_internal_not_found_callback (GtkWidget *widget,
gboolean use_webbrowser,
gboolean use_web_browser,
gpointer data)
{
Gimp *gimp = GIMP (data);
if (use_webbrowser)
if (use_web_browser)
g_object_set (gimp->config,
"help-browser", GIMP_HELP_BROWSER_WEBBROWSER,
"help-browser", GIMP_HELP_BROWSER_WEB_BROWSER,
NULL);
gtk_main_quit ();
......@@ -222,7 +222,7 @@ gimp_help_internal (Gimp *gimp,
busy = FALSE;
return (GIMP_GUI_CONFIG (gimp->config)->help_browser
!= GIMP_HELP_BROWSER_WEBBROWSER);
!= GIMP_HELP_BROWSER_WEB_BROWSER);
}
n_domains = plug_ins_help_domains (gimp, &help_domains, &help_uris);
......@@ -264,7 +264,7 @@ gimp_help_internal (Gimp *gimp,
busy = FALSE;
return (GIMP_GUI_CONFIG (gimp->config)->help_browser
!= GIMP_HELP_BROWSER_WEBBROWSER);
!= GIMP_HELP_BROWSER_WEB_BROWSER);
}
else
{
......@@ -289,10 +289,10 @@ gimp_help_internal (Gimp *gimp,
}
static void
gimp_help_webbrowser (Gimp *gimp,
const gchar *help_domain,
const gchar *help_locale,
const gchar *help_id)
gimp_help_web_browser (Gimp *gimp,
const gchar *help_domain,
const gchar *help_locale,
const gchar *help_id)
{
Argument *return_vals;
gint nreturn_vals;
......
......@@ -52,7 +52,7 @@ gimp_color_frame_mode_get_type (void)
static const GEnumValue gimp_help_browser_type_enum_values[] =
{
{ GIMP_HELP_BROWSER_GIMP, N_("Internal"), "gimp" },
{ GIMP_HELP_BROWSER_WEBBROWSER, N_("Web Browser"), "webbrowser" },
{ GIMP_HELP_BROWSER_WEB_BROWSER, N_("Web Browser"), "web-browser" },
{ 0, NULL, NULL }
};
......
......@@ -56,7 +56,7 @@ GType gimp_help_browser_type_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_HELP_BROWSER_GIMP, /*< desc="Internal" >*/
GIMP_HELP_BROWSER_WEBBROWSER /*< desc="Web Browser" >*/
GIMP_HELP_BROWSER_WEB_BROWSER /*< desc="Web Browser" >*/
} GimpHelpBrowserType;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment