[geary: 2/3] Cleanup to meet source code conventions
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary: 2/3] Cleanup to meet source code conventions
- Date: Thu, 23 May 2019 12:49:36 +0000 (UTC)
commit 246bb3ce2a5728fc47c17e4ac7ccaf941f7c220f
Author: Jiří Černý <ji cerny gmail com>
Date: Thu May 23 07:58:11 2019 +0200
Cleanup to meet source code conventions
src/client/application/geary-application.vala | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
index 64b616f1..de2ef1f3 100644
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@ -262,6 +262,7 @@ public class GearyApplication : Gtk.Application {
private bool is_destroyed = false;
private GLib.Cancellable controller_cancellable = new GLib.Cancellable();
private Components.Inspector? inspector = null;
+ private Geary.Nonblocking.Mutex controler_mutex = new Geary.Nonblocking.Mutex();
/**
@@ -694,8 +695,6 @@ public class GearyApplication : Gtk.Application {
this.controller.main_window.present();
}
- private Geary.Nonblocking.Mutex controler_mutex = new Geary.Nonblocking.Mutex();
-
// Opens the controller
private async void create_controller() {
// Manually keep the main loop around for the duration of this
@@ -704,7 +703,7 @@ public class GearyApplication : Gtk.Application {
hold();
try {
- int mutex_token = yield controler_mutex.claim_async();
+ int mutex_token = yield this.controler_mutex.claim_async();
if (this.controller == null) {
message(
"%s %s (%s) prefix=%s exec_dir=%s is_installed=%s",
@@ -720,10 +719,9 @@ public class GearyApplication : Gtk.Application {
this, this.controller_cancellable
);
}
-
- controler_mutex.release(ref mutex_token);
+ this.controler_mutex.release(ref mutex_token);
} catch (Error err) {
- debug("Error creating controller: %s", err.message);
+ error("Error creating controller: %s", err.message);
}
release();
@@ -735,14 +733,14 @@ public class GearyApplication : Gtk.Application {
hold();
try {
- int mutex_token = yield controler_mutex.claim_async();
+ int mutex_token = yield this.controler_mutex.claim_async();
if (this.controller != null) {
yield this.controller.close_async();
this.controller = null;
}
- controler_mutex.release(ref mutex_token);
+ this.controler_mutex.release(ref mutex_token);
} catch (Error err) {
- debug("Error creating controller: %s", err.message);
+ debug("Error destroying controller: %s", err.message);
}
release();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]