From 7cfad1c08a66678e01a1568baf7900d498962a46 Mon Sep 17 00:00:00 2001 From: rbuj Date: Sat, 16 Mar 2019 14:49:24 +0100 Subject: Use icons provided by themes and remove not used icons --- capplets/network/Makefile.am | 25 - .../icons/16x16/mate-network-properties.png | Bin 824 -> 0 bytes .../icons/22x22/mate-network-properties.png | Bin 1081 -> 0 bytes .../icons/24x24/mate-network-properties.png | Bin 1081 -> 0 bytes .../icons/32x32/mate-network-properties.png | Bin 1855 -> 0 bytes .../icons/48x48/mate-network-properties.png | Bin 3191 -> 0 bytes .../icons/scalable/mate-network-properties.svg | 628 --------------------- capplets/network/mate-network-properties.c | 4 +- .../network/mate-network-properties.desktop.in | 2 +- 9 files changed, 3 insertions(+), 656 deletions(-) delete mode 100644 capplets/network/icons/16x16/mate-network-properties.png delete mode 100644 capplets/network/icons/22x22/mate-network-properties.png delete mode 100644 capplets/network/icons/24x24/mate-network-properties.png delete mode 100644 capplets/network/icons/32x32/mate-network-properties.png delete mode 100644 capplets/network/icons/48x48/mate-network-properties.png delete mode 100644 capplets/network/icons/scalable/mate-network-properties.svg (limited to 'capplets/network') diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am index e0e934a1..904d2e28 100644 --- a/capplets/network/Makefile.am +++ b/capplets/network/Makefile.am @@ -11,19 +11,6 @@ mate_network_properties_LDADD = $(MATECC_CAPPLETS_LIBS) uidir = $(pkgdatadir)/ui dist_ui_DATA = mate-network-properties.ui -icons16dir = $(datadir)/icons/hicolor/16x16/apps -dist_icons16_DATA = icons/16x16/mate-network-properties.png -icons22dir = $(datadir)/icons/hicolor/22x22/apps -dist_icons22_DATA = icons/22x22/mate-network-properties.png -icons24dir = $(datadir)/icons/hicolor/24x24/apps -dist_icons24_DATA = icons/24x24/mate-network-properties.png -icons32dir = $(datadir)/icons/hicolor/32x32/apps -dist_icons32_DATA = icons/32x32/mate-network-properties.png -icons48dir = $(datadir)/icons/hicolor/48x48/apps -dist_icons48_DATA = icons/48x48/mate-network-properties.png -iconssvgdir = $(datadir)/icons/hicolor/scalable/apps -dist_iconssvg_DATA = icons/scalable/mate-network-properties.svg - desktopdir = $(datadir)/applications desktop_in_files = mate-network-properties.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @@ -33,18 +20,6 @@ AM_CPPFLAGS = \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_UI_DIR="\"$(uidir)\"" -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor -uninstall-hook: update-icon-cache -install-data-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) EXTRA_DIST = $(desktop_in_files) diff --git a/capplets/network/icons/16x16/mate-network-properties.png b/capplets/network/icons/16x16/mate-network-properties.png deleted file mode 100644 index ebacb983..00000000 Binary files a/capplets/network/icons/16x16/mate-network-properties.png and /dev/null differ diff --git a/capplets/network/icons/22x22/mate-network-properties.png b/capplets/network/icons/22x22/mate-network-properties.png deleted file mode 100644 index a5fb9e01..00000000 Binary files a/capplets/network/icons/22x22/mate-network-properties.png and /dev/null differ diff --git a/capplets/network/icons/24x24/mate-network-properties.png b/capplets/network/icons/24x24/mate-network-properties.png deleted file mode 100644 index e743c831..00000000 Binary files a/capplets/network/icons/24x24/mate-network-properties.png and /dev/null differ diff --git a/capplets/network/icons/32x32/mate-network-properties.png b/capplets/network/icons/32x32/mate-network-properties.png deleted file mode 100644 index 826d99d8..00000000 Binary files a/capplets/network/icons/32x32/mate-network-properties.png and /dev/null differ diff --git a/capplets/network/icons/48x48/mate-network-properties.png b/capplets/network/icons/48x48/mate-network-properties.png deleted file mode 100644 index e3a4ce28..00000000 Binary files a/capplets/network/icons/48x48/mate-network-properties.png and /dev/null differ diff --git a/capplets/network/icons/scalable/mate-network-properties.svg b/capplets/network/icons/scalable/mate-network-properties.svg deleted file mode 100644 index 71ef6762..00000000 --- a/capplets/network/icons/scalable/mate-network-properties.svg +++ /dev/null @@ -1,628 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Network proxy - 16.02.2007 - - - Josef Vybíral - - - - - Josef Vybíral - - - http://blog.vybiral.info - - - network - proxy - - - - - Jakub Steiner - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/capplets/network/mate-network-properties.c b/capplets/network/mate-network-properties.c index 02d2497f..51a149dd 100644 --- a/capplets/network/mate-network-properties.c +++ b/capplets/network/mate-network-properties.c @@ -307,7 +307,7 @@ cb_http_details_button_clicked (GtkWidget *button, g_signal_connect (widget, "response", G_CALLBACK (cb_details_dialog_response), NULL); - capplet_set_icon (widget, "mate-network-properties"); + capplet_set_icon (widget, "network-server"); gtk_widget_show_all (widget); } @@ -485,7 +485,7 @@ main (int argc, char **argv) setup_dialog (builder); widget = _gtk_builder_get_widget (builder, "network_dialog"); - capplet_set_icon (widget, "mate-network-properties"); + capplet_set_icon (widget, "network-server"); gtk_widget_show_all (widget); gtk_main (); diff --git a/capplets/network/mate-network-properties.desktop.in b/capplets/network/mate-network-properties.desktop.in index f6d135bf..5c2d2963 100644 --- a/capplets/network/mate-network-properties.desktop.in +++ b/capplets/network/mate-network-properties.desktop.in @@ -2,7 +2,7 @@ _Name=Network Proxy _Comment=Set your network proxy preferences Exec=mate-network-properties -Icon=mate-network-properties +Icon=network-server Terminal=false Type=Application StartupNotify=true -- cgit v1.2.1