Updating branch refs/heads/master
to f6ad3b1c2140d710a8ff300ebf712bbc1a125850 (commit)
from c78c982613014517a36e9ef311d5a09751759ddd (commit)
commit f6ad3b1c2140d710a8ff300ebf712bbc1a125850
Author: Christian Dywan <[email protected]>
Date: Fri Oct 22 23:38:55 2010 +0200
Set location tooltip according to security status
midori/gtkiconentry.h | 1 +
midori/midori-locationaction.c | 4 ++++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/midori/gtkiconentry.h b/midori/gtkiconentry.h
index 6c07ce3..3b566c8 100644
--- 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 9785e19..df29dd2 100644
--- 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
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
