* janis fake gconf patch added

3 files changed, 30 insertions, 1 deletions

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index bdbfc20f..bad5af88 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -28,7 +28,10 @@ pygtk.require('2.0')
 import gtk
 import gtk.gdk
 import gtk.glade
-import gconf
+try:
+	import gconf
+except:
+	import fakegconf as gconf
 import gobject
 import apt
 import apt_pkg
diff --git a/UpdateManager/fakegconf.py b/UpdateManager/fakegconf.py
new file mode 100644
index 00000000..fd465fa3
--- /dev/null
+++ b/UpdateManager/fakegconf.py
@@ -0,0 +1,24 @@
+# This is a class which contains stubs for the gconf methods
+# used in Update Manager. When gconf is unavailable it will
+# still work but not retain the user settings.
+
+class FakeGconf:
+
+	def get_bool(self, key):
+		return False 
+
+	def set_bool(self, key,value):
+		pass
+
+	def get_pair(self, key, ta = None, tb = None):
+		return [300,300] 
+		
+	def set_pair(self, key, ta, tb, a, b):
+		pass
+
+VALUE_INT = ""
+
+def client_get_default():
+	return  FakeGconf()
+
+
diff --git a/debian/changelog b/debian/changelog
index f5132e2e..6a05035c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ update-manager (0.42.2ubuntu10) dapper; urgency=low
   * correct dapper version number (#36136)
   * keybindings fixed (#36116)
   * calc the update before downloading the changelog (#36140)
+  * add a fake gconf interface for xubuntu (nop for normal ubuntu)
+    (Thanks to Jani Monoses for the patch)
   
  --