[SCM] Packaging for quarry branch, master, updated. debian/0.2.0.dfsg.1-3-14-g9dc2e0b

[Vincent Legout]

The following commit has been merged in the master branch:
commit 4e762b46975f3ecf94090c7c3df76194cdd914ee
Author: Vincent Legout <vincent at legout.info>
Date:   Tue Feb 8 13:47:41 2011 +0100

    Add 03_close_about_dialog.patch

diff --git a/debian/changelog b/debian/changelog
index 4d58d38..cfc7a14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ quarry (0.2.0.dfsg.1-5) UNRELEASED; urgency=low
   * debian/rules:
     - Use --with autotools_dev to refresh config.guess and config.sub
     - Enable scrollkeeper
+  * Add debian/patches/03_close_about_dialog.patch (lp: #311086)
 
  -- Vincent Legout <vincent at legout.info>  Tue, 08 Feb 2011 12:49:39 +0100
 
diff --git a/debian/patches/03_close_about_dialog.patch b/debian/patches/03_close_about_dialog.patch
new file mode 100644
index 0000000..c631841
--- /dev/null
+++ b/debian/patches/03_close_about_dialog.patch
@@ -0,0 +1,48 @@
+Description: Close the about dialog when pressing the close button
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/quarry/+bug/311086
+Forwarded: no
+Author: Damir Sultanbekov
+Reviewed-by: Vincent Legout <vincent at legout.info>
+
+Index: quarry/src/gui-gtk/gtk-goban-window.c
+===================================================================
+--- quarry.orig/src/gui-gtk/gtk-goban-window.c	2011-02-08 13:32:08.423645725 +0100
++++ quarry/src/gui-gtk/gtk-goban-window.c	2011-02-08 13:35:47.187303538 +0100
+@@ -2471,7 +2471,6 @@
+   static const char *copyright_string
+     = N_("Copyright (C) 2003, 2004, 2005, 2006 Paul Pogonyshev and others");
+ 
+-  if (!about_dialog) {
+ #if GTK_2_6_OR_LATER
+ 
+     GtkAboutDialog *dialog = GTK_ABOUT_DIALOG (gtk_about_dialog_new ());
+@@ -2481,10 +2480,14 @@
+     gtk_about_dialog_set_copyright (dialog, _(copyright_string));
+     gtk_about_dialog_set_comments (dialog, _(description_string));
+ 
+-    about_dialog = GTK_WINDOW (dialog);
++    about_dialog = GTK_DIALOG (dialog);
++    gtk_dialog_run (GTK_DIALOG (about_dialog));
++    gtk_widget_destroy (GTK_WIDGET (about_dialog));
++    about_dialog = NULL;
+ 
+ #else /* not GTK_2_6_OR_LATER */
+ 
++  if (!about_dialog) {
+     GtkWidget *dialog = gtk_dialog_new_with_buttons (_("About Quarry"),
+ 						     NULL, 0,
+ 						     GTK_STOCK_CLOSE,
+@@ -2524,11 +2527,11 @@
+ 
+     gtk_utils_standardize_dialog (GTK_DIALOG (dialog), vbox);
+     gtk_widget_show_all (vbox);
+-
+-#endif /* not GTK_2_6_OR_LATER */
+   }
+ 
+   gtk_window_present (about_dialog);
++
++#endif /* not GTK_2_6_OR_LATER */
+ }
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 744237e..6a5f006 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_fix_russian_translation
 02_desktop_file
+03_close_about_dialog.patch

-- 
Packaging for quarry