From 2e96d75364aeaa28e8bc5b7780e055a2e3360956 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Mon, 11 Feb 2008 09:43:31 -0500
Subject: missing >/dev/null for a which statement

---
 data/autostart.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/autostart.sh b/data/autostart.sh
index ab542841..83e8431e 100644
--- a/data/autostart.sh
+++ b/data/autostart.sh
@@ -34,6 +34,6 @@ fi
 # Run XDG autostart things.  By default don't run anything desktop-specific
 # See xdg-autostart --help more info
 DESKTOP_ENV=""
-if which xdg-autostart; then
+if which xdg-autostart >/dev/null; then
   xdg-autostart $DESKTOP_ENV
 fi
-- 
cgit v1.2.3


From a161f4e812b2cc0428eef560feb0b71fc8068ffb Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Mon, 11 Feb 2008 13:30:40 -0500
Subject: apparently gnome has hidden gnome-settings-daemon in libexec, so put
 that in the autostart.sh

---
 data/autostart.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/autostart.sh b/data/autostart.sh
index 83e8431e..53063262 100644
--- a/data/autostart.sh
+++ b/data/autostart.sh
@@ -22,7 +22,9 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
 fi
 
 # Make GTK apps look and behave how they were set up in the gnome config tools
-if which gnome-settings-daemon >/dev/null; then
+if which /usr/libexec/gnome-settings-daemon >/dev/null; then
+  /usr/libexec/gnome-settings-daemon &
+elif which gnome-settings-daemon >/dev/null; then
   gnome-settings-daemon &
 fi
 
-- 
cgit v1.2.3


From 27177e498b737cc351ce446f0b89010bcf29bfcd Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Wed, 13 Feb 2008 20:53:25 -0500
Subject: let you match per-app settings based on the window type

---
 data/rc.xml |  7 ++++++-
 data/rc.xsd | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/rc.xml b/data/rc.xml
index 98daf274..ebe2f310 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -642,7 +642,9 @@
 
   <application name="first element of window's WM_CLASS property (see xprop)"
               class="second element of window's WM_CLASS property (see xprop)"
-               role="the window's WM_WINDOW_ROLE property (see xprop)">
+               role="the window's WM_WINDOW_ROLE property (see xprop)"
+               type="the window's _NET_WM_WINDOW_TYPE (if unspecified, then
+                       it is dialog for child windows)">
   # the name or the class can be set, or both. this is used to match
   # windows when they appear. role can optionally be set as well, to
   # further restrict your matches.
@@ -651,6 +653,9 @@
   # used by a shell. you can use * to match any characters and ? to match
   # any single character.
 
+  # the type is one of: normal, dialog, splash, utility, menu, toolbar, dock,
+  #    or desktop
+
   # when multiple rules match a window, they will all be applied, in the
   # order that they appear in this list
 
diff --git a/data/rc.xsd b/data/rc.xsd
index 47eeed12..de227ea1 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -189,10 +189,11 @@
         <xsd:element minOccurs="0" name="skip_taskbar" type="ob:bool"/>
         <xsd:element minOccurs="0" name="fullscreen" type="ob:bool"/>
         <xsd:element minOccurs="0" name="maximized" type="ob:maximization"/>
+        <xsd:attribute name="role" type="xsd:string"/>
+        <xsd:attribute name="type" type="ob:clienttype"/>
         <!-- at least one of these must be present -->
         <xsd:attribute name="name" type="xsd:string"/>
         <xsd:attribute name="class" type="xsd:string"/>
-        <xsd:attribute name="role" type="xsd:string"/>
     </xsd:complexType>
     <xsd:complexType name="applications">
         <xsd:element minOccurs="0" maxOccurs="unbounded" name="application" type="ob:application"/>
@@ -252,6 +253,18 @@
             <xsd:enumeration value="Unshade"/>
         </xsd:restriction>
     </xsd:simpleType>
+    <xsd:simpleType name="clienttype">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="desktop"/>
+            <xsd:enumeration value="dock"/>
+            <xsd:enumeration value="toolbar"/>
+            <xsd:enumeration value="menu"/>
+            <xsd:enumeration value="splash"/>
+            <xsd:enumeration value="utility"/>
+            <xsd:enumeration value="dialog"/>
+            <xsd:enumeration value="normal"/>
+        </xsd:restriction>
+    </xsd:simpleType>
     <xsd:simpleType name="bool">
         <!-- this is copied to maximization.  Keep that in sync. -->
         <xsd:restriction base="xsd:string">
-- 
cgit v1.2.3