[Xfce4-commits] <midori:master> Use icon channel-(in)secure-symbolc if available

[Christian Dywan]

Updating branch refs/heads/master
         to cd8cb17b9ed24ca7e907bf00da44a34883a1f072 (commit)
       from 1126ec1088acd2f9ec10c8fa396ebb6d61222006 (commit)

commit cd8cb17b9ed24ca7e907bf00da44a34883a1f072
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Dec 17 10:57:35 2011 +0100

    Use icon channel-(in)secure-symbolc if available
    
    Fixes: https://bugs.launchpad.net/bugs/905086

 midori/midori-locationaction.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 698d9e9..47d2e3d 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -1670,7 +1670,10 @@ midori_location_action_set_security_hint (MidoriLocationAction* location_action,
             bg_color = "#ef7070";
             fg_color = "#000";
             #if !HAVE_HILDON
-            if (gtk_icon_theme_has_icon (icon_theme, "lock-insecure"))
+            if (gtk_icon_theme_has_icon (icon_theme, "channel-insecure-symbolic"))
+                gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
+                    GTK_ICON_ENTRY_SECONDARY, "channel-insecure-symbolic");
+            else if (gtk_icon_theme_has_icon (icon_theme, "lock-insecure"))
                 gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
                     GTK_ICON_ENTRY_SECONDARY, "lock-insecure");
             else
@@ -1685,7 +1688,10 @@ midori_location_action_set_security_hint (MidoriLocationAction* location_action,
             bg_color = "#d1eeb9";
             fg_color = "#000";
             #if !HAVE_HILDON
-            if (gtk_icon_theme_has_icon (icon_theme, "lock-secure"))
+            if (gtk_icon_theme_has_icon (icon_theme, "channel-secure-symbolic"))
+                gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
+                    GTK_ICON_ENTRY_SECONDARY, "channel-secure-symbolic");
+            else if (gtk_icon_theme_has_icon (icon_theme, "lock-secure"))
                 gtk_icon_entry_set_icon_from_icon_name (GTK_ICON_ENTRY (entry),
                     GTK_ICON_ENTRY_SECONDARY, "lock-secure");
             else