[totem] thumbnailer: Remove "fatal warnings" option



commit cdf8e4de1654bbb6509f6ff99b3abe1041ebcb8f
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jul 25 13:04:44 2017 +0200

    thumbnailer: Remove "fatal warnings" option
    
    G_DEBUG=fatal_warnings takes care of that.

 src/totem-gallery-thumbnailer.c |   10 ----------
 src/totem-video-thumbnailer.c   |   10 ----------
 2 files changed, 0 insertions(+), 20 deletions(-)
---
diff --git a/src/totem-gallery-thumbnailer.c b/src/totem-gallery-thumbnailer.c
index 8b9b3ce..c4eedcd 100644
--- a/src/totem-gallery-thumbnailer.c
+++ b/src/totem-gallery-thumbnailer.c
@@ -63,7 +63,6 @@
 
 static gboolean raw_output = FALSE;
 static int output_size = -1;
-static gboolean g_fatal_warnings = FALSE;
 static gint gallery = -1;
 static gint64 second_index = -1;
 static char **filenames = NULL;
@@ -858,7 +857,6 @@ static const GOptionEntry entries[] = {
        { "size", 's', 0, G_OPTION_ARG_INT, &output_size, "Size of the thumbnail in pixels (with --gallery 
sets the size of individual screenshots)", NULL },
        { "raw", 'r', 0, G_OPTION_ARG_NONE, &raw_output, "Output the raw picture of the video without scaling 
or adding borders", NULL },
        { "time", 't', 0, G_OPTION_ARG_INT64, &second_index, "Choose this time (in seconds) as the thumbnail 
(can't be used with --gallery)", NULL },
-       { "g-fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &g_fatal_warnings, "Make all warnings fatal", NULL },
        { "gallery", 'g', 0, G_OPTION_ARG_INT, &gallery, "Output a gallery of the given number (0 is default) 
of screenshots (can't be used with --time)", NULL },
        { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, NULL, "[INPUT FILE] [OUTPUT 
FILE]" },
        { NULL }
@@ -892,14 +890,6 @@ int main (int argc, char *argv[])
        fcntl (fileno (stdout), F_SETFL, O_NONBLOCK);
        setbuf (stdout, NULL);
 
-       if (g_fatal_warnings) {
-               GLogLevelFlags fatal_mask;
-
-               fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
-               fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
-               g_log_set_always_fatal (fatal_mask);
-       }
-
        if (raw_output == FALSE && output_size == -1)
                output_size = DEFAULT_OUTPUT_SIZE;
 
diff --git a/src/totem-video-thumbnailer.c b/src/totem-video-thumbnailer.c
index a8dbb95..b244a11 100644
--- a/src/totem-video-thumbnailer.c
+++ b/src/totem-video-thumbnailer.c
@@ -73,7 +73,6 @@ static int output_size = -1;
 static gboolean time_limit = TRUE;
 static gboolean verbose = FALSE;
 static gboolean print_progress = FALSE;
-static gboolean g_fatal_warnings = FALSE;
 static gint gallery = -1;
 static gint64 second_index = -1;
 static char **filenames = NULL;
@@ -880,7 +879,6 @@ static const GOptionEntry entries[] = {
        { "no-limit", 'l', G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &time_limit, "Don't limit the 
thumbnailing time to 30 seconds", NULL },
        { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Output debug information", NULL },
        { "time", 't', 0, G_OPTION_ARG_INT64, &second_index, "Choose this time (in seconds) as the thumbnail 
(can't be used with --gallery)", NULL },
-       { "g-fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &g_fatal_warnings, "Make all warnings fatal", NULL },
        { "gallery", 'g', 0, G_OPTION_ARG_INT, &gallery, "Output a gallery of the given number (0 is default) 
of screenshots (can't be used with --time)", NULL },
        { "print-progress", 'p', 0, G_OPTION_ARG_NONE, &print_progress, "Only print progress updates (can't 
be used with --verbose)", NULL },
        { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, NULL, "[INPUT FILE] [OUTPUT 
FILE]" },
@@ -925,14 +923,6 @@ int main (int argc, char *argv[])
                setbuf (stdout, NULL);
        }
 
-       if (g_fatal_warnings) {
-               GLogLevelFlags fatal_mask;
-
-               fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
-               fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
-               g_log_set_always_fatal (fatal_mask);
-       }
-
        if (raw_output == FALSE && output_size == -1)
                output_size = DEFAULT_OUTPUT_SIZE;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]