Updated xfce4-menueditor to 1.05

* filesel dialog for launcher command in edit and add dialog
* filesel dialog for new menu filename
* check if all field are filled when adding and creating a new menu
* no more gint response (might cause prbl at compiling under NetBSD)
* (begin of) icon support added
* text in tree formatted
* patch for my_tree_store_swap_up and my_tree_store_swap_down applied
* menueditor.c splitted into more files
* bug in my_tree_store_swap_up and my_tree_store_swap_down leading to
  corrupted menu file fixed.

4 files changed, 7 insertions, 45 deletions

diff --git a/x11/xfce4-menueditor/Makefile b/x11/xfce4-menueditor/Makefile
index 4658db2cf8a..11b0dbe779c 100644
--- a/x11/xfce4-menueditor/Makefile
+++ b/x11/xfce4-menueditor/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2004/03/10 11:59:31 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/02 10:07:26 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	1.0rc3
+XFCE4_VERSION=	1.05
 
 DISTNAME=	xfce4-menueditor-${XFCE4_VERSION}
-PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://users.skynet.be/p0llux/files/
 COMMENT=	XFce4 menu editor
diff --git a/x11/xfce4-menueditor/buildlink3.mk b/x11/xfce4-menueditor/buildlink3.mk
index ff7b10a6a22..81429ae36c7 100644
--- a/x11/xfce4-menueditor/buildlink3.mk
+++ b/x11/xfce4-menueditor/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/03/18 09:12:17 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/04/02 10:07:26 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_MENUEDITOR_BUILDLINK3_MK:=	${XFCE4_MENUEDITOR_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-menueditor}
 BUILDLINK_PACKAGES+=	xfce4-menueditor
 
 .if !empty(XFCE4_MENUEDITOR_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-menueditor+=	xfce4-menueditor>=1.0rc3nb2
+BUILDLINK_DEPENDS.xfce4-menueditor+=	xfce4-menueditor>=1.0.5
 BUILDLINK_PKGSRCDIR.xfce4-menueditor?=	../../x11/xfce4-menueditor
 .endif	# XFCE4_MENUEDITOR_BUILDLINK3_MK
 
diff --git a/x11/xfce4-menueditor/distinfo b/x11/xfce4-menueditor/distinfo
index 547c505969b..6beff2eb7b3 100644
--- a/x11/xfce4-menueditor/distinfo
+++ b/x11/xfce4-menueditor/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2004/02/04 11:51:57 martti Exp $
+$NetBSD: distinfo,v 1.3 2004/04/02 10:07:26 martti Exp $
 
-SHA1 (xfce4-menueditor-1.0rc3.tar.bz2) = 26518275618fd3abbc5ef76a26d5a66a900a5ab6
-Size (xfce4-menueditor-1.0rc3.tar.bz2) = 170156 bytes
-SHA1 (patch-aa) = d45f6ac9e129953f69d0d89ee1c483cc39839b4d
+SHA1 (xfce4-menueditor-1.05.tar.bz2) = 4e1d7380a2148bb61bcb51e18026c4822e858bf1
+Size (xfce4-menueditor-1.05.tar.bz2) = 222093 bytes
diff --git a/x11/xfce4-menueditor/patches/patch-aa b/x11/xfce4-menueditor/patches/patch-aa
deleted file mode 100644
index e374836879c..00000000000
--- a/x11/xfce4-menueditor/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/02/04 11:51:57 martti Exp $
-
---- menueditor/menueditor.c.orig	2004-01-25 22:12:52.000000000 +0200
-+++ menueditor/menueditor.c	2004-02-04 13:42:57.000000000 +0200
-@@ -283,13 +283,14 @@
-   /* Check if there is no other file opened */
-   if(menueditor_app.xml_menu_file != NULL){
-     if(menueditor_app.menu_modified==TRUE){
-+      gint response;
-       GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(menueditor_app.main_window),
- 				      GTK_DIALOG_DESTROY_WITH_PARENT,
- 				      GTK_MESSAGE_QUESTION,
- 				      GTK_BUTTONS_YES_NO,
- 				      _("Do you want to save before closing the file ?"));
-       
--      gint response = gtk_dialog_run(GTK_DIALOG(dialog));
-+      response = gtk_dialog_run(GTK_DIALOG(dialog));
-       gtk_widget_destroy(dialog);
-       
-       if(response==GTK_RESPONSE_YES)
-@@ -320,13 +321,14 @@
-   /* Check if there is no other file opened */
-   if(menueditor_app.xml_menu_file != NULL){
-     if(menueditor_app.menu_modified==TRUE){
-+      gint response;
-       GtkWidget *dialog = gtk_message_dialog_new(GTK_WINDOW(menueditor_app.main_window),
- 				      GTK_DIALOG_DESTROY_WITH_PARENT,
- 				      GTK_MESSAGE_QUESTION,
- 				      GTK_BUTTONS_YES_NO,
- 				      _("Do you want to save before closing the file ?"));
-       
--      gint response = gtk_dialog_run(GTK_DIALOG(dialog));
-+      response = gtk_dialog_run(GTK_DIALOG(dialog));
-       gtk_widget_destroy(dialog);
-       
-       if(response==GTK_RESPONSE_YES)