summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--capplets/default-applications/Makefile.am24
-rw-r--r--capplets/default-applications/icons/16x16/preferences-desktop-default-applications.pngbin748 -> 0 bytes
-rw-r--r--capplets/default-applications/icons/22x22/preferences-desktop-default-applications.pngbin1310 -> 0 bytes
-rw-r--r--capplets/default-applications/icons/24x24/preferences-desktop-default-applications.pngbin1340 -> 0 bytes
-rw-r--r--capplets/default-applications/icons/32x32/preferences-desktop-default-applications.pngbin1727 -> 0 bytes
-rw-r--r--capplets/default-applications/icons/48x48/preferences-desktop-default-applications.pngbin2825 -> 0 bytes
-rw-r--r--capplets/keybindings/Makefile.am16
7 files changed, 8 insertions, 32 deletions
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index b6487ec7..8ad7740d 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -45,30 +45,6 @@ INCLUDES = \
-DMATECC_UI_DIR=\""$(uidir)"\" \
-DMATECC_APPS_DIR=\""$(xmldatadir)"\"
-icons16dir = $(datadir)/icons/mate/16x16/apps
-dist_icons16_DATA = icons/16x16/preferences-desktop-default-applications.png
-icons22dir = $(datadir)/icons/mate/22x22/apps
-dist_icons22_DATA = icons/22x22/preferences-desktop-default-applications.png
-icons24dir = $(datadir)/icons/mate/24x24/apps
-dist_icons24_DATA = icons/24x24/preferences-desktop-default-applications.png
-icons32dir = $(datadir)/icons/mate/32x32/apps
-dist_icons32_DATA = icons/32x32/preferences-desktop-default-applications.png
-icons48dir = $(datadir)/icons/mate/48x48/apps
-dist_icons48_DATA = icons/48x48/preferences-desktop-default-applications.png
-
-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_in_files) $(desktop_DATA) $(xmldata_DATA) $(autostart_DATA) $(bin_SCRIPTS)
EXTRA_DIST = $(xmldata_in_files) mate-default-applications.pc.in
diff --git a/capplets/default-applications/icons/16x16/preferences-desktop-default-applications.png b/capplets/default-applications/icons/16x16/preferences-desktop-default-applications.png
deleted file mode 100644
index 41a765aa..00000000
--- a/capplets/default-applications/icons/16x16/preferences-desktop-default-applications.png
+++ /dev/null
Binary files differ
diff --git a/capplets/default-applications/icons/22x22/preferences-desktop-default-applications.png b/capplets/default-applications/icons/22x22/preferences-desktop-default-applications.png
deleted file mode 100644
index 83b6826c..00000000
--- a/capplets/default-applications/icons/22x22/preferences-desktop-default-applications.png
+++ /dev/null
Binary files differ
diff --git a/capplets/default-applications/icons/24x24/preferences-desktop-default-applications.png b/capplets/default-applications/icons/24x24/preferences-desktop-default-applications.png
deleted file mode 100644
index 630ea040..00000000
--- a/capplets/default-applications/icons/24x24/preferences-desktop-default-applications.png
+++ /dev/null
Binary files differ
diff --git a/capplets/default-applications/icons/32x32/preferences-desktop-default-applications.png b/capplets/default-applications/icons/32x32/preferences-desktop-default-applications.png
deleted file mode 100644
index 23718f78..00000000
--- a/capplets/default-applications/icons/32x32/preferences-desktop-default-applications.png
+++ /dev/null
Binary files differ
diff --git a/capplets/default-applications/icons/48x48/preferences-desktop-default-applications.png b/capplets/default-applications/icons/48x48/preferences-desktop-default-applications.png
deleted file mode 100644
index ac25569d..00000000
--- a/capplets/default-applications/icons/48x48/preferences-desktop-default-applications.png
+++ /dev/null
Binary files differ
diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am
index ed97253f..e15c07f0 100644
--- a/capplets/keybindings/Makefile.am
+++ b/capplets/keybindings/Makefile.am
@@ -4,16 +4,16 @@ cappletname = keybinding
bin_PROGRAMS = mate-keybinding-properties
mate_keybinding_properties_LDADD = $(MATECC_CAPPLETS_LIBS)
-mate_keybinding_properties_SOURCES = \
- mate-keybinding-properties.c \
- eggcellrendererkeys.c \
- eggcellrendererkeys.h \
- eggaccelerators.c \
+mate_keybinding_properties_SOURCES = \
+ mate-keybinding-properties.c \
+ eggcellrendererkeys.c \
+ eggcellrendererkeys.h \
+ eggaccelerators.c \
eggaccelerators.h
@INTLTOOL_DESKTOP_RULE@
-uidir = $(pkgdatadir)/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = mate-keybinding-properties.ui
desktopdir = $(datadir)/applications
@@ -22,9 +22,9 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_XML_NOMERGE_RULE@
-xmldir = $(pkgdatadir)/keybindings
+xmldir = $(pkgdatadir)/keybindings
xml_in_files = 00-multimedia-key.xml.in 01-desktop-key.xml.in
-xml_DATA = $(xml_in_files:.xml.in=.xml)
+xml_DATA = $(xml_in_files:.xml.in=.xml)
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = mate-keybindings.pc