diff options
| author | infirit <[email protected]> | 2013-08-26 17:10:47 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2013-12-17 22:58:01 +0100 |
| commit | bca9f94f20475cce6b0c6090226679fa89eaf31f (patch) | |
| tree | 4c218f245533fb6fdb27d32b2879b9e8c6958c4c /capplets/keyboard | |
| parent | b944f26d0853aa903e485b7f29aab8d208bdb870 (diff) | |
| download | mate-control-center-bca9f94f20475cce6b0c6090226679fa89eaf31f.tar.bz2 mate-control-center-bca9f94f20475cce6b0c6090226679fa89eaf31f.tar.xz | |
Rename .desktop files to avoid file collision with Gnome2
Diffstat (limited to 'capplets/keyboard')
| -rw-r--r-- | capplets/keyboard/Makefile.am | 2 | ||||
| -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 |