From 9aaf432daa90bfd61b6f65f244cd56a0e021f390 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Sat, 9 Aug 2003 11:51:42 +0000 Subject: [PATCH] app/app_procs.c app/batch.c moved global variables out of main.c. 2003-08-09 Sven Neumann * app/app_procs.c * app/batch.c * app/main.c: moved global variables out of main.c. --- ChangeLog | 6 ++++++ app/app_procs.c | 19 +++++++++++++++++++ app/batch.c | 2 ++ app/main.c | 20 -------------------- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4c7d0e2be..9cf29aac03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-08-09 Sven Neumann + + * app/app_procs.c + * app/batch.c + * app/main.c: moved global variables out of main.c. + 2003-08-09 Dave Neary * plug-ins/common/iwarp.c: Fixed bug #119440 with Raphael Quinet. diff --git a/app/app_procs.c b/app/app_procs.c index 84974e2812..25c1092139 100644 --- a/app/app_procs.c +++ b/app/app_procs.c @@ -77,6 +77,25 @@ static gboolean app_exit_finish_callback (Gimp *gimp, Gimp *the_gimp = NULL; +/* command-line options */ + +gboolean no_interface = FALSE; +gboolean no_data = FALSE; +gboolean no_splash = FALSE; +gboolean no_splash_image = FALSE; +gboolean be_verbose = FALSE; +gboolean use_shm = FALSE; +gboolean use_debug_handler = FALSE; +gboolean console_messages = FALSE; +gboolean restore_session = FALSE; +gboolean use_mmx = TRUE; +GimpStackTraceMode stack_trace_mode = GIMP_STACK_TRACE_QUERY; +gchar *alternate_gimprc = NULL; +gchar *alternate_system_gimprc = NULL; + +/* other global variables */ +gchar *prog_name = NULL; /* our executable name */ + /* public functions */ diff --git a/app/batch.c b/app/batch.c index 6cd2a7b0ee..1d1600743c 100644 --- a/app/batch.c +++ b/app/batch.c @@ -45,6 +45,8 @@ static void batch_perl_server (Gimp *gimp, gint extra); +gchar **batch_cmds = NULL; + static ProcRecord *eval_proc = NULL; diff --git a/app/main.c b/app/main.c index a4ea0f8f6b..2a71087a57 100644 --- a/app/main.c +++ b/app/main.c @@ -64,26 +64,6 @@ static void gimp_show_help (const gchar *progname); static void gimp_text_console_exit (gboolean fail); -/* command line options */ -gboolean no_interface = FALSE; -gboolean no_data = FALSE; -gboolean no_splash = FALSE; -gboolean no_splash_image = FALSE; -gboolean be_verbose = FALSE; -gboolean use_shm = FALSE; -gboolean use_debug_handler = FALSE; -gboolean console_messages = FALSE; -gboolean restore_session = FALSE; -gboolean use_mmx = TRUE; -GimpStackTraceMode stack_trace_mode = GIMP_STACK_TRACE_QUERY; -gchar *alternate_gimprc = NULL; -gchar *alternate_system_gimprc = NULL; -gchar **batch_cmds = NULL; - -/* other global variables */ -gchar *prog_name = NULL; /* our executable name */ - - /* * argv processing: * Arguments are either switches, their associated