From: Peter Volkov <pva@gentoo.org>
Date: Wed, 14 Jun 2006 14:32:33 +0000 (+0000)
Subject: Fixed sussen-applet crash which occured when there was no default URI handler set.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7e374b496426adfd3b2ac83d2605358aef6307d2;p=gentoo.git

Fixed sussen-applet crash which occured when there was no default URI handler set.
Package-Manager: portage-2.0.54-r2
---

diff --git a/net-analyzer/sussen/ChangeLog b/net-analyzer/sussen/ChangeLog
index efd28454e35b..b3f0881efd33 100644
--- a/net-analyzer/sussen/ChangeLog
+++ b/net-analyzer/sussen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/sussen
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/ChangeLog,v 1.21 2006/06/14 07:16:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/ChangeLog,v 1.22 2006/06/14 14:32:33 pva Exp $
+
+  14 Jun 2006; Peter Volkov <pva@gentoo.org>
+  +files/sussen-0.23-try-catch-on-results.patch, sussen-0.23.ebuild:
+  Fixed sussen-applet crash which occured when there was no default URI
+  handler set.
 
   14 Jun 2006; Peter Volkov <pva@gentoo.org> sussen-0.23.ebuild:
   Fixed dbus built with mono check.
diff --git a/net-analyzer/sussen/Manifest b/net-analyzer/sussen/Manifest
index ee6372f1706f..1586e3b11914 100644
--- a/net-analyzer/sussen/Manifest
+++ b/net-analyzer/sussen/Manifest
@@ -1,4 +1,4 @@
-MD5 a6ca63adeb68f40f9ea894a76d0e0185 ChangeLog 2986
+MD5 ab838bf484350f0af1ed7ea6e4e19b72 ChangeLog 3188
 MD5 913a9112332add1b07f8e13567ef78c6 files/digest-sussen-0.10 63
 MD5 6bbd8221dae260aa294014e79587f74d files/digest-sussen-0.12 63
 MD5 034a05b578eae1d70b56349b853e5d92 files/digest-sussen-0.15 63
@@ -9,6 +9,7 @@ MD5 1aa4b5628ba6f84e2c4da720eba31a49 files/digest-sussen-0.23 63
 MD5 5dd20ca6159958efc7303bd449ea592e files/digest-sussen-0.5.3 64
 MD5 06d36be407bde33246cc4cea8ded89b9 files/sussen-0.22-applet-cancel-scan-crash.patch 752
 MD5 4a32ed3facb737fe788b06ce6301e3cd files/sussen-0.22-panel-applet-crash.patch 1116
+MD5 ba28414d13225934d3ffd42240ef28e6 files/sussen-0.23-try-catch-on-results.patch 674
 MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
 MD5 284a33f91290e58dc976067ff9438ae5 sussen-0.10.ebuild 745
 MD5 eb4b0f734206dfbff9990d9a1edb216f sussen-0.12.ebuild 745
@@ -16,5 +17,5 @@ MD5 b1481061b30678b085039bd5c9952ef8 sussen-0.15.ebuild 855
 MD5 60d350134a4ad2790feccb71a4e472a9 sussen-0.19.ebuild 1139
 MD5 7d6ed18daf3a7e934469d3cbe9d78e97 sussen-0.21.ebuild 1478
 MD5 8da09b5cd46cc334ed718acce259ac13 sussen-0.22-r2.ebuild 1588
-MD5 1dbeb67e9483fe72b4ad48ca892dd101 sussen-0.23.ebuild 1667
+MD5 9e0dd15409684e21548e4d1926cddc2b sussen-0.23.ebuild 1761
 MD5 606a391d68a2efbd6f306c20cd73fdbe sussen-0.5.3.ebuild 1118
diff --git a/net-analyzer/sussen/files/sussen-0.23-try-catch-on-results.patch b/net-analyzer/sussen/files/sussen-0.23-try-catch-on-results.patch
new file mode 100644
index 000000000000..17f9ba31f97e
--- /dev/null
+++ b/net-analyzer/sussen/files/sussen-0.23-try-catch-on-results.patch
@@ -0,0 +1,18 @@
+diff -Naur sussen-0.23.orig/applet/ActionDialog.cs sussen-0.23/applet/ActionDialog.cs
+--- sussen-0.23.orig/applet/ActionDialog.cs	2006-06-05 17:03:35.000000000 +0400
++++ sussen-0.23/applet/ActionDialog.cs	2006-06-14 18:20:26.000000000 +0400
+@@ -203,8 +203,12 @@
+ 
+ 			if (scanResultsFilename != null) {
+ 				UriBuilder ub = new UriBuilder (scanResultsFilename);
+-				Gnome.Url.Show (ub.ToString());				
+-//				new SummaryDialog (scanResultsFilename);
++
++				try {
++					Gnome.Url.Show (ub.ToString());
++				} catch (Exception e) {
++					ShowErrorDialog ("Error displaying results", e.Message);
++				}
+ 			} else
+ 				Console.WriteLine ("scanResultsFilename is null");
+ 				
diff --git a/net-analyzer/sussen/sussen-0.23.ebuild b/net-analyzer/sussen/sussen-0.23.ebuild
index eacdca8b2418..c6d07e47da7e 100644
--- a/net-analyzer/sussen/sussen-0.23.ebuild
+++ b/net-analyzer/sussen/sussen-0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/sussen-0.23.ebuild,v 1.2 2006/06/14 07:16:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/sussen-0.23.ebuild,v 1.3 2006/06/14 14:32:33 pva Exp $
 
 inherit eutils gnome2 mono autotools
 
@@ -34,6 +34,14 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-try-catch-on-results.patch
+}
+
+
 src_compile () {
 	econf ${myconf} \
 	$(use_enable dbus) || die "./configure failed"