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
This commit is contained in:
Michael Natterer 2007-06-01 08:19:12 +00:00 committed by Michael Natterer
parent 8f4aa8c6d7
commit f667ed1996
2 changed files with 10 additions and 8 deletions

View File

@ -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

View File

@ -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");