[seahorse/wip/nielsdg/remove-person-icon] Remove custom person icon
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse/wip/nielsdg/remove-person-icon] Remove custom person icon
- Date: Sat, 2 Mar 2019 14:53:36 +0000 (UTC)
commit 268dc8a6cd7a9ede593131d851ce152e299fdaa6
Author: Niels De Graef <nielsdegraef gmail com>
Date: Sat Mar 2 15:52:13 2019 +0100
Remove custom person icon
We can use "avatar-default-symbolic", which is provided by the XDG icon
spec, so it should work for everyone. It's also nicer for non-installed
environments (such as when developing).
common/icons.vala | 1 -
data/icons/hicolor/22x22/apps/seahorse-person.png | Bin 1128 -> 0 bytes
data/icons/hicolor/48x48/apps/seahorse-person.png | Bin 2908 -> 0 bytes
data/icons/meson.build | 2 +-
pgp/seahorse-pgp-key-properties.c | 6 ++----
5 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/common/icons.vala b/common/icons.vala
index 35abf29c..ffc168e4 100644
--- a/common/icons.vala
+++ b/common/icons.vala
@@ -23,7 +23,6 @@ namespace Seahorse {
public const string ICON_KEY = "seahorse-key";
public const string ICON_SECRET = "seahorse-key-personal";
public const string ICON_KEY_SSH = "seahorse-key-ssh";
- public const string ICON_PERSON = "seahorse-person";
public const string ICON_SIGN = "seahorse-sign";
public const string ICON_SIGN_OK = "seahorse-sign-ok";
public const string ICON_SIGN_BAD = "seahorse-sign-bad";
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 7b034ac8..6c2f15cd 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -32,7 +32,7 @@ foreach size: [ 22, 48 ]
# ..../apps
icon_subfolder = join_paths('hicolor', icon_size_str, 'apps')
- foreach private_icon: [ 'key', 'key-personal', 'key-ssh', 'person' ]
+ foreach private_icon: [ 'key', 'key-personal', 'key-ssh' ]
install_data(
join_paths(icon_subfolder, 'seahorse-@0@.png'.format(private_icon)),
install_dir: join_paths(private_icons_install_dir, icon_subfolder),
diff --git a/pgp/seahorse-pgp-key-properties.c b/pgp/seahorse-pgp-key-properties.c
index a5fec103..20bdf08b 100644
--- a/pgp/seahorse-pgp-key-properties.c
+++ b/pgp/seahorse-pgp-key-properties.c
@@ -381,7 +381,7 @@ names_populate (SeahorsePgpKeyProperties *self, GtkTreeStore *store, SeahorsePgp
g_autoptr(GCancellable) cancellable = NULL;
uid = SEAHORSE_PGP_UID (u->data);
- icon = g_themed_icon_new (SEAHORSE_ICON_PERSON);
+ icon = g_themed_icon_new ("avatar-default-symbolic");
gtk_tree_store_append (store, &uiditer, NULL);
gtk_tree_store_set (store, &uiditer,
UIDSIG_OBJECT, uid,
@@ -446,7 +446,6 @@ do_names (SeahorsePgpKeyProperties *self)
/* Icon column */
renderer = gtk_cell_renderer_pixbuf_new ();
- g_object_set (renderer, "stock-size", GTK_ICON_SIZE_LARGE_TOOLBAR, NULL);
gtk_tree_view_insert_column_with_attributes (self->names_tree,
-1, "", renderer,
"gicon", UIDSIG_ICON, NULL);
@@ -844,7 +843,6 @@ do_owner (SeahorsePgpKeyProperties *self)
/* Make the columns for the view */
renderer = gtk_cell_renderer_pixbuf_new ();
- g_object_set (renderer, "stock-size", GTK_ICON_SIZE_LARGE_TOOLBAR, NULL);
gtk_tree_view_insert_column_with_attributes (self->owner_userid_tree,
-1, "", renderer,
"gicon", UID_ICON, NULL);
@@ -859,7 +857,7 @@ do_owner (SeahorsePgpKeyProperties *self)
g_autoptr(GIcon) icon = NULL;
markup = seahorse_object_get_markup (l->data);
- icon = g_themed_icon_new (SEAHORSE_ICON_PERSON);
+ icon = g_themed_icon_new ("avatar-default-symbolic");
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter,
UID_OBJECT, l->data,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]