patches/gdesklets-02-session-manager-support.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 13120 35fed8639a76
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13120
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     1
--- gDesklets-0.36beta/main/client.py.orig	2007-11-22 11:30:36.753844000 +0800
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     2
+++ gDesklets-0.36beta/main/client.py	2007-11-22 11:31:18.018363000 +0800
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     3
@@ -264,7 +264,8 @@
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     4
 
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     5
     else:
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     6
         daemon_path = os.path.join(HOME, "gdesklets-daemon")
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     7
-        args = " ".join([ a for a in sys.argv if a.startswith("--") ])
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     8
+        args = " ".join([ a for a in sys.argv if a.endswith("translucent") | a.
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
     9
+endswith("no-tray-icon") | a.endswith("debug")])
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    10
         os.system("%s %s &" % (daemon_path, args))
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    11
 
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    12
         pos = 0
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    13
--- gDesklets-0.36beta/gdesklets.orig	2007-11-22 11:31:29.794530000 +0800
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    14
+++ gDesklets-0.36beta/gdesklets	2007-11-22 11:33:41.090780000 +0800
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    15
@@ -218,13 +218,19 @@
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    16
 
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    17
             try:
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    18
                 index = self.__args.index("--sm-config-prefix")
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    19
-                del args[index:index+2]
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    20
+                del self.__args[index:index+2]
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    21
             except Exception:
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    22
                 pass
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    23
 
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    24
             try:
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    25
                 index = self.__args.index("--sm-client-id")
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    26
-                del args[index:index+2]
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    27
+                del self.__args[index:index+2]
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    28
+            except Exception:
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    29
+                pass
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    30
+
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    31
+            try:
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    32
+                index = self.__args.index("--screen")
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    33
+                del self.__args[index:index+2]
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    34
             except Exception:
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    35
                 pass
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    36
 
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    37
--- gDesklets-0.36beta/gdesklets-daemon.orig	2007-11-22 11:33:49.980607000 +0800
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    38
+++ gDesklets-0.36beta/gdesklets-daemon	2007-11-22 11:35:20.644388000 +0800
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    39
@@ -16,10 +16,12 @@
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    40
 import pygtk
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    41
 import sys
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    42
 import utils
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    43
+import gnome
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    44
+import gnome.ui
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    45
 
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    46
 
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    47
 
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    48
-
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    49
+VERSION="0.36"
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    50
 # setup GTK
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    51
 try:
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    52
     pygtk.require("2.0")
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    53
@@ -105,6 +107,7 @@
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    54
 
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    55
     # enter gtk's mainloop
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    56
     gtk.gdk.threads_enter()
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    57
+    gnome.init('gdesklets',VERSION)
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    58
     gtk.main()
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    59
     gtk.gdk.threads_leave()
35fed8639a76 2008-08-14 Wang Xin <[email protected]>
jedy
parents:
diff changeset
    60