5 files changed, 9 insertions, 43 deletions

diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index fb6e22c418a5..7a1169fab370 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/eel/Makefile,v 1.80 2008/10/20 21:37:09 mezz Exp $
+#   $MCom: ports/x11-toolkits/eel/Makefile,v 1.84 2009/03/17 13:40:09 kwm Exp $
 #
 
 PORTNAME=	eel
-PORTVERSION=	2.24.1
+PORTVERSION=	2.26.0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo
index aa469fcbd173..524cb219e365 100644
--- a/x11-toolkits/eel/distinfo
+++ b/x11-toolkits/eel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/eel-2.24.1.tar.bz2) = b591df36af8f1b23dd175be33b5de073
-SHA256 (gnome2/eel-2.24.1.tar.bz2) = 32cde7b589b49f439d82f76b6456983d36de7d20688f7c6ac2fdae4ce354e629
-SIZE (gnome2/eel-2.24.1.tar.bz2) = 596529
+MD5 (gnome2/eel-2.26.0.tar.bz2) = dfa105ccabd53efe4166dcfac75e2393
+SHA256 (gnome2/eel-2.26.0.tar.bz2) = 11ad07d8d371f9165fab6cc5462f59cd253f9cc835d77a54330fecafe9c0a555
+SIZE (gnome2/eel-2.26.0.tar.bz2) = 596217
diff --git a/x11-toolkits/eel/files/patch-eel_eel-gnome-extensions.c b/x11-toolkits/eel/files/patch-eel_eel-gnome-extensions.c
deleted file mode 100644
index 3d6922deda5e..000000000000
--- a/x11-toolkits/eel/files/patch-eel_eel-gnome-extensions.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- eel/eel-gnome-extensions.c.orig	Mon Mar 21 06:20:58 2005
-+++ eel/eel-gnome-extensions.c	Mon Mar 21 06:21:00 2005
-@@ -246,7 +246,9 @@
- 	IconSelectionData *selection_data;
- 
- 	selection_data = (IconSelectionData *) callback_data;
-+	GDK_THREADS_ENTER ();
- 	gtk_widget_destroy (selection_data->dialog);
-+	GDK_THREADS_LEAVE ();
- 	g_free (selection_data);	
- 	return FALSE;
- }
diff --git a/x11-toolkits/eel/files/patch-eel_eel-stock-dialogs.c b/x11-toolkits/eel/files/patch-eel_eel-stock-dialogs.c
index f1389b939964..4a0ce9c74ecc 100644
--- a/x11-toolkits/eel/files/patch-eel_eel-stock-dialogs.c
+++ b/x11-toolkits/eel/files/patch-eel_eel-stock-dialogs.c
@@ -1,6 +1,6 @@
---- eel/eel-stock-dialogs.c.orig	Mon Mar 21 06:35:10 2005
-+++ eel/eel-stock-dialogs.c	Mon Mar 21 06:36:23 2005
-@@ -104,6 +104,8 @@
+--- eel/eel-stock-dialogs.c.orig	2008-10-07 11:34:27.000000000 +0200
++++ eel/eel-stock-dialogs.c	2009-02-22 16:33:40.000000000 +0100
+@@ -96,6 +96,8 @@ timed_wait_delayed_close_timeout_callbac
  {
  	guint handler_id;
  
@@ -9,7 +9,7 @@
  	handler_id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (callback_data),
  							  "eel-stock-dialogs/delayed_close_handler_timeout_id"));
  	
-@@ -113,6 +115,8 @@
+@@ -105,6 +107,8 @@ timed_wait_delayed_close_timeout_callbac
  	
  	gtk_object_destroy (GTK_OBJECT (callback_data));
  
@@ -18,23 +18,3 @@
  	return FALSE;
  }
  
-@@ -202,7 +206,10 @@
- 
- 	wait = callback_data;
- 
-+	GDK_THREADS_ENTER ();
-+
- 	if (gnome_authentication_manager_dialog_is_visible ()) {
-+		GDK_THREADS_LEAVE ();
- 		return TRUE;
- 	}
- 	
-@@ -249,6 +256,8 @@
- 
- 	wait->timeout_handler_id = 0;
- 	wait->dialog = dialog;
-+
-+	GDK_THREADS_LEAVE ();
- 	
- 	return FALSE;
- }
diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist
index 628987f36aab..0f0359203909 100644
--- a/x11-toolkits/eel/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist
@@ -25,9 +25,7 @@ include/eel-2/eel/eel-i18n.h
 include/eel-2/eel/eel-image-table.h
 include/eel-2/eel/eel-labeled-image.h
 include/eel-2/eel/eel-marshal.h
-include/eel-2/eel/eel-mount-operation.h
 include/eel-2/eel/eel-pango-extensions.h
-include/eel-2/eel/eel-preferences-glade.h
 include/eel-2/eel/eel-preferences.h
 include/eel-2/eel/eel-self-checks.h
 include/eel-2/eel/eel-stock-dialogs.h