[network-manager-applet/jk/rh879566-secret-flags: 3/3] wireless-security: use different icons for user and system password storages

[Jiří Klimeš <jklimes src gnome org>]

commit e840dce1126e4fc4c32b08bd895d017e9f991427
Author: Jiří Klimeš <jklimes redhat com>
Date:   Tue Nov 26 11:57:12 2013 +0100

    wireless-security: use different icons for user and system password storages

 src/wireless-security/wireless-security.c |   31 ++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 3 deletions(-)
---
diff --git a/src/wireless-security/wireless-security.c b/src/wireless-security/wireless-security.c
index 57bcf3d..cd180d8 100644
--- a/src/wireless-security/wireless-security.c
+++ b/src/wireless-security/wireless-security.c
@@ -579,11 +579,25 @@ ws_802_1x_update_secrets (WirelessSecurity *sec,
        }
 }
 
+static void
+change_password_storage_icon (GtkWidget *passwd_entry, int number)
+{
+       char *icon_name = "document-save";
+
+       if (number == 1)
+               icon_name = "document-save";
+       else if (number == 2)
+               icon_name = "document-save-as";
+
+       gtk_entry_set_icon_from_icon_name (GTK_ENTRY (passwd_entry), GTK_ENTRY_ICON_SECONDARY, icon_name);
+}
+
 typedef struct {
        WirelessSecurity *sec;
        NMConnection *connection;
        const char *setting_name;
        int item_number;
+       GtkWidget *passwd_entry;
 } PopupMenuItemInfo;
 
 static void
@@ -614,6 +628,9 @@ activate_menu_item_cb (GtkMenuItem *menuitem, gpointer user_data)
                /* Update the secret flags */
                if (setting)
                        nm_setting_set_secret_flags (setting, info->sec->password_flags_name, secret_flags, 
NULL);
+
+               /* Change icon */
+               change_password_storage_icon (info->passwd_entry, info->item_number);
        }
 }
 
@@ -659,6 +676,7 @@ ws_setup_password_storage (WirelessSecurity *sec,
        info->connection = connection;
        info->setting_name = setting_name;
        info->item_number = 1;
+       info->passwd_entry = passwd_entry;
        g_signal_connect_data (item1, "activate",
                               G_CALLBACK (activate_menu_item_cb),
                               info,
@@ -669,6 +687,7 @@ ws_setup_password_storage (WirelessSecurity *sec,
        info->connection = connection;
        info->setting_name = setting_name;
        info->item_number = 2;
+       info->passwd_entry = passwd_entry;
        g_signal_connect_data (item2, "activate",
                               G_CALLBACK (activate_menu_item_cb),
                               info,
@@ -685,8 +704,11 @@ ws_setup_password_storage (WirelessSecurity *sec,
 
                if (secret_flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED)
                        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item1), TRUE);
-               else
+               else {
                        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item2), TRUE);
+                       /* Use different icon for system-storage */
+                       change_password_storage_icon (passwd_entry, 2);
+               }
        } else {
                gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item1), TRUE);
        }
@@ -715,10 +737,13 @@ ws_update_password_storage (WirelessSecurity *sec,
                item_system = group->data;
                item_user = group->next->data;
 
-               if (secret_flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED)
+               if (secret_flags & NM_SETTING_SECRET_FLAG_AGENT_OWNED) {
                        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item_user), TRUE);
-               else
+                       change_password_storage_icon (passwd_entry, 1);
+               } else {
                        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item_system), TRUE);
+                       change_password_storage_icon (passwd_entry, 2);
+               }
        }
 }