Update the check empty cursor theme patch

1 files changed, 23 insertions, 30 deletions

diff --git a/rpms/sugar/sugar-check-for-empty-cursor_theme.patch b/rpms/sugar/sugar-check-for-empty-cursor_theme.patch
index a1180db..f06d072 100644
--- a/rpms/sugar/sugar-check-for-empty-cursor_theme.patch
+++ b/rpms/sugar/sugar-check-for-empty-cursor_theme.patch
@@ -1,52 +1,45 @@
-From patchwork Wed Mar  9 16:15:10 2011
+From patchwork Mon Mar 14 16:20:04 2011
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 Subject: [sugar] check for empty cursor_theme
-Date: Wed, 09 Mar 2011 21:15:10 -0000
+Date: Mon, 14 Mar 2011 21:20:04 -0000
 From: Martin Abente <martin.abente.lahaye@gmail.com>
-X-Patchwork-Id: 714
-Message-Id: <1299687310-2855-1-git-send-email-martin.abente.lahaye@gmail.com>
+X-Patchwork-Id: 718
+Message-Id: <1300119604-10446-1-git-send-email-martin.abente.lahaye@gmail.com>
 To: dextrose@lists.sugarlabs.org,
 	anish@sugarlabs.org
 
 In dextrose2 caacupe tests we noticed that many laptops
-had the standard x cursor theme instead of the sugar one.
-Apparently this bug was also present on dextrose1 builds.
+had the standard x cursor instead of the sugar one.
 
-An interesting finding while looking at this report was
-that the accesibility code for changing cursor it simply
-does not affect the cursor at all, and the real change is
-being done at bin/sugar.
+Accessibility options include other gconf values at
+the "/desktop/sugar/peripherals/mouse" path, and 
+since the sugar script did not check for full path
+content or existence, this script failed to set the 
+mouse cursor. under these corner cases.
 
-I have not been able to determine when or how this
-empty value is being set (yet), but this patch will
-make sure it shows the sugar cursor theme whenever 
-it happens.
-
-Could this patch make sense for mainstream sugar also?
+Version 2: Add bernie's optimization
 
 ---
-bin/sugar.in |    8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
+bin/sugar.in |    7 ++-----
+ 1 files changed, 2 insertions(+), 5 deletions(-)
 
 diff --git a/bin/sugar.in b/bin/sugar.in
-index bd6e95e..73af03c 100644
+index bd6e95e..3615c70 100644
 --- a/bin/sugar.in
 +++ b/bin/sugar.in
-@@ -80,10 +80,12 @@ fi
+@@ -78,11 +78,8 @@ fi
+ 
+ 
  # Set cursor theme
- gconftool-2 --dir-exists=/desktop/sugar/peripherals/mouse
- EXIST_SUGAR_CURSOR_THEME=$(echo $?)
-+CURSOR_THEME="sugar"
- if [[ $EXIST_SUGAR_CURSOR_THEME == 0 ]]; then
+-gconftool-2 --dir-exists=/desktop/sugar/peripherals/mouse
+-EXIST_SUGAR_CURSOR_THEME=$(echo $?)
+-if [[ $EXIST_SUGAR_CURSOR_THEME == 0 ]]; then
 -    CURSOR_THEME=$(gconftool-2 --get /desktop/sugar/peripherals/mouse/cursor_theme);
 -else
--    CURSOR_THEME="sugar"
-+    STORED_CURSOR_THEME=$(gconftool-2 --get /desktop/sugar/peripherals/mouse/cursor_theme);
-+    if [[ $STORED_CURSOR_THEME != "" ]]; then
-+        CURSOR_THEME=$STORED_CURSOR_THEME
-+    fi
++CURSOR_THEME=$(gconftool-2 --get /desktop/sugar/peripherals/mouse/cursor_theme)
++if test -z "$CURSOR_THEME"; then
+     CURSOR_THEME="sugar"
  fi
  
-