[SCM] easytag/master: Fix crash when clicking the window close button

[jcowgill-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6a98f904fc706658e564c077104c83b0f6ffa4ca
Author: David King <amigadave at amigadave.com>
Date:   Fri Mar 7 14:51:42 2014 +0000

    Fix crash when clicking the window close button

diff --git a/debian/patches/fix-close-button-crash.patch b/debian/patches/fix-close-button-crash.patch
new file mode 100644
index 0000000..2ae8074
--- /dev/null
+++ b/debian/patches/fix-close-button-crash.patch
@@ -0,0 +1,43 @@
+Description: Fix crash when clicking the window close button
+Origin: upstream, https://git.gnome.org/browse/easytag/patch/?id=5442958d1ea34a992007bbb2bc047a9a5515387d
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=725568
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1071563
+Applied-Upstream: 2.1.11, https://git.gnome.org/browse/easytag/commit/?id=5442958d1ea34a992007bbb2bc047a9a5515387d
+From: David King <amigadave at amigadave.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/src/easytag.c b/src/easytag.c
+index 29eeb82..7f6ecc7 100644
+--- a/src/easytag.c
++++ b/src/easytag.c
+@@ -156,6 +156,17 @@ static gboolean et_tag_field_on_key_press_event (GtkEntry *entry,
+                                                  GdkEventKey *event,
+                                                  gpointer user_data);
+
++static gboolean
++on_main_window_delete_event (GtkWidget *window,
++                             GdkEvent *event,
++                             gpointer user_data)
++{
++    Quit_MainWindow ();
++
++    /* Handled the event, so stop propagation. */
++    return TRUE;
++}
++
+ /*
+  * common_init:
+  * @application: the application
+@@ -225,8 +236,8 @@ common_init (GApplication *application)
+     // This part is needed to set correctly the position of handle panes
+     gtk_window_set_default_size(GTK_WINDOW(MainWindow),MAIN_WINDOW_WIDTH,MAIN_WINDOW_HEIGHT);
+
+-    g_signal_connect(G_OBJECT(MainWindow),"delete_event",G_CALLBACK(Quit_MainWindow),NULL);
+-    g_signal_connect(G_OBJECT(MainWindow),"destroy",G_CALLBACK(Quit_MainWindow),NULL);
++    g_signal_connect (MainWindow, "delete-event",
++                      G_CALLBACK (on_main_window_delete_event), NULL);
+
+     /* Minimised window icon */
+     gtk_widget_realize(MainWindow);
+--
+cgit v0.9.2
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..4280d60 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-close-button-crash.patch

-- 
easytag packaging