- merged from DEVEL

[packages/easytag.git] / easytag-0.30c.patch

diff -ruN easytag-0.30b/configure easytag-0.30c/configure
--- easytag-0.30b/configure	Tue Oct 28 01:43:00 2003
+++ easytag-0.30c/configure	Tue Oct 28 01:09:12 2003
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for easytag 0.30b.
+# Generated by GNU Autoconf 2.53 for easytag 0.30c.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -412,8 +412,8 @@
 # Identity of this package.
 PACKAGE_NAME='easytag'
 PACKAGE_TARNAME='easytag'
-PACKAGE_VERSION='0.30b'
-PACKAGE_STRING='easytag 0.30b'
+PACKAGE_VERSION='0.30c'
+PACKAGE_STRING='easytag 0.30c'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/easytag.h"
@@ -918,7 +918,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures easytag 0.30b to adapt to many kinds of systems.
+\`configure' configures easytag 0.30c to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -984,7 +984,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of easytag 0.30b:";;
+     short | recursive ) echo "Configuration of easytag 0.30c:";;
    esac
   cat <<\_ACEOF
 
@@ -1092,7 +1092,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-easytag configure 0.30b
+easytag configure 0.30c
 generated by GNU Autoconf 2.53
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1107,7 +1107,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by easytag $as_me 0.30b, which was
+It was created by easytag $as_me 0.30c, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   $ $0 $@
@@ -1639,7 +1639,7 @@
 
 # Define the identity of the package.
  PACKAGE=easytag
- VERSION=0.30b
+ VERSION=0.30c
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12653,7 +12653,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by easytag $as_me 0.30b, which was
+This file was extended by easytag $as_me 0.30c, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12715,7 +12715,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-easytag config.status 0.30b
+easytag config.status 0.30c
 configured by $0, generated by GNU Autoconf 2.53,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff -ruN easytag-0.30b/configure.in easytag-0.30c/configure.in
--- easytag-0.30b/configure.in	Tue Oct 28 01:43:00 2003
+++ easytag-0.30c/configure.in	Tue Oct 28 01:09:15 2003
@@ -6,7 +6,7 @@
 dnl VERSION=0.28
 
 AC_PREREQ(2.53)
-AC_INIT(easytag, 0.30b) dnl defines ($PACKAGE, $VERSION)
+AC_INIT(easytag, 0.30c) dnl defines ($PACKAGE, $VERSION)
 AC_CONFIG_SRCDIR(src/easytag.h)
 dnl -------------------------------
 dnl Init automake
diff -ruN easytag-0.30b/easytag.spec easytag-0.30c/easytag.spec
--- easytag-0.30b/easytag.spec	Tue Oct 28 01:43:00 2003
+++ easytag-0.30c/easytag.spec	Tue Oct 28 01:09:17 2003
@@ -1,5 +1,5 @@
 %define    name      easytag
-%define    version   0.30b
+%define    version   0.30c
 %define    release   1
 %define    prefix    /usr
 
diff -ruN easytag-0.30b/src/easytag.c easytag-0.30c/src/easytag.c
--- easytag-0.30b/src/easytag.c	Tue Oct 28 01:43:00 2003
+++ easytag-0.30c/src/easytag.c	Tue Oct 28 01:40:50 2003
@@ -1433,6 +1433,9 @@
     Tag_Area_Set_Sensitive(FALSE);
     File_Area_Set_Sensitive(FALSE);
 
+    /* Show msgbox (if needed) to ask confirmation */
+    SF_HideMsgbox_Delete_File = 0;
+    
     etfilelist = ET_File_List_Get_Selection();
     while (etfilelist)
     {
@@ -1533,7 +1536,7 @@
         GtkWidget *msgbox = NULL;
         gint button;
 
-        if (CONFIRM_WRITE_TAG && (!multiple_files || (multiple_files & !SF_HideMsgbox_Write_Tag)))
+        if (CONFIRM_WRITE_TAG && !SF_HideMsgbox_Write_Tag)
         {
             ET_Display_File_Data_To_UI(ETFile);
             
@@ -1556,7 +1559,7 @@
             gtk_widget_destroy(msgbox);
         }else
         {
-            if (multiple_files && SF_HideMsgbox_Write_Tag)
+            if (SF_HideMsgbox_Write_Tag)
                 button = SF_ButtonPressed_Write_Tag;
             else
                 button = BUTTON_YES;
@@ -1586,7 +1589,7 @@
         GtkWidget *msgbox = NULL;
         gint button;
 
-        if (CONFIRM_RENAME_FILE && (!multiple_files || (multiple_files & !SF_HideMsgbox_Rename_File)))
+        if (CONFIRM_RENAME_FILE && !SF_HideMsgbox_Rename_File)
         {
             ET_Display_File_Data_To_UI(ETFile);
 
@@ -1610,7 +1613,7 @@
             gtk_widget_destroy(msgbox);
         }else
         {
-            if (multiple_files && SF_HideMsgbox_Rename_File)
+            if (SF_HideMsgbox_Rename_File)
                 button = SF_ButtonPressed_Rename_File;
             else
                 button = BUTTON_YES;
@@ -1803,7 +1806,7 @@
     /*
      * Remove the file
      */
-    if (CONFIRM_DELETE_FILE && (!multiple_files || (multiple_files & !SF_HideMsgbox_Delete_File)))
+    if (CONFIRM_DELETE_FILE && !SF_HideMsgbox_Delete_File)
     {
         msg = g_strdup_printf(_("Do you really want to delete definitively the file\n'%s' ?"),g_basename(cur_filename) );
         if (multiple_files)
@@ -1819,11 +1822,11 @@
         g_free(msg);
         SF_ButtonPressed_Delete_File = button = msg_box_run(MSG_BOX(msgbox));
         if (MSG_BOX(msgbox)->check_button_state)
-            SF_HideMsgbox_Rename_File = MSG_BOX(msgbox)->check_button_state;
+            SF_HideMsgbox_Delete_File = MSG_BOX(msgbox)->check_button_state;
         gtk_widget_destroy(msgbox);
     }else
     {
-        if (multiple_files && SF_HideMsgbox_Delete_File)
+        if (SF_HideMsgbox_Delete_File)
             button = SF_ButtonPressed_Delete_File;
         else
             button = BUTTON_YES;