From ce18ed4214192676081bf6d0fe6b0e0f1e81e3f9 Mon Sep 17 00:00:00 2001
From: Swapnil Gupta <500swapnil@github.com>
Date: Wed, 7 Dec 2016 15:36:50 +0530
Subject: [PATCH] Error when initializing modules fixed

---
 plinth/modules/deluge/__init__.py       | 4 ++--
 plinth/modules/ikiwiki/__init__.py      | 4 ++--
 plinth/modules/minetest/__init__.py     | 4 ++--
 plinth/modules/mumble/__init__.py       | 4 ++--
 plinth/modules/privoxy/__init__.py      | 4 ++--
 plinth/modules/quassel/__init__.py      | 4 ++--
 plinth/modules/radicale/__init__.py     | 4 ++--
 plinth/modules/repro/__init__.py        | 4 ++--
 plinth/modules/roundcube/__init__.py    | 4 ++--
 plinth/modules/shaarli/__init__.py      | 4 ++--
 plinth/modules/transmission/__init__.py | 4 ++--
 plinth/modules/ttrss/__init__.py        | 4 ++--
 plinth/modules/xmpp/__init__.py         | 6 ++----
 13 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/plinth/modules/deluge/__init__.py b/plinth/modules/deluge/__init__.py
index 8caa9ee5c..75c5ae7fa 100644
--- a/plinth/modules/deluge/__init__.py
+++ b/plinth/modules/deluge/__init__.py
@@ -63,8 +63,8 @@ def init():
             is_external=True, is_enabled=is_enabled, enable=enable,
             disable=disable)
 
-    if is_enabled():
-        add_shortcut()
+        if is_enabled():
+            add_shortcut()
 
 
 def setup(helper, old_version=None):
diff --git a/plinth/modules/ikiwiki/__init__.py b/plinth/modules/ikiwiki/__init__.py
index 0e9d516d2..6e61d3475 100644
--- a/plinth/modules/ikiwiki/__init__.py
+++ b/plinth/modules/ikiwiki/__init__.py
@@ -61,8 +61,8 @@ def init():
             'ikiwiki', title, ports=['http', 'https'], is_external=True,
             is_enabled=is_enabled, enable=enable, disable=disable)
 
-    if is_enabled():
-        add_shortcuts()
+        if is_enabled():
+            add_shortcuts()
 
 
 def setup(helper, old_version=None):
diff --git a/plinth/modules/minetest/__init__.py b/plinth/modules/minetest/__init__.py
index 1643a275f..c638d6321 100644
--- a/plinth/modules/minetest/__init__.py
+++ b/plinth/modules/minetest/__init__.py
@@ -71,8 +71,8 @@ def init():
             ports=['minetest-plinth'], is_external=True, enable=enable,
             disable=disable)
 
-    if service.is_enabled():
-        add_shortcut()
+        if service.is_enabled():
+            add_shortcut()
 
 
 def setup(helper, old_version=None):
diff --git a/plinth/modules/mumble/__init__.py b/plinth/modules/mumble/__init__.py
index f63c7088c..ac2f4d37b 100644
--- a/plinth/modules/mumble/__init__.py
+++ b/plinth/modules/mumble/__init__.py
@@ -65,8 +65,8 @@ def init():
             is_external=True,
             enable=enable, disable=disable)
 
-    if service.is_enabled():
-        add_shortcut()
+        if service.is_enabled():
+            add_shortcut()
 
 
 class MumbleServiceView(ServiceView):
diff --git a/plinth/modules/privoxy/__init__.py b/plinth/modules/privoxy/__init__.py
index e86c88377..eeed7ded7 100644
--- a/plinth/modules/privoxy/__init__.py
+++ b/plinth/modules/privoxy/__init__.py
@@ -75,8 +75,8 @@ def init():
             is_external=False,
             enable=enable, disable=disable)
 
-    if service.is_enabled():
-        add_shortcut()
+        if service.is_enabled():
+            add_shortcut()
 
 
 def setup(helper, old_version=None):
diff --git a/plinth/modules/quassel/__init__.py b/plinth/modules/quassel/__init__.py
index 086766ad5..0546cd398 100644
--- a/plinth/modules/quassel/__init__.py
+++ b/plinth/modules/quassel/__init__.py
@@ -72,8 +72,8 @@ def init():
             managed_services[0], title, ports=['quassel-plinth'],
             is_external=True, enable=enable, disable=disable)
 
-    if service.is_enabled():
-        add_shortcut()
+        if service.is_enabled():
+            add_shortcut()
 
 
 class QuasselServiceView(ServiceView):
diff --git a/plinth/modules/radicale/__init__.py b/plinth/modules/radicale/__init__.py
index 5f3a0733b..516cd7896 100644
--- a/plinth/modules/radicale/__init__.py
+++ b/plinth/modules/radicale/__init__.py
@@ -68,8 +68,8 @@ def init():
             is_external=True,
             enable=enable, disable=disable)
 
-    if service.is_enabled():
-        add_shortcut()
+        if service.is_enabled():
+            add_shortcut()
 
 
 def setup(helper, old_version=None):
diff --git a/plinth/modules/repro/__init__.py b/plinth/modules/repro/__init__.py
index 95d6c1882..c43064031 100644
--- a/plinth/modules/repro/__init__.py
+++ b/plinth/modules/repro/__init__.py
@@ -76,8 +76,8 @@ def init():
             ports=['sip', 'sips', 'rtp-plinth'],
             is_external=True, enable=enable, disable=disable)
 
-    if service.is_enabled():
-        add_shortcut()
+        if service.is_enabled():
+            add_shortcut()
 
 
 class ReproServiceView(ServiceView):
diff --git a/plinth/modules/roundcube/__init__.py b/plinth/modules/roundcube/__init__.py
index 6e225af85..c806df26c 100644
--- a/plinth/modules/roundcube/__init__.py
+++ b/plinth/modules/roundcube/__init__.py
@@ -73,8 +73,8 @@ def init():
             'roundcube', title, ports=['http', 'https'], is_external=True,
             is_enabled=is_enabled, enable=enable, disable=disable)
 
-    if is_enabled():
-        add_shortcut()
+        if is_enabled():
+            add_shortcut()
 
 
 def setup(helper, old_version=None):
diff --git a/plinth/modules/shaarli/__init__.py b/plinth/modules/shaarli/__init__.py
index d6171b407..dd19f6f11 100644
--- a/plinth/modules/shaarli/__init__.py
+++ b/plinth/modules/shaarli/__init__.py
@@ -60,8 +60,8 @@ def init():
             'shaarli', title, ports=['http', 'https'], is_external=True,
             is_enabled=is_enabled, enable=enable, disable=disable)
 
-    if is_enabled():
-        add_shortcut()
+        if is_enabled():
+            add_shortcut()
 
 
 def setup(helper, old_version=None):
diff --git a/plinth/modules/transmission/__init__.py b/plinth/modules/transmission/__init__.py
index d46215a20..6ceb695b8 100644
--- a/plinth/modules/transmission/__init__.py
+++ b/plinth/modules/transmission/__init__.py
@@ -62,8 +62,8 @@ def init():
             is_external=True, is_enabled=is_enabled,
             enable=enable, disable=disable)
 
-    if is_enabled():
-        add_shortcut()
+        if is_enabled():
+            add_shortcut()
 
 
 def setup(helper, old_version=None):
diff --git a/plinth/modules/ttrss/__init__.py b/plinth/modules/ttrss/__init__.py
index 25b63b7eb..2c16e4ee4 100644
--- a/plinth/modules/ttrss/__init__.py
+++ b/plinth/modules/ttrss/__init__.py
@@ -63,8 +63,8 @@ def init():
             is_external=True,
             is_enabled=is_enabled, enable=enable, disable=disable)
 
-    if is_enabled():
-        add_shortcut()
+        if is_enabled():
+            add_shortcut()
 
 
 def setup(helper, old_version=None):
diff --git a/plinth/modules/xmpp/__init__.py b/plinth/modules/xmpp/__init__.py
index 410234cfe..5c94d3d00 100644
--- a/plinth/modules/xmpp/__init__.py
+++ b/plinth/modules/xmpp/__init__.py
@@ -70,14 +70,12 @@ def init():
             ports=['xmpp-client', 'xmpp-server', 'xmpp-bosh'],
             is_external=True, is_enabled=is_enabled, enable=enable,
             disable=disable)
-
+        if is_enabled():
+            add_shortcut()
     pre_hostname_change.connect(on_pre_hostname_change)
     post_hostname_change.connect(on_post_hostname_change)
     domainname_change.connect(on_domainname_change)
 
-    if is_enabled():
-        add_shortcut()
-
 
 def setup(helper, old_version=None):
     """Install and configure the module."""