diff -cr mozcache-1.2/ChangeLog mozcache-1.2.1/ChangeLog
*** mozcache-1.2/ChangeLog	Sat Feb 28 19:49:10 2009
--- mozcache-1.2.1/ChangeLog	Tue Apr  7 08:35:22 2009
***************
*** 4,9 ****
--- 4,20 ----
  
  **********
  
+ version 1.2.1 (Apr 07 2009)
+ -------------
+ * gui.c
+    + if deleting a single entry failed no error
+      message will be displayed. Fixed!
+ * nscache.c
+    + version "1.2.1"
+ * xsearch.c
+    * unicode characters which are not printable
+      will not be converted to any character set
+ 
  version 1.2 (Feb 28 2009)
  -----------
  * file.c
diff -cr mozcache-1.2/src/gui.c mozcache-1.2.1/src/gui.c
*** mozcache-1.2/src/gui.c	Sat Feb 28 02:29:15 2009
--- mozcache-1.2.1/src/gui.c	Tue Apr  7 08:45:25 2009
***************
*** 2504,2531 ****
  		g_slist_foreach(search_dialog_update_slist,
  			(GFunc) search_update_window_title, NULL);
  
! 		if (list->type == kTreeList)
! 		{
! 			gchar mesg[1024];
! 
! 			CHARCONV_UTF8_FROM_LOCALE_SNPRINTF(mesg, sizeof(mesg),
! 				"%s: %d   %s: %d",
! 				gettext("Files deleted"), delete_info.rdr.files,
! 				gettext("Errors"), delete_info.rdr.errors);
! 
! 			mesg[sizeof(mesg) - 1] = '\0';
! 			gui_msg(mesg);
! 		}
! 
! 		else
! 		{
! 			print_node_info(NULL);
! 		}
  
! 		gui_errfmt((delete_info.rdr.errors == 0) ? NULL : "%s - %s",
! 					delete_info.rdr.errmsg, delete_info.rdr.errsrc);
  
! 	} /* if (delete_info.node_list) */
  
  #ifdef CONFIG_GTKCLIST_GTKCTREE
  	g_slist_foreach(list_selection_slist,
--- 2504,2536 ----
  		g_slist_foreach(search_dialog_update_slist,
  			(GFunc) search_update_window_title, NULL);
  
! 	} /* if (delete_info.node_list) */
  
! 	if (list->type == kTreeList)
! 	{
! 		gchar mesg[1024];
  
! 		CHARCONV_UTF8_FROM_LOCALE_SNPRINTF(mesg, sizeof(mesg),
! 			"%s: %d   %s: %d",
! 			gettext("Files deleted"), delete_info.rdr.files,
! 			gettext("Errors"), delete_info.rdr.errors);
! 
! 		mesg[sizeof(mesg) - 1] = '\0';
! 		gui_msg(mesg);
! 	}
! 
! 	else if (delete_info.rdr.errors == 0)
! 	{
! 		print_node_info(NULL);
! 	}
! 
! 	else
! 	{
! 		gui_msg(NULL);
! 	}
! 
! 	gui_errfmt((delete_info.rdr.errors == 0) ? NULL : "%s - %s",
! 				delete_info.rdr.errmsg, delete_info.rdr.errsrc);
  
  #ifdef CONFIG_GTKCLIST_GTKCTREE
  	g_slist_foreach(list_selection_slist,
diff -cr mozcache-1.2/src/nscache.c mozcache-1.2.1/src/nscache.c
*** mozcache-1.2/src/nscache.c	Wed Jan 14 20:29:23 2009
--- mozcache-1.2.1/src/nscache.c	Sat Apr  4 15:10:06 2009
***************
*** 56,61 ****
--- 56,64 ----
  
  CacheDB nscache_db = { {0} };
  
+ #undef VERSION
+ #define VERSION "1.2.1"
+ 
  const gchar *nscache_package_str = PACKAGE;
  const gchar *nscache_version_str = VERSION;
  
diff -cr mozcache-1.2/src/unicode-tools.c mozcache-1.2.1/src/unicode-tools.c
*** mozcache-1.2/src/unicode-tools.c	Mon Feb 16 17:17:15 2009
--- mozcache-1.2.1/src/unicode-tools.c	Wed Mar 11 17:33:44 2009
***************
*** 49,56 ****
  #define UTF8_TOOLS_GET_CHAR(p, c)	(unicode_get_utf8((p), &(c)) != NULL)
  
  #define UNICODE_TOOLS_ISALNUM(c)	unicode_isalnum(c)
- #define UNICODE_TOOLS_ISPRINT(c)	unicode_isprint(c)
- 
  #define UNICODE_TOOLS_TOLOWER_FUNC	unicode_tolower
  #define UNICODE_TOOLS_TOUPPER_FUNC	unicode_toupper
  
--- 49,54 ----
***************
*** 63,70 ****
  						((c) != (gunichar) -1 && (c) != (gunichar) -2))
  
  #define UNICODE_TOOLS_ISALNUM(c)	g_unichar_isalnum(c)
- #define UNICODE_TOOLS_ISPRINT(c)	g_unichar_isprint(c)
- 
  #define UNICODE_TOOLS_TOLOWER_FUNC	g_unichar_tolower
  #define UNICODE_TOOLS_TOUPPER_FUNC	g_unichar_toupper
  
--- 61,66 ----
diff -cr mozcache-1.2/src/unicode-tools.h mozcache-1.2.1/src/unicode-tools.h
*** mozcache-1.2/src/unicode-tools.h	Sat Feb 14 00:34:16 2009
--- mozcache-1.2.1/src/unicode-tools.h	Wed Mar 11 17:33:40 2009
***************
*** 29,34 ****
--- 29,35 ----
  #define UTF8_TOOLS_PREV_CHAR(beg, p)		unicode_previous_utf8((beg), (p))
  #define UTF8_TOOLS_NEXT_CHAR(p, end)		unicode_next_utf8(p)
  
+ #define UNICODE_TOOLS_ISPRINT(c)		unicode_isprint(c)
  #define UNICODE_TOOLS_TOLOWER(c)		unicode_tolower(c)
  #define UNICODE_TOOLS_TOUPPER(c)		unicode_toupper(c)
  
***************
*** 52,57 ****
--- 53,59 ----
  #define UTF8_TOOLS_PREV_CHAR(beg, p)		g_utf8_find_prev_char((beg), (p))
  #define UTF8_TOOLS_NEXT_CHAR(p, end)		g_utf8_find_next_char((p), (end))
  
+ #define UNICODE_TOOLS_ISPRINT(c)		g_unichar_isprint(c)
  #define UNICODE_TOOLS_TOLOWER(c)		g_unichar_tolower(c)
  #define UNICODE_TOOLS_TOUPPER(c)		g_unichar_toupper(c)
  
diff -cr mozcache-1.2/src/xsearch.c mozcache-1.2.1/src/xsearch.c
*** mozcache-1.2/src/xsearch.c	Sat Feb 28 20:01:04 2009
--- mozcache-1.2.1/src/xsearch.c	Wed Mar 11 17:33:47 2009
***************
*** 690,696 ****
  			ncr_to_unichr(&pattern[2], &end) :
  				cer_to_unichr(&pattern[1], plen - 1, case_sensitive);
  
! 		if (unichr_orig == UNICODE_INVALID || unichr_orig == UNICODE_AMPERSAND)
  		{
  			continue;
  		}
--- 690,696 ----
  			ncr_to_unichr(&pattern[2], &end) :
  				cer_to_unichr(&pattern[1], plen - 1, case_sensitive);
  
! 		if (unichr_orig == UNICODE_INVALID)
  		{
  			continue;
  		}
***************
*** 757,762 ****
--- 757,768 ----
  			{
  				gsize  slen;
  				gchar  *str;
+ 
+ 				if (unichr == UNICODE_AMPERSAND ||
+ 					UNICODE_TOOLS_ISPRINT(unichr) == FALSE)
+ 				{
+ 					continue;
+ 				}
  
  				str = unichr_to_txtstr(unichr, xptr->charset, &slen);