From 0cb71614dc9c275691964603024495cdf12f43ad Mon Sep 17 00:00:00 2001
From: infirit <infirit@gmail.com>
Date: Mon, 26 Aug 2013 17:10:47 +0200
Subject: Rename .desktop files to avoid file collision with Gnome2

---
 capplets/windows/Makefile.am                          |  2 +-
 capplets/windows/mate-window-properties.desktop.in.in | 10 ++++++++++
 capplets/windows/window-properties.desktop.in.in      | 10 ----------
 3 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 capplets/windows/mate-window-properties.desktop.in.in
 delete mode 100644 capplets/windows/window-properties.desktop.in.in

(limited to 'capplets/windows')

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/mate-window-properties.desktop.in.in b/capplets/windows/mate-window-properties.desktop.in.in
new file mode 100644
index 00000000..0d72d6b8
--- /dev/null
+++ b/capplets/windows/mate-window-properties.desktop.in.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+_Name=Windows
+_Comment=Set your window properties
+Exec=mate-window-properties
+Icon=preferences-system-windows
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GTK;Settings;DesktopSettings;
+OnlyShowIn=MATE;
diff --git a/capplets/windows/window-properties.desktop.in.in b/capplets/windows/window-properties.desktop.in.in
deleted file mode 100644
index 0d72d6b8..00000000
--- a/capplets/windows/window-properties.desktop.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-_Name=Windows
-_Comment=Set your window properties
-Exec=mate-window-properties
-Icon=preferences-system-windows
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=GTK;Settings;DesktopSettings;
-OnlyShowIn=MATE;
-- 
cgit v1.2.1