summaryrefslogtreecommitdiff
path: root/capplets
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-09-03 02:58:28 -0700
committerStefano Karapetsas <[email protected]>2013-09-03 02:58:28 -0700
commit7e4e13ed1ce1e2e9ab31f99c9a80281160121156 (patch)
tree939edddf6f27aa08339b75192415e2c97b849b84 /capplets
parent2b05d5f5a1cbaebabf6b335d033b66306c14b95e (diff)
parent0cb71614dc9c275691964603024495cdf12f43ad (diff)
downloadmate-control-center-7e4e13ed1ce1e2e9ab31f99c9a80281160121156.tar.bz2
mate-control-center-7e4e13ed1ce1e2e9ab31f99c9a80281160121156.tar.xz
Merge pull request #69 from infirit/master
Rename .desktop files to avoid file collision with Gnome2
Diffstat (limited to 'capplets')
-rw-r--r--capplets/accessibility/at-properties/Makefile.am2
-rw-r--r--capplets/accessibility/at-properties/mate-at-properties.desktop.in.in (renamed from capplets/accessibility/at-properties/at-properties.desktop.in.in)0
-rw-r--r--capplets/display/Makefile.am2
-rw-r--r--capplets/display/mate-display-properties.desktop.in.in (renamed from capplets/display/display-properties.desktop.in.in)0
-rw-r--r--capplets/keyboard/Makefile.am2
-rw-r--r--capplets/keyboard/mate-keyboard.desktop.in.in (renamed from capplets/keyboard/keyboard.desktop.in.in)0
-rw-r--r--capplets/windows/Makefile.am2
-rw-r--r--capplets/windows/mate-window-properties.desktop.in.in (renamed from capplets/windows/window-properties.desktop.in.in)0
8 files changed, 4 insertions, 4 deletions
diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am
index ecff71a1..178a3165 100644
--- a/capplets/accessibility/at-properties/Makefile.am
+++ b/capplets/accessibility/at-properties/Makefile.am
@@ -8,7 +8,7 @@ mate_at_properties_LDFLAGS = -export-dynamic
@INTLTOOL_DESKTOP_RULE@
desktopdir = $(datadir)/applications
-Desktop_in_files = at-properties.desktop.in
+Desktop_in_files = mate-at-properties.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
pixmapdir = $(pkgdatadir)/pixmaps
diff --git a/capplets/accessibility/at-properties/at-properties.desktop.in.in b/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in
index ff4cd37d..ff4cd37d 100644
--- a/capplets/accessibility/at-properties/at-properties.desktop.in.in
+++ b/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in
diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am
index 972f271d..4a304a97 100644
--- a/capplets/display/Makefile.am
+++ b/capplets/display/Makefile.am
@@ -48,7 +48,7 @@ iconssvgdir = $(datadir)/icons/hicolor/scalable/apps
dist_iconssvg_DATA = icons/scalable/mate-preferences-desktop-display.svg
desktopdir = $(datadir)/applications
-Desktop_in_files = display-properties.desktop.in
+Desktop_in_files = mate-display-properties.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
AM_CPPFLAGS = $(DISPLAY_CAPPLET_CFLAGS) \
diff --git a/capplets/display/display-properties.desktop.in.in b/capplets/display/mate-display-properties.desktop.in.in
index 607e354e..607e354e 100644
--- a/capplets/display/display-properties.desktop.in.in
+++ b/capplets/display/mate-display-properties.desktop.in.in
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index 58cbb1ae..0b48fbbd 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -27,7 +27,7 @@ dist_ui_DATA = mate-keyboard-properties-a11y-notifications.ui \
mate-keyboard-properties-options-dialog.ui
desktopdir = $(datadir)/applications
-Desktop_in_files = keyboard.desktop.in
+Desktop_in_files = mate-keyboard.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
AM_CPPFLAGS = \
diff --git a/capplets/keyboard/keyboard.desktop.in.in b/capplets/keyboard/mate-keyboard.desktop.in.in
index 2c9cb013..2c9cb013 100644
--- a/capplets/keyboard/keyboard.desktop.in.in
+++ b/capplets/keyboard/mate-keyboard.desktop.in.in
diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am
index ff357371..1f50f073 100644
--- a/capplets/windows/Makefile.am
+++ b/capplets/windows/Makefile.am
@@ -15,7 +15,7 @@ uidir = $(pkgdatadir)/ui
ui_DATA = mate-window-properties.ui
desktopdir = $(datadir)/applications
-Desktop_in_files = window-properties.desktop.in
+Desktop_in_files = mate-window-properties.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
AM_CPPFLAGS = $(MATECC_CAPPLETS_CFLAGS) \
diff --git a/capplets/windows/window-properties.desktop.in.in b/capplets/windows/mate-window-properties.desktop.in.in
index 0d72d6b8..0d72d6b8 100644
--- a/capplets/windows/window-properties.desktop.in.in
+++ b/capplets/windows/mate-window-properties.desktop.in.in