[Xfce4-commits] <midori:master> Install a separate Private Browsing desktop file

[Christian Dywan]

Updating branch refs/heads/master
         to 54251cc36844d39ae0212d8e82273d74890ca749 (commit)
       from 6da6b133f59f2f21d079b01bbd8076e10c4c57ff (commit)

commit 54251cc36844d39ae0212d8e82273d74890ca749
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Sep 6 01:20:27 2011 +0200

    Install a separate Private Browsing desktop file
    
    This way private browsing can be added as a shortcut and
    typing in Synapse, Unity or GNOME Shell suggests it.

 data/midori-private.desktop.in |   13 +++++++++++++
 wscript                        |    9 +++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/data/midori-private.desktop.in b/data/midori-private.desktop.in
new file mode 100644
index 0000000..e307ba9
--- /dev/null
+++ b/data/midori-private.desktop.in
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+_Name=Private Browsing
+_Comment=Open a new private browsing window
+Categories=GTK;Network;WebBrowser;
+Exec=midori --private
+Icon=midori
+Terminal=false
+StartupNotify=true
+X-Osso-Type=application/x-executable
+X-Osso-Service=midori
+
diff --git a/wscript b/wscript
index 39d7388..e1d56df 100644
--- a/wscript
+++ b/wscript
@@ -412,7 +412,9 @@ def build (bld):
         bld.add_subdirs ('docs/api')
         bld.install_files ('${DOCDIR}/api/', blddir + '/docs/api/*')
 
-    if not is_mingw (bld.env) and Options.platform != 'win32':
+    for desktop in [APPNAME + '.desktop', APPNAME + '-private.desktop']:
+        if is_mingw (bld.env) or Options.platform == 'win32':
+            break
         if bld.env['HAVE_HILDON']:
             appdir = '${MDATADIR}/applications/hildon'
             bld.install_files ('${MDATADIR}/dbus-1/services',
@@ -421,14 +423,13 @@ def build (bld):
             appdir = '${MDATADIR}/applications'
         if bld.env['INTLTOOL']:
             obj = bld.new_task_gen ('intltool_in')
-            obj.source = 'data/' + APPNAME + '.desktop.in'
+            obj.source = 'data/' + desktop + '.in'
             obj.install_path = appdir
             obj.flags  = ['-d', '-c']
-            bld.install_files (appdir, 'data/' + APPNAME + '.desktop')
+            bld.install_files (appdir, 'data/' + desktop)
         else:
             folder = os.path.abspath (blddir + '/default/data')
             Utils.check_dir (folder)
-            desktop = APPNAME + '.desktop'
             pre = open ('data/' + desktop + '.in')
             after = open (folder + '/' + desktop, 'w')
             try: