[totem] main: Remove debug option



commit a05fe460313ff91cb048ae50a323b4c79a3b37c9
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Oct 20 12:27:32 2014 +0200

    main: Remove debug option
    
    Using G_MESSAGES_DEBUG=... or GStreamer's logging facilities yields
    better results.

 README                                 |    8 ++------
 data/org.gnome.totem.gschema.xml.in.in |    4 ----
 src/totem-options.c                    |    3 ---
 src/totem-options.h                    |    1 -
 src/totem.c                            |   20 --------------------
 5 files changed, 2 insertions(+), 34 deletions(-)
---
diff --git a/README b/README
index 36db561..0bdf806 100644
--- a/README
+++ b/README
@@ -103,12 +103,8 @@ BUGS
 Bugs should be filed in GNOME's Bugzilla:
 http://bugzilla.gnome.org/enter_bug.cgi?product=totem
 
-To get a better debug output, run:
-# totem --debug
-
-Or for the stand-alone applications:
-# gsettings set org.gnome.totem debug true
-then run your application and capture its output
+To get a better debug output, follow the instructions at:
+https://wiki.gnome.org/Apps/Videos/BugReporting
 
 Contact
 =======
diff --git a/data/org.gnome.totem.gschema.xml.in.in b/data/org.gnome.totem.gschema.xml.in.in
index 70ed971..dc48ee6 100644
--- a/data/org.gnome.totem.gschema.xml.in.in
+++ b/data/org.gnome.totem.gschema.xml.in.in
@@ -25,10 +25,6 @@
                        <default>false</default>
                        <_summary>Whether to disable deinterlacing for interlaced movies</_summary>
                </key>
-               <key name="debug" type="b">
-                       <default>false</default>
-                       <_summary>Whether to enable debug for the playback engine</_summary>
-               </key>
                <key name="audio-output-type" enum="org.gnome.totem.BvwAudioOutputType">
                        <default>'stereo'</default>
                        <_summary>Type of audio output to use</_summary>
diff --git a/src/totem-options.c b/src/totem-options.c
index 71cb305..e51de7d 100644
--- a/src/totem-options.c
+++ b/src/totem-options.c
@@ -46,7 +46,6 @@ option_version_cb (const gchar *option_name,
 }
 
 const GOptionEntry all_options[] = {
-       {"debug", '\0', 0, G_OPTION_ARG_NONE, &optionstate.debug, N_("Enable debug"), NULL},
        {"play-pause", '\0', 0, G_OPTION_ARG_NONE, &optionstate.playpause, N_("Play/Pause"), NULL},
        {"play", '\0', 0, G_OPTION_ARG_NONE, &optionstate.play, N_("Play"), NULL},
        {"pause", '\0', 0, G_OPTION_ARG_NONE, &optionstate.pause, N_("Pause"), NULL},
@@ -97,8 +96,6 @@ totem_options_process_early (Totem *totem, const TotemCmdLineOptions* options)
                gdk_notify_startup_complete ();
                exit (0);
        }
-
-       g_settings_set_boolean (totem->settings, "debug", options->debug);
 }
 
 void
diff --git a/src/totem-options.h b/src/totem-options.h
index f0a4fd7..4a7c8f9 100644
--- a/src/totem-options.h
+++ b/src/totem-options.h
@@ -31,7 +31,6 @@ G_BEGIN_DECLS
 
 /* Stores the state of the command line options */
 typedef struct {
-       gboolean debug;
        gboolean playpause;
        gboolean play;
        gboolean pause;
diff --git a/src/totem.c b/src/totem.c
index 6c3de0e..db8bd52 100644
--- a/src/totem.c
+++ b/src/totem.c
@@ -51,23 +51,6 @@
 
 static gboolean startup_called = FALSE;
 
-/* Debug log message handler: discards debug messages unless Totem is run with TOTEM_DEBUG=1.
- * If we're building in the source tree, enable debug messages by default. */
-static void
-debug_handler (const char *log_domain,
-               GLogLevelFlags log_level,
-               const char *message,
-               GSettings *settings)
-{
-       static int debug = -1;
-
-       if (debug < 0)
-               debug = g_settings_get_boolean (settings, "debug");
-
-       if (debug)
-               g_log_default_handler (log_domain, log_level, message, NULL);
-}
-
 static void
 app_init (Totem *totem, char **argv)
 {
@@ -79,9 +62,6 @@ app_init (Totem *totem, char **argv)
        gtk_settings = gtk_settings_get_default ();
        g_object_set (G_OBJECT (gtk_settings), "gtk-application-prefer-dark-theme", TRUE, NULL);
 
-       /* Debug log handling */
-       g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, (GLogFunc) debug_handler, totem->settings);
-
        /* Main window */
        totem->xml = totem_interface_load ("totem.ui", TRUE, NULL, totem);
        if (totem->xml == NULL)


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