[Xfce4-commits] <midori:master> Drop obsolete --log-file command line switch

[Christian Dywan]

Updating branch refs/heads/master
         to 7d210ad931d998d4cdb47ea168cdc04a9ef52d49 (commit)
       from 0aeac4de53f464b7862bcb3913c5e349660660bc (commit)

commit 7d210ad931d998d4cdb47ea168cdc04a9ef52d49
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Nov 20 01:15:03 2012 +0100

    Drop obsolete --log-file command line switch
    
    This used to supplement broken stdout on Win32.

 midori/main.c |   51 ---------------------------------------------------
 1 files changed, 0 insertions(+), 51 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index bc34c26..6a4c542 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1695,48 +1695,6 @@ midori_clear_page_icons_cb (void)
     #endif
 }
 
-static void
-midori_log_to_file (const gchar*   log_domain,
-                    GLogLevelFlags log_level,
-                    const gchar*   message,
-                    gpointer       user_data)
-{
-    FILE* logfile = fopen ((const char*)user_data, "a");
-    gchar* level_name = "";
-    time_t timestamp = time (NULL);
-
-    switch (log_level)
-    {
-        /* skip irrelevant flags */
-        case G_LOG_LEVEL_MASK:
-        case G_LOG_FLAG_FATAL:
-        case G_LOG_FLAG_RECURSION:
-
-        case G_LOG_LEVEL_ERROR:
-            level_name = "ERROR";
-            break;
-        case G_LOG_LEVEL_CRITICAL:
-            level_name = "CRITICAL";
-            break;
-        case G_LOG_LEVEL_WARNING:
-            level_name = "WARNING";
-            break;
-        case G_LOG_LEVEL_MESSAGE:
-            level_name = "MESSAGE";
-            break;
-        case G_LOG_LEVEL_INFO:
-            level_name = "INFO";
-            break;
-        case G_LOG_LEVEL_DEBUG:
-            level_name = "DEBUG";
-            break;
-    }
-
-    fprintf (logfile, "%s%s-%s **: %s\n", asctime (localtime (&timestamp)),
-        log_domain ? log_domain : "Midori", level_name, message);
-    fclose (logfile);
-}
-
 int
 main (int    argc,
       char** argv)
@@ -1750,7 +1708,6 @@ main (int    argc,
     gboolean back_from_crash;
     gboolean run;
     gchar* snapshot;
-    gchar* logfile;
     gboolean execute;
     gboolean help_execute;
     gboolean version;
@@ -1797,8 +1754,6 @@ main (int    argc,
        /* i18n: CLI: Close tabs, clear private data, open starting page */
        N_("Reset Midori after SECONDS seconds of inactivity"), N_("SECONDS") },
        #endif
-       { "log-file", 'l', 0, G_OPTION_ARG_FILENAME, &logfile,
-       N_("Redirects console warnings to the specified FILENAME"), N_("FILENAME")},
      { NULL }
     };
     GString* error_messages;
@@ -1838,7 +1793,6 @@ main (int    argc,
     diagnostic_dialog = FALSE;
     run = FALSE;
     snapshot = NULL;
-    logfile = NULL;
     execute = FALSE;
     help_execute = FALSE;
     version = FALSE;
@@ -1966,11 +1920,6 @@ main (int    argc,
         return 0;
     }
 
-    if (logfile)
-    {
-        g_log_set_default_handler (midori_log_to_file, (gpointer)logfile);
-    }
-
     if (plain)
     {
         GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);