Set location tooltip according to security status

diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h
index 6c07ce35d084bb05c4086dcb5bd690697000d35c..3b566c8c133272a9e1c5f42f8fadbce84792d1d3 100644 (file)
--- a/midori/gtkiconentry.h
+++ b/midori/gtkiconentry.h
@@ -45,6 +45,7 @@ G_BEGIN_DECLS
     gtk_icon_entry_set_icon_from_pixbuf (GtkEntry*            entry,
                                          GtkEntryIconPosition position,
                                          GdkPixbuf*           pixbuf);
+    #define gtk_icon_entry_set_tooltip gtk_entry_set_icon_tooltip_text
     #define gtk_icon_entry_set_icon_highlight gtk_entry_set_icon_activatable
     #define gtk_icon_entry_set_progress_fraction gtk_entry_set_progress_fraction
 #else

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 9785e196c6174293b12bf5777b67524c104c71dd..df29dd2cdf249482dcbe2c827e7c327d737e288c 100644 (file)
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -1815,6 +1815,8 @@ midori_location_action_set_security_hint (MidoriLocationAction* location_action,
             #if !HAVE_HILDON
             gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (child),
                 GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_INFO);
+            gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (child),
+                GTK_ICON_ENTRY_SECONDARY, _("Not verified"));
             #endif
         }
         else if (hint == MIDORI_SECURITY_TRUSTED)
@@ -1824,6 +1826,8 @@ midori_location_action_set_security_hint (MidoriLocationAction* location_action,
             #if !HAVE_HILDON
             gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (child),
                 GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_DIALOG_AUTHENTICATION);
+            gtk_icon_entry_set_tooltip (GTK_ICON_ENTRY (child),
+                GTK_ICON_ENTRY_SECONDARY, _("Verified and encrypted connection"));
             #endif
         }