[polari] app: Rearrange code
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] app: Rearrange code
- Date: Wed, 14 Aug 2019 19:05:30 +0000 (UTC)
commit a5d84ff772eb79a70e13cbccf28e9c1e8a489182
Author: Florian Müllner <fmuellner gnome org>
Date: Tue Aug 6 21:16:27 2019 +0000
app: Rearrange code
We want to avoid else blocks that contain a single if statement, as they
can be replaced with a more concise if-else; however here we want to stress
that the code we run when the network is valid or when it becomes valid is
identical. Achieve that while still avoiding a "lonely if" by swapping the
two blocks around.
https://gitlab.gnome.org/GNOME/polari/merge_requests/133
src/application.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/application.js b/src/application.js
index c241d8e..a45f97b 100644
--- a/src/application.js
+++ b/src/application.js
@@ -327,7 +327,10 @@ var Application = GObject.registerClass({
!Utils.isFlatpakSandbox() &&
GLib.getenv('GTK_USE_PORTAL') != '1';
- if (!networkMonitor.state_valid) {
+ if (networkMonitor.state_valid) {
+ if (!networkMonitor.network_metered)
+ this._serverRoomManager = ServerRoomManager.getDefault();
+ } else {
let id = networkMonitor.connect('network-changed', () => {
networkMonitor.disconnect(id);
networkMonitor.state_valid = true;
@@ -335,9 +338,6 @@ var Application = GObject.registerClass({
if (!networkMonitor.network_metered)
this._serverRoomManager = ServerRoomManager.getDefault();
});
- } else {
- if (!networkMonitor.network_metered)
- this._serverRoomManager = ServerRoomManager.getDefault();
}
this._accountsMonitor.connect('account-status-changed',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]