# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1183251575 0
# Node ID ec29522b76d004ca7dcc775ebb158c27bac0df77
# Parent  8c5b9b789bbbd6fdc4eb034030c9d2d71f663f4c
Rework the logic to be (IMHO) easy to read.

diff -r 8c5b9b789bbb -r ec29522b76d0 pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Sun Jul 01 00:55:03 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Sun Jul 01 00:59:35 2007 +0000
@@ -646,14 +646,14 @@
 static gboolean
 smiley_dialog_input_cb(GtkWidget *dialog, GdkEvent *event, GtkIMHtmlToolbar *toolbar)
 {
-	gboolean close_dialog = 
-		(GDK_KEY_PRESS    == event->type) ? (GDK_Escape == event->key.keyval) :
-		(GDK_BUTTON_PRESS == event->type) ? (1 == event->button.button) : FALSE;
+	if ((event->type == GDK_KEY_PRESS && event->key.keyval == GDK_Escape) ||
+	    (event->type == GDK_BUTTON_PRESS && event->button.button == 1))
+	{
+		close_smiley_dialog(NULL, NULL, toolbar);
+		return TRUE;
+	}
 
-	if (close_dialog)
-		close_smiley_dialog(NULL, NULL, toolbar);
-
-	return close_dialog;
+	return FALSE;
 }
 
 static void