diff -Nru glipper-2.3/debian/bzr-builder.manifest glipper-2.3/debian/bzr-builder.manifest
--- glipper-2.3/debian/bzr-builder.manifest	2012-05-11 15:58:53.000000000 +0000
+++ glipper-2.3/debian/bzr-builder.manifest	2012-08-11 22:18:24.000000000 +0000
@@ -1,2 +1,2 @@
-# bzr-builder format 0.3 deb-version {debupstream}-2~116
-lp:glipper revid:bzr@laszlopandy.com-20111204124952-o2izchezal5gh8bd
+# bzr-builder format 0.3 deb-version {debupstream}-2~119
+lp:glipper revid:laszlok2@gmail.com-20120811220748-e8yhhwwn6fig58fg
diff -Nru glipper-2.3/debian/changelog glipper-2.3/debian/changelog
--- glipper-2.3/debian/changelog	2012-05-11 15:58:53.000000000 +0000
+++ glipper-2.3/debian/changelog	2012-08-11 22:18:24.000000000 +0000
@@ -1,8 +1,8 @@
-glipper (2.3-2~116~precise1) precise; urgency=low
+glipper (2.3-2~119~precise1) precise; urgency=low
 
   * Auto build.
 
- -- Dr. Amr Osman <dr3mro@gmail.com>  Fri, 11 May 2012 15:58:53 +0000
+ -- Dr. Amr Osman <dr3mro@gmail.com>  Sat, 11 Aug 2012 22:18:24 +0000
 
 glipper (2.3-0ubuntu1) oneiric; urgency=low
 
diff -Nru glipper-2.3/glipper/AppIndicator.py glipper-2.3/glipper/AppIndicator.py
--- glipper-2.3/glipper/AppIndicator.py	2012-05-11 15:58:53.000000000 +0000
+++ glipper-2.3/glipper/AppIndicator.py	2012-08-11 22:18:24.000000000 +0000
@@ -62,6 +62,7 @@
 		
 	def on_clear(self, menuitem):
 		get_glipper_history().clear()
+		get_glipper_clipboards().clear_text()
 	
 	def update_menu(self, history):
 		plugins_menu_items = get_glipper_plugins_manager().get_menu_items()
diff -Nru glipper-2.3/glipper/Clipboards.py glipper-2.3/glipper/Clipboards.py
--- glipper-2.3/glipper/Clipboards.py	2012-05-11 15:58:53.000000000 +0000
+++ glipper-2.3/glipper/Clipboards.py	2012-08-11 22:18:24.000000000 +0000
@@ -20,6 +20,10 @@
 		self.primary_clipboard.set_text(text)
 
 		self.emit('new-item', text, False)
+
+	def clear_text(self):
+		self.default_clipboard.clear()
+		self.primary_clipboard.clear()
 		
 	def get_default_clipboard_text(self):
 		return self.default_clipboard.get_text()
@@ -50,6 +54,13 @@
 		if self.use_clipboard:
 			self.clipboard.set_text(text)
 			self.clipboard_text = text
+
+	def clear(self):
+		if self.use_clipboard:
+			self.clipboard.set_text('')
+			self.clipboard.clear()
+			self.clipboard_text = None
+			
 	
 	def on_clipboard_owner_change(self, clipboard, event):
 		if self.use_clipboard:
diff -Nru glipper-2.3/glipper/History.py glipper-2.3/glipper/History.py
--- glipper-2.3/glipper/History.py	2012-05-11 15:58:53.000000000 +0000
+++ glipper-2.3/glipper/History.py	2012-08-11 22:18:24.000000000 +0000
@@ -65,7 +65,7 @@
 				self.history = self.history[0:self.max_elements]
 			
 			ctrl_c_item = get_glipper_clipboards().get_default_clipboard_text()
-			if ctrl_c_item not in self.history:
+			if ctrl_c_item is not None and ctrl_c_item not in self.history:
 				self.history[-1] = ctrl_c_item
 		
 		# if item is None, emit changed anyway because 
diff -Nru glipper-2.3/glipper/Preferences.py glipper-2.3/glipper/Preferences.py
--- glipper-2.3/glipper/Preferences.py	2012-05-11 15:58:53.000000000 +0000
+++ glipper-2.3/glipper/Preferences.py	2012-08-11 22:18:24.000000000 +0000
@@ -29,7 +29,10 @@
 		self.use_primary_clipboard_check.set_active(glipper.GCONF_CLIENT.get_bool(glipper.GCONF_USE_PRIMARY_CLIPBOARD))
 		self.mark_default_entry.set_active(glipper.GCONF_CLIENT.get_bool(glipper.GCONF_MARK_DEFAULT_ENTRY))
 		self.save_history_check.set_active(glipper.GCONF_CLIENT.get_bool(glipper.GCONF_SAVE_HISTORY))
-		self.key_combination_entry.set_text(glipper.GCONF_CLIENT.get_string(glipper.GCONF_KEY_COMBINATION))
+
+		key_combo = glipper.GCONF_CLIENT.get_string(glipper.GCONF_KEY_COMBINATION)
+		if key_combo is None: key_combo = ''
+		self.key_combination_entry.set_text(key_combo)
 		
 		self.max_elements_notify = glipper.GCONF_CLIENT.notify_add(glipper.GCONF_MAX_ELEMENTS, lambda x, y, z, a: self.on_max_elements_changed (z.value))
 		self.use_primary_clipboard_notify = glipper.GCONF_CLIENT.notify_add(glipper.GCONF_USE_PRIMARY_CLIPBOARD, lambda x, y, z, a: self.on_use_primary_clipboard_changed (z.value))