change fix for #347883 to not obfuscate the code.

2007-06-01  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkfilechooserdialog.c (response_cb): change fix for #347883
	to not obfuscate the code.

svn path=/trunk/; revision=18001

diff --git a/ChangeLog b/ChangeLog
index 088009f29acfb7b8cc27d56c5b7285a19351cf4d..8f47061429c2b08664b679be3701add75b24fd48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-01  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkfilechooserdialog.c (response_cb): change fix for #347883
+       to not obfuscate the code.
+
 2007-06-01  Yevgen Muntyan  <muntyan@tamu.edu>
 
        Avoid recreating pangolayouts in GtkTextView on cursor movement

diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
index fcd80ad46bf4ad449b3fb6f4eb70b0109091c6bf..93ba739e7fdfeb16e0f4ce3f087ec67b5932959b 100644 (file)
--- a/gtk/gtkfilechooserdialog.c
+++ b/gtk/gtkfilechooserdialog.c
@@ -423,18 +423,15 @@ response_cb (GtkDialog *dialog,
             gint       response_id)
 {
   GtkFileChooserDialogPrivate *priv;
-  gboolean response_matters;
 
   priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
 
   /* Act only on response IDs we recognize */
-  response_matters = 
-       response_id == GTK_RESPONSE_ACCEPT
-    || response_id == GTK_RESPONSE_OK
-    || response_id == GTK_RESPONSE_YES
-    || response_id == GTK_RESPONSE_APPLY;
-
-  if (response_matters && !priv->response_requested &&
+  if ((response_id == GTK_RESPONSE_ACCEPT ||
+       response_id == GTK_RESPONSE_OK     ||
+       response_id == GTK_RESPONSE_YES    ||
+       response_id == GTK_RESPONSE_APPLY) &&
+      !priv->response_requested &&
       !_gtk_file_chooser_embed_should_respond (GTK_FILE_CHOOSER_EMBED (priv->widget)))
     {
       g_signal_stop_emission_by_name (dialog, "response");