From be27a8b548f01220f34c8f15dbc1973b110a790f Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Fri, 25 Jul 2014 11:13:23 -0300
Subject: Simplify and sort OS flags.

---
 src/leap/bitmask/platform_init/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/leap/bitmask/platform_init/__init__.py b/src/leap/bitmask/platform_init/__init__.py
index 2a262a30..a9a97af9 100644
--- a/src/leap/bitmask/platform_init/__init__.py
+++ b/src/leap/bitmask/platform_init/__init__.py
@@ -22,7 +22,7 @@ import platform
 
 _system = platform.system()
 
-IS_WIN = True if _system == "Windows" else False
-IS_MAC = True if _system == "Darwin" else False
-IS_LINUX = True if _system == "Linux" else False
+IS_LINUX = _system == "Linux"
+IS_MAC = _system == "Darwin"
 IS_UNIX = IS_MAC or IS_LINUX
+IS_WIN = _system == "Windows"
-- 
cgit v1.2.3


From 28553c41c3d879481923102a1b41ecd71641d0d8 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Fri, 25 Jul 2014 11:13:53 -0300
Subject: Add Linux autostart. Closes #4989.

---
 src/leap/bitmask/gui/mainwindow.py |  5 ++-
 src/leap/bitmask/util/autostart.py | 67 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 src/leap/bitmask/util/autostart.py

(limited to 'src')

diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 383f97bb..2f78fd14 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -58,7 +58,7 @@ from leap.bitmask.services.mail import conductor as mail_conductor
 
 from leap.bitmask.services import EIP_SERVICE, MX_SERVICE
 
-from leap.bitmask.util import make_address
+from leap.bitmask.util import autostart, make_address
 from leap.bitmask.util.keyring_helpers import has_keyring
 from leap.bitmask.logs.leap_log_handler import LeapLogHandler
 
@@ -108,6 +108,7 @@ class MainWindow(QtGui.QMainWindow):
         :type start_hidden: bool
         """
         QtGui.QMainWindow.__init__(self)
+        autostart.set_autostart(True)
 
         # register leap events ########################################
         register(signal=proto.UPDATER_NEW_UPDATES,
@@ -1797,6 +1798,8 @@ class MainWindow(QtGui.QMainWindow):
         if self._quitting:
             return
 
+        autostart.set_autostart(False)
+
         self._quitting = True
 
         # first thing to do quitting, hide the mainwindow and show tooltip.
diff --git a/src/leap/bitmask/util/autostart.py b/src/leap/bitmask/util/autostart.py
new file mode 100644
index 00000000..b8ac02b1
--- /dev/null
+++ b/src/leap/bitmask/util/autostart.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+# autostart.py
+# Copyright (C) 2013, 2014 LEAP
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+Helpers to enable/disable bitmask's autostart.
+"""
+import flags
+import logging
+import os
+
+from leap.bitmask.platform_init import IS_LINUX
+
+logger = logging.getLogger(__name__)
+
+
+DESKTOP_ENTRY = """\
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=Bitmask
+Comment=Secure Communication
+Exec=bitmask --start-hidden
+Terminal=false
+Icon=bitmask
+"""
+
+DESKTOP_ENTRY_PATH = os.path.expanduser("~/.config/autostart/bitmask.desktop")
+
+
+def set_autostart(enabled):
+    """
+    Set the autostart mode to enabled or disabled depending on the parameter.
+    If `enabled` is `True`, save the autostart file to its place. Otherwise,
+    remove that file.
+    Right now we support only Linux autostart.
+
+    :param enabled: whether the autostart should be enabled or not.
+    :type enabled: bool
+    """
+    # we don't do autostart for bundle or systems different than Linux
+    if flags.STANDALONE or not IS_LINUX:
+        return
+
+    if enabled:
+        with open(DESKTOP_ENTRY_PATH, 'w') as f:
+            f.write(DESKTOP_ENTRY)
+    else:
+        try:
+            os.remove(DESKTOP_ENTRY_PATH)
+        except OSError:  # if the file does not exist
+            pass
+        except Exception as e:
+            logger.error("Problem disabling autostart, {0!r}".format(e))
-- 
cgit v1.2.3