From e6a149efcee2aa45a4956d1e1da0e8f0b35b4cc7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 31 Jan 2013 17:26:24 -0500 Subject: EMailAccountStore: Use an appropriate icon for online accounts. Use "goa-panel" for GOA, "credentials-preferences" for UOA. Also move the icon before the account name. Looks better. --- mail/e-mail-account-store.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'mail/e-mail-account-store.c') diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c index cb1f4e000d..ed635f9b61 100644 --- a/mail/e-mail-account-store.c +++ b/mail/e-mail-account-store.c @@ -978,6 +978,7 @@ e_mail_account_store_init (EMailAccountStore *store) types[ii++] = G_TYPE_BOOLEAN; /* COLUMN_DEFAULT */ types[ii++] = G_TYPE_STRING; /* COLUMN_BACKEND_NAME */ types[ii++] = G_TYPE_STRING; /* COLUMN_DISPLAY_NAME */ + types[ii++] = G_TYPE_STRING; /* COLUMN_ICON_NAME */ types[ii++] = G_TYPE_BOOLEAN; /* COLUMN_ONLINE_ACCOUNT */ types[ii++] = G_TYPE_BOOLEAN; /* COLUMN_ENABLED_VISIBLE */ @@ -1110,6 +1111,7 @@ e_mail_account_store_add_service (EMailAccountStore *store, ESource *source; GtkTreeIter iter; const gchar *filename; + const gchar *icon_name = NULL; const gchar *uid; gboolean builtin; gboolean enabled; @@ -1151,6 +1153,9 @@ e_mail_account_store_add_service (EMailAccountStore *store, if (e_source_has_extension (collection, extension_name)) { online_account = TRUE; enabled_visible = FALSE; + + /* Provided by gnome-control-center-data. */ + icon_name = "goa-panel"; } /* Check for Ubuntu Online Accounts linkage. */ @@ -1158,6 +1163,9 @@ e_mail_account_store_add_service (EMailAccountStore *store, if (e_source_has_extension (collection, extension_name)) { online_account = TRUE; enabled_visible = FALSE; + + /* Provided by gnome-control-center-signon. */ + icon_name = "credentials-preferences"; } g_object_unref (collection); @@ -1186,6 +1194,7 @@ e_mail_account_store_add_service (EMailAccountStore *store, E_MAIL_ACCOUNT_STORE_COLUMN_SERVICE, service, E_MAIL_ACCOUNT_STORE_COLUMN_BUILTIN, builtin, E_MAIL_ACCOUNT_STORE_COLUMN_ENABLED, enabled, + E_MAIL_ACCOUNT_STORE_COLUMN_ICON_NAME, icon_name, E_MAIL_ACCOUNT_STORE_COLUMN_ONLINE_ACCOUNT, online_account, E_MAIL_ACCOUNT_STORE_COLUMN_ENABLED_VISIBLE, enabled_visible, -1); -- cgit v1.2.3