Rename .desktop files to avoid file collision with Gnome2

9 files changed, 8 insertions, 8 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
diff --git a/configure.ac b/configure.ac
index 8d6b0f5a..1d917d45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -311,7 +311,7 @@ capplets/about-me/Makefile
 capplets/about-me/mate-about-me.desktop.in
 capplets/about-me/icons/Makefile
 capplets/accessibility/Makefile
-capplets/accessibility/at-properties/at-properties.desktop.in
+capplets/accessibility/at-properties/mate-at-properties.desktop.in
 capplets/accessibility/at-properties/Makefile
 capplets/appearance/Makefile
 capplets/appearance/data/Makefile
@@ -322,18 +322,18 @@ capplets/default-applications/Makefile
 capplets/default-applications/mate-default-applications-properties.desktop.in
 capplets/default-applications/mate-default-applications.pc
 capplets/display/Makefile
-capplets/display/display-properties.desktop.in
+capplets/display/mate-display-properties.desktop.in
 capplets/keybindings/Makefile
 capplets/keybindings/mate-keybindings.pc
 capplets/keybindings/mate-keybinding.desktop.in
 capplets/keyboard/Makefile
-capplets/keyboard/keyboard.desktop.in
+capplets/keyboard/mate-keyboard.desktop.in
 capplets/mouse/Makefile
 capplets/mouse/mate-settings-mouse.desktop.in
 capplets/network/Makefile
 capplets/network/mate-network-properties.desktop.in
 capplets/windows/Makefile
-capplets/windows/window-properties.desktop.in
+capplets/windows/mate-window-properties.desktop.in
 font-viewer/Makefile
 font-viewer/mate-font-viewer.desktop.in
 help/Makefile