[geary] Fix some console spew when invoked qith -q/--quit and app is not running.
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary] Fix some console spew when invoked qith -q/--quit and app is not running.
- Date: Sat, 24 Sep 2016 16:06:56 +0000 (UTC)
commit a5eee628afaa6c10b99ccf908ab2b4815526df04
Author: Michael James Gratton <mike vee net>
Date: Sun Sep 25 02:06:45 2016 +1000
Fix some console spew when invoked qith -q/--quit and app is not running.
Bug 730537
src/client/application/geary-application.vala | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
index e4869e7..451bea1 100644
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@ -124,6 +124,7 @@ public class GearyApplication : Gtk.Application {
}
if (!Args.quit) {
+ // Normal application startup or activation
activate();
foreach (unowned string arg in args) {
if (arg != null) {
@@ -134,7 +135,11 @@ public class GearyApplication : Gtk.Application {
}
}
} else {
- activate_action(ACTION_QUIT, null);
+ // User requested quit, only try to if we aren't running
+ // already.
+ if (this.is_remote) {
+ activate_action(ACTION_QUIT, null);
+ }
}
exit_status = 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]