diff options
| author | monsta <[email protected]> | 2016-01-04 17:50:08 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-01-04 17:50:08 +0300 |
| commit | 4a9c10288ab7dcd26c667c5d8fefbbc44e8c4cf3 (patch) | |
| tree | b592eb6f48349da2080d8a5ef351c72f714e1663 /stickynotes/pixmaps | |
| parent | 4dbb7347a4b344658d28cfd49f6a925f000422ee (diff) | |
| download | mate-applets-4a9c10288ab7dcd26c667c5d8fefbbc44e8c4cf3.tar.bz2 mate-applets-4a9c10288ab7dcd26c667c5d8fefbbc44e8c4cf3.tar.xz | |
stickynotes: new icon names and paths + fix deprecations
adapted from
https://git.gnome.org/browse/gnome-applets/commit/?id=76982eb73ce1bd912cc19a55d3b6682b9da93687
Diffstat (limited to 'stickynotes/pixmaps')
| -rw-r--r-- | stickynotes/pixmaps/Makefile.am | 22 | ||||
| -rw-r--r-- | stickynotes/pixmaps/stickynotes-stock-close.png (renamed from stickynotes/pixmaps/close.png) | bin | 363 -> 363 bytes | |||
| -rw-r--r-- | stickynotes/pixmaps/stickynotes-stock-locked.png (renamed from stickynotes/pixmaps/locked.png) | bin | 403 -> 403 bytes | |||
| -rw-r--r-- | stickynotes/pixmaps/stickynotes-stock-resize-se.png (renamed from stickynotes/pixmaps/resize_se.png) | bin | 312 -> 312 bytes | |||
| -rw-r--r-- | stickynotes/pixmaps/stickynotes-stock-resize-sw.png (renamed from stickynotes/pixmaps/resize_sw.png) | bin | 295 -> 295 bytes | |||
| -rw-r--r-- | stickynotes/pixmaps/stickynotes-stock-unlocked.png (renamed from stickynotes/pixmaps/unlocked.png) | bin | 398 -> 398 bytes |
6 files changed, 14 insertions, 8 deletions
diff --git a/stickynotes/pixmaps/Makefile.am b/stickynotes/pixmaps/Makefile.am index 837ecbb8..c5c39781 100644 --- a/stickynotes/pixmaps/Makefile.am +++ b/stickynotes/pixmaps/Makefile.am @@ -1,12 +1,11 @@ ## Process this file with automake to produce Makefile.in -stickynotes_applet_pixmapsdir = $(datadir)/pixmaps/mate-stickynotes -stickynotes_applet_pixmaps_DATA = \ - locked.png \ - unlocked.png \ - close.png \ - resize_se.png \ - resize_sw.png +app_icons = \ + stickynotes-stock-locked.png \ + stickynotes-stock-unlocked.png \ + stickynotes-stock-close.png \ + stickynotes-stock-resize-se.png \ + stickynotes-stock-resize-sw.png icons = \ mate-sticky-notes-applet.16.png \ @@ -16,7 +15,7 @@ icons = \ mate-sticky-notes-applet.svg EXTRA_DIST = \ - $(stickynotes_applet_pixmaps_DATA) \ + $(app_icons) \ $(icons) gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor @@ -33,6 +32,9 @@ uninstall-local: fi; \ rm -f $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \ done + for icon in $(app_icons); do \ + rm -f $(DESTDIR)$(pkgdatadir)/icons/hicolor/48x48/apps/$$icon; \ + done @-if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ @@ -54,6 +56,10 @@ install-data-local: mkdir -p $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/; \ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \ done + for icon in $(app_icons); do \ + mkdir -p $(DESTDIR)$(pkgdatadir)/icons/hicolor/48x48/apps/; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/hicolor/48x48/apps/$$icon; \ + done @-if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ $(gtk_update_icon_cache); \ diff --git a/stickynotes/pixmaps/close.png b/stickynotes/pixmaps/stickynotes-stock-close.png Binary files differindex ad0e1eaa..ad0e1eaa 100644 --- a/stickynotes/pixmaps/close.png +++ b/stickynotes/pixmaps/stickynotes-stock-close.png diff --git a/stickynotes/pixmaps/locked.png b/stickynotes/pixmaps/stickynotes-stock-locked.png Binary files differindex 878eedb4..878eedb4 100644 --- a/stickynotes/pixmaps/locked.png +++ b/stickynotes/pixmaps/stickynotes-stock-locked.png diff --git a/stickynotes/pixmaps/resize_se.png b/stickynotes/pixmaps/stickynotes-stock-resize-se.png Binary files differindex 374314ba..374314ba 100644 --- a/stickynotes/pixmaps/resize_se.png +++ b/stickynotes/pixmaps/stickynotes-stock-resize-se.png diff --git a/stickynotes/pixmaps/resize_sw.png b/stickynotes/pixmaps/stickynotes-stock-resize-sw.png Binary files differindex fa216283..fa216283 100644 --- a/stickynotes/pixmaps/resize_sw.png +++ b/stickynotes/pixmaps/stickynotes-stock-resize-sw.png diff --git a/stickynotes/pixmaps/unlocked.png b/stickynotes/pixmaps/stickynotes-stock-unlocked.png Binary files differindex 72bbc9ee..72bbc9ee 100644 --- a/stickynotes/pixmaps/unlocked.png +++ b/stickynotes/pixmaps/stickynotes-stock-unlocked.png |
