[gnome-todo/gnome-3-26] Revert "Merge branch 'wip/sadiq' into 'master'"
- From: Gitlab Administrative User <gitlab src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-todo/gnome-3-26] Revert "Merge branch 'wip/sadiq' into 'master'"
- Date: Thu, 26 Oct 2017 14:33:30 +0000 (UTC)
commit b81fdd81b32b410bb0e1e44867a753cf0160424a
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Thu Oct 26 12:32:48 2017 -0200
Revert "Merge branch 'wip/sadiq' into 'master'"
This reverts commit 00745268e1cb767941c2e84e4f81e39809b94e04.
src/gtd-application.c | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
---
diff --git a/src/gtd-application.c b/src/gtd-application.c
index 4b0c779..4e57cbc 100644
--- a/src/gtd-application.c
+++ b/src/gtd-application.c
@@ -72,10 +72,6 @@ static void gtd_application_quit (GSimpleAction
G_DEFINE_TYPE_WITH_PRIVATE (GtdApplication, gtd_application, GTK_TYPE_APPLICATION)
-static GOptionEntry cmd_options[] = {
- { "quit", 'q', 0, G_OPTION_ARG_NONE, NULL, N_("Quit GNOME ToDo"), NULL }
-};
-
static const GActionEntry gtd_application_entries[] = {
{ "activate", gtd_application_activate_action },
{ "start-client", gtd_application_start_client },
@@ -183,7 +179,7 @@ gtd_application_new (void)
return g_object_new (GTD_TYPE_APPLICATION,
"application-id", "org.gnome.Todo",
- "flags", G_APPLICATION_HANDLES_COMMAND_LINE,
+ "flags", G_APPLICATION_FLAGS_NONE,
"resource-base-path", "/org/gnome/todo",
NULL);
}
@@ -306,25 +302,6 @@ gtd_application_startup (GApplication *application)
gtd_manager_load_plugins (priv->manager);
}
-static gint
-gtd_application_command_line (GApplication *app,
- GApplicationCommandLine *command_line)
-{
- GVariantDict *options;
-
- options = g_application_command_line_get_options_dict (command_line);
-
- if (g_variant_dict_contains (options, "quit"))
- {
- g_application_quit (app);
- return 0;
- }
-
- g_application_activate (app);
-
- return 0;
-}
-
static gboolean
gtd_application_local_command_line (GApplication *application,
gchar ***arguments,
@@ -347,7 +324,6 @@ gtd_application_class_init (GtdApplicationClass *klass)
application_class->activate = gtd_application_activate;
application_class->startup = gtd_application_startup;
- application_class->command_line = gtd_application_command_line;
application_class->local_command_line = gtd_application_local_command_line;
}
@@ -357,8 +333,6 @@ gtd_application_init (GtdApplication *self)
GtdApplicationPrivate *priv = gtd_application_get_instance_private (self);
self->priv = priv;
-
- g_application_add_main_option_entries (G_APPLICATION (self), cmd_options);
}
GtdManager*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]