diff options
| author | Mike Ruprecht <cmaiku@gmail.com> | 2018-05-08 21:59:25 -0500 |
|---|---|---|
| committer | Mike Ruprecht <cmaiku@gmail.com> | 2018-05-08 21:59:25 -0500 |
| commit | 77bf4aa96663421cfa6e8f9c1c78a12158890f5a (patch) | |
| tree | 177c9d9b146f801fbec803322ddf40a95d89a1a5 | |
| parent | fbecc4df5a78a16a34f40004c0e2b25d4acefa4f (diff) | |
| download | pidgin-77bf4aa96663421cfa6e8f9c1c78a12158890f5a.tar.gz | |
Move e2ee icons to status directory of the icon theme specification
This patch moves the e2ee icons to the status directory of the icon
theme specification. It prefixes the icons with 'e2ee-' to keep them
clearly namespaced. It also updates code which directly accesses them.
| -rw-r--r-- | pidgin/data/icons/hicolor/16x16/status/e2ee-finished.png (renamed from pidgin/pixmaps/e2ee/16/finished.png) | bin | 829 -> 829 bytes | |||
| -rw-r--r-- | pidgin/data/icons/hicolor/16x16/status/e2ee-not-private.png (renamed from pidgin/pixmaps/e2ee/16/not-private.png) | bin | 704 -> 704 bytes | |||
| -rw-r--r-- | pidgin/data/icons/hicolor/16x16/status/e2ee-private.png (renamed from pidgin/pixmaps/e2ee/16/private.png) | bin | 703 -> 703 bytes | |||
| -rw-r--r-- | pidgin/data/icons/hicolor/16x16/status/e2ee-unverified.png (renamed from pidgin/pixmaps/e2ee/16/unverified.png) | bin | 671 -> 671 bytes | |||
| -rw-r--r-- | pidgin/gtkconv.c | 6 | ||||
| -rw-r--r-- | pidgin/pixmaps/meson.build | 2 |
6 files changed, 3 insertions, 5 deletions
diff --git a/pidgin/pixmaps/e2ee/16/finished.png b/pidgin/data/icons/hicolor/16x16/status/e2ee-finished.png Binary files differindex 84d219a33a..84d219a33a 100644 --- a/pidgin/pixmaps/e2ee/16/finished.png +++ b/pidgin/data/icons/hicolor/16x16/status/e2ee-finished.png diff --git a/pidgin/pixmaps/e2ee/16/not-private.png b/pidgin/data/icons/hicolor/16x16/status/e2ee-not-private.png Binary files differindex 68ff7c5322..68ff7c5322 100644 --- a/pidgin/pixmaps/e2ee/16/not-private.png +++ b/pidgin/data/icons/hicolor/16x16/status/e2ee-not-private.png diff --git a/pidgin/pixmaps/e2ee/16/private.png b/pidgin/data/icons/hicolor/16x16/status/e2ee-private.png Binary files differindex 577de999c5..577de999c5 100644 --- a/pidgin/pixmaps/e2ee/16/private.png +++ b/pidgin/data/icons/hicolor/16x16/status/e2ee-private.png diff --git a/pidgin/pixmaps/e2ee/16/unverified.png b/pidgin/data/icons/hicolor/16x16/status/e2ee-unverified.png Binary files differindex e748fa5024..e748fa5024 100644 --- a/pidgin/pixmaps/e2ee/16/unverified.png +++ b/pidgin/data/icons/hicolor/16x16/status/e2ee-unverified.png diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c index e9881e6121..edb4206224 100644 --- a/pidgin/gtkconv.c +++ b/pidgin/gtkconv.c @@ -4179,9 +4179,9 @@ _pidgin_e2ee_stock_icon_get(const gchar *stock_name) if (g_hash_table_lookup_extended(e2ee_stock, stock_name, NULL, (gpointer*)&image)) return image; - g_snprintf(filename, sizeof(filename), "%s.png", stock_name); - path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin", - "e2ee", "16", filename, NULL); + g_snprintf(filename, sizeof(filename), "e2ee-%s.png", stock_name); + path = g_build_filename(PURPLE_DATADIR, "pidgin", "icons", + "hicolor", "16x16", "status", filename, NULL); image = purple_image_new_from_file(path, NULL); g_free(path); diff --git a/pidgin/pixmaps/meson.build b/pidgin/pixmaps/meson.build index fd4d44d526..6e0a7ea31c 100644 --- a/pidgin/pixmaps/meson.build +++ b/pidgin/pixmaps/meson.build @@ -13,7 +13,5 @@ if INSTALL_PIXMAPS # extra stuff in our directories we don't want to install. install_data('edit.png', 'info.png', 'pause.png', install_dir : join_paths(pidginpixmapdir, 'buttons')) - install_subdir('e2ee', - install_dir : pidginpixmapdir) subdir('tray') endif |
