From 0cb71614dc9c275691964603024495cdf12f43ad Mon Sep 17 00:00:00 2001 From: infirit Date: Mon, 26 Aug 2013 17:10:47 +0200 Subject: Rename .desktop files to avoid file collision with Gnome2 --- capplets/keyboard/Makefile.am | 2 +- capplets/keyboard/keyboard.desktop.in.in | 10 ---------- capplets/keyboard/mate-keyboard.desktop.in.in | 10 ++++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 capplets/keyboard/keyboard.desktop.in.in create mode 100644 capplets/keyboard/mate-keyboard.desktop.in.in (limited to 'capplets/keyboard') 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/keyboard.desktop.in.in deleted file mode 100644 index 2c9cb013..00000000 --- a/capplets/keyboard/keyboard.desktop.in.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -_Name=Keyboard -_Comment=Set your keyboard preferences -Exec=mate-keyboard-properties -Icon=preferences-desktop-keyboard -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;Settings;HardwareSettings; -OnlyShowIn=MATE; diff --git a/capplets/keyboard/mate-keyboard.desktop.in.in b/capplets/keyboard/mate-keyboard.desktop.in.in new file mode 100644 index 00000000..2c9cb013 --- /dev/null +++ b/capplets/keyboard/mate-keyboard.desktop.in.in @@ -0,0 +1,10 @@ +[Desktop Entry] +_Name=Keyboard +_Comment=Set your keyboard preferences +Exec=mate-keyboard-properties +Icon=preferences-desktop-keyboard +Terminal=false +Type=Application +StartupNotify=true +Categories=GTK;Settings;HardwareSettings; +OnlyShowIn=MATE; -- cgit v1.2.1