summaryrefslogtreecommitdiff
path: root/capplets/display
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/display
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/display')
-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
2 files changed, 1 insertions, 1 deletions
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