# HG changeset patch
# User nenolod
# Date 1151524303 25200
# Node ID cc57f7545876436d0274b6dbaa044c5349d1d88a
# Parent  8a874906535bc864ad1256c5f92bd7ce856507d3
[svn] - add --no-log switch to disable the system logger (and instead dump to stdout)

diff -r 8a874906535b -r cc57f7545876 ChangeLog
--- a/ChangeLog	Wed Jun 28 12:46:09 2006 -0700
+++ b/ChangeLog	Wed Jun 28 12:51:43 2006 -0700
@@ -1,3 +1,12 @@
+2006-06-28 19:46:09 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1606]
+  - use a more standard-looking default title format
+  
+
+  Changes:        Modified:
+  +2 -2           trunk/audacious/main.c  
+
+
 2006-06-28 19:24:47 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1604]
   - sanity checking prevents us from exploding when we encounter a file we don't support
diff -r 8a874906535b -r cc57f7545876 audacious/main.c
--- a/audacious/main.c	Wed Jun 28 12:46:09 2006 -0700
+++ b/audacious/main.c	Wed Jun 28 12:51:43 2006 -0700
@@ -93,6 +93,7 @@
     gboolean enqueue, mainwin, remote, activate;
     gboolean load_skins;
     gboolean headless;
+    gboolean no_log;
     gchar *previous_session_id;
 };
 
@@ -721,6 +722,9 @@
     g_print("\n-H, --headless         ");
     /* -h, --headless switch */
     g_print(_("Headless operation [experimental]"));
+    g_print("\n-N, --no-log           ");
+    /* -N, --no-log switch */
+    g_print(_("Disable error/warning interception (logging)"));
     g_print("\n-v, --version          ");
     /* -v, --version switch */
     g_print(_("Print version number and exit\n"));
@@ -749,6 +753,7 @@
         {"sm-client-id", 1, NULL, 'i'},
         {"xmms", 0, NULL, 'x'},
         {"headless", 0, NULL, 'H'},
+        {"no-log", 0, NULL, 'N'},
         {0, 0, 0, 0}
     };
 
@@ -810,6 +815,9 @@
         case 'S':
             options->load_skins = TRUE;
             break;
+	case 'N':
+	    options->no_log = TRUE;
+            break;
         }
     }
 
@@ -967,7 +975,6 @@
 
     bmp_init_paths();
     bmp_make_user_dir();
-    bmp_setup_logger();
 
     /* Check GTK version. Really, this is only needed for binary
      * distribution since configure already checks. */
@@ -1010,6 +1017,9 @@
           exit(EXIT_SUCCESS);
     }
 
+    if (options.no_log == FALSE)
+        bmp_setup_logger();
+
     if (!vfs_init()) {
         g_printerr(Q_("Could not initialize VFS.\n"));
         exit(EXIT_FAILURE);