summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2015-05-23 18:20:23 -0700
committerCosimo Cecchi <cosimoc@gnome.org>2015-05-24 12:21:09 -0700
commitf6a310a42a24fd87c72fc55bf435587ba0acaee5 (patch)
tree1e03d4a16a2892f6fbc6ae9c079ce59612578988
parent7daf923b9d867fa96bf1f9ee6c2a71e406cb1dab (diff)
downloadnautilus-f6a310a42a24fd87c72fc55bf435587ba0acaee5.tar.gz
application: don't call g_application_regisrer()
Calling it from the command-line implementation is an error, since we're guaranteed to be in the primary instance alreaady.
-rw-r--r--src/nautilus-application.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 6948a130f..57e7d84be 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -790,7 +790,6 @@ nautilus_application_command_line (GApplication *application,
NautilusApplication *self = NAUTILUS_APPLICATION (application);
gint retval = -1;
GVariantDict *options;
- GError *error = NULL;
nautilus_profile_start (NULL);
@@ -813,19 +812,6 @@ nautilus_application_command_line (GApplication *application,
goto out;
}
- g_application_register (application, NULL, &error);
-
- if (error != NULL) {
- /* Translators: this is a fatal error quit message printed on the
- * command line */
- g_application_command_line_printerr (command_line,
- "%s: %s\n", _("Could not register the application"), error->message);
- g_error_free (error);
-
- retval = EXIT_FAILURE;
- goto out;
- }
-
if (g_variant_dict_contains (options, "quit")) {
DEBUG ("Killing application, as requested");
g_action_group_activate_action (G_ACTION_GROUP (application),