[git] GPA - branch, master, updated. gpa-0.9.7-2-g071ed43

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Assistant".

The branch, master has been updated
       via  071ed43fac92c68c46a1a8fb19a435eebb8927e6 (commit)
      from  9febd013fa1e6ad56204304b0193001f6b5fc0be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 071ed43fac92c68c46a1a8fb19a435eebb8927e6
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 22 18:09:29 2015 +0100

    Fix handling of the windows close button in confirmation dialogs.
    
    * src/gpaexportserverop.c (confirm_send): Only act upon the Yes button.
    * src/confdialog.c (gpa_configure_keyserver): Ditto.
    * src/gpgmetools.c (check_overwriting): Ditto.
    --
    
    Checking for GTK_RESPONSE_NO was a bad idea because that catches only
    the No button and no other events, like the window's close button.
    
    GnuPG-bug-id: 1599

diff --git a/src/confdialog.c b/src/confdialog.c
index 005d55d..74ced87 100644
--- a/src/confdialog.c
+++ b/src/confdialog.c
@@ -1591,7 +1591,7 @@ gpa_configure_keyserver (GtkWidget *parent)
   gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
                           _("_Yes"), GTK_RESPONSE_YES,
                           _("_No"), GTK_RESPONSE_NO, NULL);
-  if (gtk_dialog_run (GTK_DIALOG (msgbox)) == GTK_RESPONSE_NO)
+  if (gtk_dialog_run (GTK_DIALOG (msgbox)) != GTK_RESPONSE_YES)
     {
       gtk_widget_destroy (msgbox);
       return NULL;
diff --git a/src/gpaexportserverop.c b/src/gpaexportserverop.c
index 4691423..de3f781 100644
--- a/src/gpaexportserverop.c
+++ b/src/gpaexportserverop.c
@@ -157,7 +157,7 @@ confirm_send (GtkWidget *parent, const gchar *server)
   gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
 			  _("_Yes"), GTK_RESPONSE_YES,
 			  _("_No"), GTK_RESPONSE_NO, NULL);
-  if (gtk_dialog_run (GTK_DIALOG (msgbox)) == GTK_RESPONSE_NO)
+  if (gtk_dialog_run (GTK_DIALOG (msgbox)) != GTK_RESPONSE_YES)
     {
       gtk_widget_destroy (msgbox);
       return FALSE;
diff --git a/src/gpgmetools.c b/src/gpgmetools.c
index e2e6ec1..83c4a69 100644
--- a/src/gpgmetools.c
+++ b/src/gpgmetools.c
@@ -174,7 +174,7 @@ check_overwriting (const char *filename, GtkWidget *parent)
       gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
 			      _("_Yes"), GTK_RESPONSE_YES,
 			      _("_No"), GTK_RESPONSE_NO, NULL);
-      if (gtk_dialog_run (GTK_DIALOG (msgbox)) == GTK_RESPONSE_NO)
+      if (gtk_dialog_run (GTK_DIALOG (msgbox)) != GTK_RESPONSE_YES)
 	{
 	  gtk_widget_destroy (msgbox);
 	  return FALSE;

-----------------------------------------------------------------------

Summary of changes:
 src/confdialog.c        | 2 +-
 src/gpaexportserverop.c | 2 +-
 src/gpgmetools.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Assistant
http://git.gnupg.org