[tracker: 29/30] extract: Remove --disable-shutdown argument



commit 1bde38f9f5008a994afc2a450bbbfeefc7ca2dbb
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Jan 21 12:34:50 2014 +0100

    extract: Remove --disable-shutdown argument
    
    With tracker-extract being now a TrackerMiner (and hence long-lived),
    this argument does now nothing, so remove all traces of it.

 docs/manpages/tracker-extract.1    |    3 ---
 src/tracker-extract/tracker-main.c |   10 +---------
 2 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/docs/manpages/tracker-extract.1 b/docs/manpages/tracker-extract.1
index e9a7b3c..7480011 100644
--- a/docs/manpages/tracker-extract.1
+++ b/docs/manpages/tracker-extract.1
@@ -33,9 +33,6 @@ be either a local path or a URI. It also does not have to be an absolute path.
 The \fIMIME\fR type to use for the file. If one is not provided, it
 will be guessed automatically.
 .TP
-.B \-d, \-\-disable-shutdown
-Disable shutting down after 30 seconds of inactivity.
-.TP
 .B \-i, \-\-force-internal-extractors
 Use this option to force internal extractors over 3rd parties like
 libstreamanalyzer.
diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c
index d5ddc9e..ac7bd32 100644
--- a/src/tracker-extract/tracker-main.c
+++ b/src/tracker-extract/tracker-main.c
@@ -74,7 +74,6 @@ static GMainLoop *main_loop;
 static gint verbosity = -1;
 static gchar *filename;
 static gchar *mime_type;
-static gboolean disable_shutdown;
 static gboolean force_internal_extractors;
 static gchar *force_module;
 static gboolean version;
@@ -95,12 +94,6 @@ static GOptionEntry entries[] = {
          G_OPTION_ARG_STRING, &mime_type,
          N_("MIME type for file (if not provided, this will be guessed)"),
          N_("MIME") },
-       /* Debug run is used to avoid that the mainloop exits, so that
-        * as a developer you can be relax when running the tool in gdb */
-       { "disable-shutdown", 'd', 0,
-         G_OPTION_ARG_NONE, &disable_shutdown,
-         N_("Disable shutting down after 30 seconds of inactivity"),
-         NULL },
        { "force-internal-extractors", 'i', 0,
          G_OPTION_ARG_NONE, &force_internal_extractors,
          N_("Force internal extractors over 3rd parties like libstreamanalyzer"),
@@ -183,7 +176,6 @@ signal_handler (int signo)
        case SIGTERM:
        case SIGINT:
                in_loop = TRUE;
-               disable_shutdown = FALSE;
                g_main_loop_quit (main_loop);
 
                /* Fall through */
@@ -287,7 +279,7 @@ run_standalone (TrackerConfig *config)
        file = g_file_new_for_commandline_arg (filename);
        uri = g_file_get_uri (file);
 
-       object = tracker_extract_new (disable_shutdown,
+       object = tracker_extract_new (TRUE,
                                      force_internal_extractors,
                                      force_module);
 


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