- added startup desktop file for fusion-desktop-effects

- make setup.py better
- added --replace when launching compiz fusion

3 files changed, 31 insertions, 18 deletions

diff --git a/fusion-desktop-effects.desktop b/fusion-desktop-effects.desktop
new file mode 100644
index 0000000..a22bb81
--- /dev/null
+++ b/fusion-desktop-effects.desktop
@@ -0,0 +1,12 @@
+
+[Desktop Entry]
+Encoding=UTF-8
+Name=Compiz Fusion
+Exec=fusion-desktop-effects
+Icon=desktop-effects
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Settings;DesktopSettings;
+OnlyShowIn=GNOME;
+X-Desktop-File-Install-Version=0.15
diff --git a/fusion-desktop-effects.in b/fusion-desktop-effects.in
index 4a31d56..12648da 100755
--- a/fusion-desktop-effects.in
+++ b/fusion-desktop-effects.in
@@ -67,7 +67,7 @@ class MainWindow:
 
       def on_toggle(self,widget):
           if widget.get_active():
-             process = subprocess.Popen([COMPIZ_LAUNCHER])
+             process = subprocess.Popen([COMPIZ_LAUNCHER,'--replace'])
              procpoll = None
              for i in range(0,5):
                  time.sleep(1)
diff --git a/setup.py b/setup.py
index 66320e7..4de368e 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import sys, getopt
+import sys
 from distutils.core import setup
 from distutils.command.build import build as _build
 
@@ -9,27 +9,28 @@ pyscripts = ["fusion-desktop-effects"]
 scripts = ["compiz-fusion-gtk"]
 
 
-def getindex(l,var):
+def simple_getopt(l,var):
     idx = 0
     for i in l:
+        v = "%s=" % var
+        if v in i:
+           return (var,i.replace(v,''),idx)
         if i == var:
-           return idx
-        else: 
+           return (var,l[idx+1],idx)
+        else:
            idx += 1
-    return 0
+    return (None,None,idx)
 
 if len(sys.argv) > 2:
-   (opts,args) = getopt.getopt(sys.argv[2:],"","prefix=")
-   for o,v in opts:
-       if o == "--prefix":
-          prefix = v
-          if sys.argv[1] == "build":
-             if "%s=%s" % (o,v) in sys.argv:
-                sys.argv.remove("%s=%s" % (o,v))
-             else:
-                i = getindex(sys.argv,o)
-                sys.argv.pop(i)
-                sys.argv.pop(i)
+   o,v,i = simple_getopt(sys.argv,'--prefix')
+   if v:
+      prefix = v
+      if sys.argv[1] == "build":
+         if "%s=%s" % (o,v) in sys.argv:
+            sys.argv.remove("%s=%s" % (o,v))
+         else:
+            sys.argv.pop(i)
+            sys.argv.pop(i)
 
 datadir="%s/share/fusion-desktop-effects/" % prefix
 
@@ -56,7 +57,7 @@ setup (
         license          = "GPL",
         data_files       = [
                             (datadir,['images/cf_logo.png']),
-                            ('%s/share/applications' % prefix, ['compiz-fusion-gtk.desktop'])
+                            ('%s/share/applications' % prefix, ['compiz-fusion-gtk.desktop','fusion-desktop-effects.desktop'])
                            ],
         packages         = [],
         scripts          = scripts + pyscripts,