[easytag] Handle delete-event response from dialogues



commit b55faaec5c20b0baba86e2b1dcf986bf70764088
Author: David King <amigadave amigadave com>
Date:   Wed Mar 5 22:56:48 2014 +0000

    Handle delete-event response from dialogues
    
    GTK_RESPONSE_NONE only occurs if the dialogue is shown programatically,
    which is not the case in EasyTAG, so handle GTK_RESPONSE_DELETE_EVENT
    instead.

 src/browser.c |    6 +++++-
 src/easytag.c |   29 ++++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 6 deletions(-)
---
diff --git a/src/browser.c b/src/browser.c
index 4887b73..c054486 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -693,8 +693,12 @@ Browser_Tree_Node_Selected (GtkTreeSelection *selection, gpointer user_data)
             case GTK_RESPONSE_NO:
                 break;
             case GTK_RESPONSE_CANCEL:
-            case GTK_RESPONSE_NONE:
+            case GTK_RESPONSE_DELETE_EVENT:
                 return TRUE;
+                break;
+            default:
+                g_assert_not_reached ();
+                break;
         }
     }
 
diff --git a/src/easytag.c b/src/easytag.c
index 7355e09..40dbeec 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -2437,10 +2437,13 @@ Save_List_Of_Files (GList *etfilelist, gboolean force_saving_files)
             case GTK_RESPONSE_YES:
                 break;
             case GTK_RESPONSE_NO:
-            case GTK_RESPONSE_NONE:
+            case GTK_RESPONSE_DELETE_EVENT:
                 /* Skip the following loop. */
                 Main_Stop_Button_Pressed = TRUE;
                 break;
+            default:
+                g_assert_not_reached ();
+                break;
         }
     }
 
@@ -2826,10 +2829,13 @@ Save_File (ET_File *ETFile, gboolean multiple_files,
             case GTK_RESPONSE_NO:
                 break;
             case GTK_RESPONSE_CANCEL:
-            case GTK_RESPONSE_NONE:
+            case GTK_RESPONSE_DELETE_EVENT:
                 stop_loop = -1;
                 return stop_loop;
                 break;
+            default:
+                g_assert_not_reached ();
+                break;
         }
     }
 
@@ -2980,10 +2986,13 @@ Save_File (ET_File *ETFile, gboolean multiple_files,
             case GTK_RESPONSE_NO:
                 break;
             case GTK_RESPONSE_CANCEL:
-            case GTK_RESPONSE_NONE:
+            case GTK_RESPONSE_DELETE_EVENT:
                 stop_loop = -1;
                 return stop_loop;
                 break;
+            default:
+                g_assert_not_reached ();
+                break;
         }
     }
 
@@ -3215,6 +3224,9 @@ delete_file (ET_File *ETFile, gboolean multiple_files, GError **error)
             g_free(basename_utf8);
             return stop_loop;
             break;
+        default:
+            g_assert_not_reached ();
+            break;
     }
 
     g_free(basename_utf8);
@@ -4524,8 +4536,12 @@ void Quit_MainWindow (void)
                 Quit_MainWindow_Confirmed();
                 break;
             case GTK_RESPONSE_CANCEL:
-            case GTK_RESPONSE_NONE:
+            case GTK_RESPONSE_DELETE_EVENT:
                 return;
+                break;
+            default:
+                g_assert_not_reached ();
+                break;
         }
 
     } else if (CONFIRM_BEFORE_EXIT)
@@ -4548,9 +4564,12 @@ void Quit_MainWindow (void)
                 Quit_MainWindow_Confirmed();
                 break;
             case GTK_RESPONSE_CANCEL:
-            case GTK_RESPONSE_NONE:
+            case GTK_RESPONSE_DELETE_EVENT:
                 return;
                 break;
+            default:
+                g_assert_not_reached ();
+                break;
         }
     }else
     {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]