summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--NEWS4
-rw-r--r--data/Makefile8
-rw-r--r--data/gnome-autostart-draksnapshot.desktop.in8
-rw-r--r--draksnapshot-applet.xinit5
5 files changed, 8 insertions, 21 deletions
diff --git a/Makefile b/Makefile
index 5b84ff3..26769d4 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ clean:
find . -name '*~' | xargs rm -f
install:
- install -d $(PREFIX)/usr/{sbin,bin,share/{mime/packages,$(NAME)/pixmaps,autostart,gnome/autostart,icons/{mini,large}}}
+ install -d $(PREFIX)/usr/{sbin,bin,share/{mime/packages,$(NAME)/pixmaps,icons/{mini,large}}}
install -m755 draksnapshot-config $(SBINDIR)
install -m755 draksnapshot-restore $(SBINDIR)
install -m755 draksnapshot-applet $(BINDIR)
@@ -38,8 +38,6 @@ install:
install -m644 icons/$(NAME)-big.png $(ICONSDIR)/large/$(NAME).png
install -m644 icons/*.png $(PIXDIR)/pixmaps
for d in $(SUBDIRS); do make -C $$d $@; done
- mkdir -p $(PREFIX)/etc/X11/xinit.d
- install -m 755 draksnapshot-applet.xinit $(PREFIX)/etc/X11/xinit.d/
mkdir -p $(PERL_VENDORLIB)/MDV/Snapshot
install -m 644 lib/MDV/Snapshot/*.pm $(PERL_VENDORLIB)/MDV/Snapshot
diff --git a/NEWS b/NEWS
index bc25883..edf5b68 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- ship only a single desktop file in /etc/xdg/autostart, since that
+ location is standard and used by many window managers
+- don't ship a xinit.d script: xdg-autostart-compliance should make
+ old window managers start the XDG autostart files
- do not delete interval lines since they can no longer be set, and
restore defaults when they are all missing (#58534)
diff --git a/data/Makefile b/data/Makefile
index a3206e9..338af4c 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -1,4 +1,4 @@
-DATADIR = $(PREFIX)/usr/share
+SYSCONFDIR = $(PREFIX)/etc
DESKTOP_IN := $(wildcard *.desktop.in)
DESKTOP = $(DESKTOP_IN:.desktop.in=.desktop)
@@ -9,10 +9,8 @@ clean:
rm -f $(DESKTOP)
install: all
- mkdir -p $(DATADIR)/autostart
- install autostart-draksnapshot.desktop $(DATADIR)/autostart/
- mkdir -p $(DATADIR)/gnome/autostart
- install gnome-autostart-draksnapshot.desktop $(DATADIR)/gnome/autostart/
+ mkdir -p $(SYSCONFDIR)/xdg/autostart
+ install autostart-draksnapshot.desktop $(SYSCONFDIR)/xdg/autostart/
%.desktop: %.desktop.in
diff --git a/data/gnome-autostart-draksnapshot.desktop.in b/data/gnome-autostart-draksnapshot.desktop.in
deleted file mode 100644
index 9ec7973..0000000
--- a/data/gnome-autostart-draksnapshot.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=DrakSnapshot Applet
-Comment=Applet for DrakSnapshot
-Exec=/usr/bin/draksnapshot-applet
-Icon=draksnapshot-applet
-Type=Application
-StartupNotify=true
-Categories=X-MandrivaLinux-System-Configuration-Networking;Settings;Network;
diff --git a/draksnapshot-applet.xinit b/draksnapshot-applet.xinit
deleted file mode 100644
index 123c4d9..0000000
--- a/draksnapshot-applet.xinit
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-DESKTOP=$1
-case $DESKTOP in
- IceWM|Fluxbox|xfce4) exec /usr/bin/draksnapshot-applet;;
-esac