[Pkg-mono-svn-commits] rev 2758 - in mono-tools/trunk/debian: . patches

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-10-03 11:04:10 +0000 (Tue, 03 Oct 2006)
New Revision: 2758

Added:
   mono-tools/trunk/debian/patches/04_glade-callbacks.dpatch
   mono-tools/trunk/debian/patches/05_empty-search.dpatch
Modified:
   mono-tools/trunk/debian/changelog
   mono-tools/trunk/debian/patches/00list
Log:
* fix signal handlers and another crash in monodoc-browser


Modified: mono-tools/trunk/debian/changelog
===================================================================
--- mono-tools/trunk/debian/changelog	2006-10-02 00:31:59 UTC (rev 2757)
+++ mono-tools/trunk/debian/changelog	2006-10-03 11:04:10 UTC (rev 2758)
@@ -1,3 +1,16 @@
+mono-tools (1.1.11-5) unstable; urgency=low
+
+  * Sebastian 'slomo' Dröge:
+    + debian/patches/04_glade-callbacks.dpatch:
+      - Fix the signatures of the glade callback handlers.
+        Fixes various crashes in monodoc-browser.
+        Patch from upstream SVN (r63562)
+    + debian/patches/05_empty-search.dpatch:
+      - Don't crash when searching with an empty string.
+        Patch from upstream SVN (r61357)
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Tue,  3 Oct 2006 13:00:10 +0200
+
 mono-tools (1.1.11-4) unstable; urgency=low
 
   * Sebastian 'slomo' Dröge

Modified: mono-tools/trunk/debian/patches/00list
===================================================================
--- mono-tools/trunk/debian/patches/00list	2006-10-02 00:31:59 UTC (rev 2757)
+++ mono-tools/trunk/debian/patches/00list	2006-10-03 11:04:10 UTC (rev 2758)
@@ -1,3 +1,5 @@
 01_use_real_nunit
 02_startup_mono_path
 03_gtk-sharp2
+04_glade-callbacks.dpatch
+05_empty-search.dpatch

Added: mono-tools/trunk/debian/patches/04_glade-callbacks.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/04_glade-callbacks.dpatch	                        (rev 0)
+++ mono-tools/trunk/debian/patches/04_glade-callbacks.dpatch	2006-10-03 11:04:10 UTC (rev 2758)
@@ -0,0 +1,82 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- mono-tools/docbrowser/browser.cs	2006/06/01 07:01:16	61357
++++ mono-tools/docbrowser/browser.cs	2006/08/09 20:35:33	63562
+@@ -944,7 +944,7 @@
+                 //
+ 		// Called on the Window delete icon clicked
+ 		//
+-		void OnDelete (object sender, EventArgs a)
++		void OnDelete (object sender, DeleteEventArgs a)
+ 		{
+                         AboutBox = null;
+ 		}
+@@ -1204,7 +1204,7 @@
+ 		//
+ 		// Called on the Window delete icon clicked
+ 		//
+-		void OnDelete (object sender, EventArgs a)
++		void OnDelete (object sender, DeleteEventArgs a)
+ 		{
+ 			config_wizard = null;
+ 		}
+@@ -1361,7 +1361,7 @@
+                 //
+ 		// Called on the Window delete icon clicked
+ 		//
+-		void OnDelete (object sender, EventArgs a)
++		void OnDelete (object sender, DeleteEventArgs a)
+ 		{
+                         NewCommentBox = null;
+ 		}
+@@ -1406,7 +1406,7 @@
+                 //
+ 		// Called on the Window delete icon clicked
+ 		//
+-		void OnDelete(object sender, EventArgs a)
++		void OnDelete(object sender, DeleteEventArgs a)
+ 		{
+                         LookupBox = null;
+ 		}
+
+--- mono-tools/docbrowser/GtkHtmlHtmlRender.cs	2005/10/27 16:17:18	52292
++++ mono-tools/docbrowser/GtkHtmlHtmlRender.cs	2006/08/09 20:35:33	63562
+@@ -108,13 +108,13 @@
+ 
+ 		string Caption = "Monodoc Printing";
+ 
+-		PrintJob pj = new PrintJob (PrintConfig.Default ());
++		Gnome.PrintJob pj = new Gnome.PrintJob (PrintConfig.Default ());
+ 		PrintDialog dialog = new PrintDialog (pj, Caption, 0);
+ 
+ 		Gtk.HTML gtk_html = new Gtk.HTML (Html);
+ 		gtk_html.PrintSetMaster (pj);
+ 			
+-		PrintContext ctx = pj.Context;
++		Gnome.PrintContext ctx = pj.Context;
+ 		gtk_html.Print (ctx);
+ 
+ 		pj.Close ();
+
+
+--- mono-tools/docbrowser/GeckoHtmlRender.cs	2005/10/27 18:53:57	52296
++++ mono-tools/docbrowser/GeckoHtmlRender.cs	2006/08/09 20:35:33	63562
+@@ -193,13 +193,13 @@
+ #else
+ 		string Caption = "Monodoc Printing";
+ 
+-		PrintJob pj = new PrintJob (PrintConfig.Default ());
++		Gnome.PrintJob pj = new Gnome.PrintJob (PrintConfig.Default ());
+ 		PrintDialog dialog = new PrintDialog (pj, Caption, 0);
+ 
+ 		Gtk.HTML gtk_html = new Gtk.HTML (Html);
+ 		gtk_html.PrintSetMaster (pj);
+ 			
+-		PrintContext ctx = pj.Context;
++		Gnome.PrintContext ctx = pj.Context;
+ 		gtk_html.Print (ctx);
+ 
+ 		pj.Close ();
+

Added: mono-tools/trunk/debian/patches/05_empty-search.dpatch
===================================================================
--- mono-tools/trunk/debian/patches/05_empty-search.dpatch	                        (rev 0)
+++ mono-tools/trunk/debian/patches/05_empty-search.dpatch	2006-10-03 11:04:10 UTC (rev 2758)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- mono-tools/docbrowser/browser.cs	2005/11/20 08:13:04	53285
++++ mono-tools/docbrowser/browser.cs	2006/06/01 07:01:16	61357
+@@ -399,9 +399,11 @@
+ 	// 
+ 	void OnSearchActivated (object sender, EventArgs a)
+ 	{
++		string term = search_term.Text;
++		if (term == "")
++			return; //Search cannot handle empty string
+ 		search_tree.Model = null;
+ 		search_term.Editable = false;
+-		string term = search_term.Text;
+ 		//search in the index
+ 		Result r = search_index.Search (term);
+ 		if (r == null)
+