From c800ccbbf33893806ee6ef5ff9b19e3215148316 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@activitycentral.com>
Date: Tue, 25 Sep 2012 02:08:58 +0000
Subject: Merge branch 'UY' of git://git.sugarlabs.org/dextrose/mainline into UY

---
diff --git a/rpms/sugar/0146-sdxo-2361-Minor-fix-for-major-bug.patch b/rpms/sugar/0146-sdxo-2361-Minor-fix-for-major-bug.patch
new file mode 100644
index 0000000..ac69860
--- /dev/null
+++ b/rpms/sugar/0146-sdxo-2361-Minor-fix-for-major-bug.patch
@@ -0,0 +1,31 @@
+From 69edc342a56d8cbceda66baf9cdf35188e2aa58e Mon Sep 17 00:00:00 2001
+From: Ajay Garg <ajay@activitycentral.com>
+Date: Sat, 22 Sep 2012 17:13:25 +0530
+Subject: [PATCH] sdxo#2361: Minor fix, for major bug :)
+Organization: Sugar Labs Foundation
+Signed-off-by: Ajay Garg <ajay@activitycentral.com>
+---
+ src/jarabe/journal/model.py |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/jarabe/journal/model.py b/src/jarabe/journal/model.py
+index e0c0620..0192541 100644
+--- a/src/jarabe/journal/model.py
++++ b/src/jarabe/journal/model.py
+@@ -73,11 +73,11 @@ SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME_PATH = \
+         '/desktop/sugar/network/school_server_ip_address_or_dns_name'
+ 
+ client = gconf.client_get_default()
+-SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME = client.get_string(SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME_PATH)
++SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME = client.get_string(SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME_PATH) or ''
+ 
+ 
+ def is_school_server_present():
+-    return not (SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME is None)
++    return not (SCHOOL_SERVER_IP_ADDRESS_OR_DNS_NAME is '')
+ 
+ 
+ def _get_mount_point(path):
+-- 
+1.7.4.4
+
--
cgit v0.9.1