diff options
| author | Dan Winship <danw@src.gnome.org> | 2001-04-04 01:26:54 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2001-04-04 01:26:54 +0800 |
| commit | f24a51e470f5de3beb16891d6e51ab4e4a228bed (patch) | |
| tree | b17777af1ecd36cee863667cd4e8ab302bfbe0ce /shell/main.c | |
| parent | 785567b9191e01e1875139c9d91a2c58f913af33 (diff) | |
| download | gsoc2013-evolution-f24a51e470f5de3beb16891d6e51ab4e4a228bed.tar.gz gsoc2013-evolution-f24a51e470f5de3beb16891d6e51ab4e4a228bed.tar.zst gsoc2013-evolution-f24a51e470f5de3beb16891d6e51ab4e4a228bed.zip | |
Don't declare debug_log as extern in evolution-shell-component-client.c,
* main.c:
* evolution-shell-component-client.c: Don't declare debug_log as
extern in evolution-shell-component-client.c, because that's part
of libeshell and so gets linked into the other components.
Instead, declare it there and extern it from main.c.
(Noticed by Peter Williams)
svn path=/trunk/; revision=9136
Diffstat (limited to 'shell/main.c')
| -rw-r--r-- | shell/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/shell/main.c b/shell/main.c index dce135d9d9..3493e6d2d8 100644 --- a/shell/main.c +++ b/shell/main.c @@ -51,7 +51,7 @@ static EShell *shell = NULL; static char *evolution_directory = NULL; static gboolean no_splash = FALSE; -char *debug_log = NULL; +extern char *evolution_debug_log; static void @@ -183,7 +183,7 @@ main (int argc, char **argv) { struct poptOption options[] = { { "no-splash", '\0', POPT_ARG_NONE, &no_splash, 0, N_("Disable splash screen"), NULL }, - { "debug", '\0', POPT_ARG_STRING, &debug_log, 0, N_("Send the debugging output of all components to a file."), NULL }, + { "debug", '\0', POPT_ARG_STRING, &evolution_debug_log, 0, N_("Send the debugging output of all components to a file."), NULL }, { NULL, '\0', POPT_ARG_INCLUDE_TABLE, &oaf_popt_options, 0, NULL, NULL }, POPT_AUTOHELP { NULL, '\0', 0, NULL, 0, NULL, NULL } @@ -194,10 +194,10 @@ main (int argc, char **argv) gnome_init_with_popt_table ("Evolution", VERSION, argc, argv, options, 0, NULL); - if (debug_log) { + if (evolution_debug_log) { int fd; - fd = open (debug_log, O_WRONLY | O_CREAT | O_TRUNC, 0600); + fd = open (evolution_debug_log, O_WRONLY | O_CREAT | O_TRUNC, 0600); if (fd) { dup2 (fd, STDOUT_FILENO); dup2 (fd, STDERR_FILENO); |