summaryrefslogtreecommitdiff
path: root/capplets/keyboard
diff options
context:
space:
mode:
authorinfirit <[email protected]>2013-08-26 17:10:47 +0200
committerinfirit <[email protected]>2013-08-26 17:10:47 +0200
commit0cb71614dc9c275691964603024495cdf12f43ad (patch)
tree939edddf6f27aa08339b75192415e2c97b849b84 /capplets/keyboard
parent2b05d5f5a1cbaebabf6b335d033b66306c14b95e (diff)
downloadmate-control-center-0cb71614dc9c275691964603024495cdf12f43ad.tar.bz2
mate-control-center-0cb71614dc9c275691964603024495cdf12f43ad.tar.xz
Rename .desktop files to avoid file collision with Gnome2
Diffstat (limited to 'capplets/keyboard')
-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
2 files changed, 1 insertions, 1 deletions
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