diff options
| -rw-r--r-- | shell/ChangeLog | 9 | ||||
| -rw-r--r-- | shell/evolution-shell-component-client.c | 6 | ||||
| -rw-r--r-- | shell/main.c | 8 |
3 files changed, 16 insertions, 7 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index e8272e2dfe..822d329040 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,12 @@ +2001-04-03 Dan Winship <danw@ximian.com> + + * 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) + 2001-04-03 Ettore Perazzoli <ettore@ximian.com> * e-shell-view.c (get_control_for_uri): Change `! folder_type' diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c index 1a4ba17916..c3fad4256a 100644 --- a/shell/evolution-shell-component-client.c +++ b/shell/evolution-shell-component-client.c @@ -38,7 +38,7 @@ #include "evolution-shell-component-client.h" -extern char *debug_log; +char *evolution_debug_log; #define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE static BonoboObjectClass *parent_class = NULL; @@ -473,8 +473,8 @@ evolution_shell_component_client_set_owner (EvolutionShellComponentClient *shell result = corba_exception_to_result (&ev); - if (result == EVOLUTION_SHELL_COMPONENT_OK && debug_log) - GNOME_Evolution_ShellComponent_debug (bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client)), debug_log, &ev); + if (result == EVOLUTION_SHELL_COMPONENT_OK && evolution_debug_log) + GNOME_Evolution_ShellComponent_debug (bonobo_object_corba_objref (BONOBO_OBJECT (shell_component_client)), evolution_debug_log, &ev); CORBA_exception_free (&ev); 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); |