summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberts Muktupāvels <alberts.muktupavels@gmail.com>2016-02-12 10:30:27 +0200
committerAlberts Muktupāvels <alberts.muktupavels@gmail.com>2016-02-12 10:30:27 +0200
commit308f4bafb45436fdb49c18c2c90ea981011c4260 (patch)
tree1606f603a23f3dde37ef96bca796a3122bdac5da
parent1c2ee2c51fc6a48a1f6e94c7ff1c8905767d8653 (diff)
downloadmetacity-308f4bafb45436fdb49c18c2c90ea981011c4260.tar.gz
remove metacity-wm.desktop
Window manager properties in the control center are long gone.
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/POTFILES.skip4
-rw-r--r--src/Makefile.am9
-rw-r--r--src/metacity-wm.desktop.in20
4 files changed, 3 insertions, 31 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 36aa9c76..c3a7ab63 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,7 +28,6 @@ src/core/window.c
src/core/window-props.c
src/core/xprops.c
src/metacity.desktop.in
-src/metacity-wm.desktop.in
src/org.gnome.metacity.gschema.xml.in
src/tools/metacity-message.c
src/ui/frames.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 4ba56994..0fb3682e 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,2 +1,2 @@
-src/metacity.schemas.in
-
+# List of source files that should *not* be translated.
+# Please keep this file sorted alphabetically.
diff --git a/src/Makefile.am b/src/Makefile.am
index 401be92c..ee57d6c7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -138,11 +138,6 @@ desktopfiles_in_files=metacity.desktop.in
desktopfiles_files=$(desktopfiles_in_files:.desktop.in=.desktop)
desktopfiles_DATA = $(desktopfiles_files)
-wmpropertiesdir=$(datadir)/gnome/wm-properties
-wmproperties_in_files=metacity-wm.desktop.in
-wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
-wmproperties_DATA = $(wmproperties_files)
-
xmldir = @GNOME_KEYBINDINGS_KEYSDIR@
xml_in_files = \
50-metacity-navigation.xml.in \
@@ -154,12 +149,10 @@ xml_DATA = $(xml_in_files:.xml.in=.xml)
@INTLTOOL_SCHEMAS_RULE@
CLEANFILES = \
- metacity.desktop metacity-wm.desktop org.gnome.metacity.gschema.xml 50-metacity-launchers.xml 50-metacity-navigation.xml 50-metacity-screenshot.xml 50-metacity-system.xml 50-metacity-windows.xml
+ metacity.desktop org.gnome.metacity.gschema.xml 50-metacity-launchers.xml 50-metacity-navigation.xml 50-metacity-screenshot.xml 50-metacity-system.xml 50-metacity-windows.xml
EXTRA_DIST=$(desktopfiles_files) \
- $(wmproperties_files) \
$(desktopfiles_in_files) \
- $(wmproperties_in_files) \
metacity-schemas.convert \
org.gnome.metacity.gschema.xml.in \
$(xml_in_files)
diff --git a/src/metacity-wm.desktop.in b/src/metacity-wm.desktop.in
deleted file mode 100644
index da78a44d..00000000
--- a/src/metacity-wm.desktop.in
+++ /dev/null
@@ -1,20 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=Metacity
-Exec=metacity
-# name of loadable control center module
-X-GNOME-WMSettingsModule=metacity
-# name we put on the WM spec check window
-X-GNOME-WMName=Metacity
-# back compat only
-X-GnomeWMSettingsLibrary=metacity
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=metacity
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Autostart-Phase=WindowManager
-X-GNOME-Provides=windowmanager
-X-GNOME-Autostart-Notify=true
-
-[Window Manager]
-SessionManaged=true
-