From 3f911b251618b30ffbfc1ad7a557b51bc61a36fe Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Mon, 10 Jan 2011 22:26:46 +0900 Subject: [PATCH] Fixed GtkEntry to report the proper default value for "primary/secondary-icon-activatable" --- gtk/gtkentry.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 0920037d2b..e7bd3d932b 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -1152,7 +1152,7 @@ gtk_entry_class_init (GtkEntryClass *class) g_param_spec_boolean ("primary-icon-activatable", P_("Primary icon activatable"), P_("Whether the primary icon is activatable"), - FALSE, + TRUE, GTK_PARAM_READWRITE)); /** @@ -1173,7 +1173,7 @@ gtk_entry_class_init (GtkEntryClass *class) g_param_spec_boolean ("secondary-icon-activatable", P_("Secondary icon activatable"), P_("Whether the secondary icon is activatable"), - FALSE, + TRUE, GTK_PARAM_READWRITE)); @@ -7959,7 +7959,7 @@ gtk_entry_get_icon_activatable (GtkEntry *entry, priv = entry->priv; icon_info = priv->icons[icon_pos]; - return (icon_info != NULL && !icon_info->nonactivatable); + return (!icon_info || !icon_info->nonactivatable); } /**