Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/misc
Modified Files:
Makefile.am e16-gnome.desktop.in e16-kde.desktop.in
e16.desktop.in starte16
Added Files:
Xclients.e16-gnome.sh Xclients.e16-kde.sh Xclients.e16.sh
Removed Files:
E-GNOME E-KDE E16 Xclients.e-gnome Xclients.e-kde Xclients.e16
Log Message:
Make xsession stuff work - at least on Fedora.
===================================================================
RCS file: /cvs/e/e16/e/misc/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 24 Feb 2007 19:16:08 -0000 1.7
+++ Makefile.am 5 Jun 2007 16:50:29 -0000 1.8
@@ -1,15 +1,20 @@
DESKTOPS = e16.desktop e16-gnome.desktop e16-kde.desktop
DESKTOPS_IN = e16.desktop.in e16-gnome.desktop.in e16-kde.desktop.in
-XCLIENTS = Xclients.e16 Xclients.e-gnome Xclients.e-kde
-SESSIONS = E16 E-GNOME E-KDE
+XCLIENTS = Xclients.e16.sh Xclients.e16-gnome.sh Xclients.e16-kde.sh
STARTUP = starte16
ICONS = e16.png
-misc_DATA = $(DESKTOPS) $(XCLIENTS) $(SESSIONS) $(SCRIPTS) $(ICONS)
-sesm_DATA = e16.desktop
bin_SCRIPTS = starte16
-EXTRA_DIST = $(DESKTOPS_IN) $(XCLIENTS) $(SESSIONS) $(SCRIPTS) $(ICONS)
-
miscdir = $(ENLIGHTENMENT_ROOT)/misc
-sesmdir = $(datadir)/xsessions
+misc_DATA = $(ICONS) $(DESKTOPS)
+misc_SCRIPTS = $(XCLIENTS)
+
+xsessiondir = $(datadir)/xsessions
+xsession_DATA = $(DESKTOPS)
+
+# Is this Fedora only stuff?
+#xclientsdir = $(sysconfdir)/X11/xinit/Xclients.d
+#xclients_SCRIPTS = $(XCLIENTS)
+
+EXTRA_DIST = $(DESKTOPS_IN) $(SCRIPTS) $(ICONS)
===================================================================
RCS file: /cvs/e/e16/e/misc/e16-gnome.desktop.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e16-gnome.desktop.in 24 Feb 2007 18:46:22 -0000 1.1
+++ e16-gnome.desktop.in 5 Jun 2007 16:50:30 -0000 1.2
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
+Type=XSession
Name=E-GNOME
Comment=This session starts GNOME using enlightenment (e16) as window manager
-Exec=starte16 GNOME
+Exec=e16-gnome
[EMAIL PROTECTED]@/misc/e16.png
-Type=Application
===================================================================
RCS file: /cvs/e/e16/e/misc/e16-kde.desktop.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e16-kde.desktop.in 24 Feb 2007 18:46:22 -0000 1.1
+++ e16-kde.desktop.in 5 Jun 2007 16:50:30 -0000 1.2
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
+Type=XSession
Name=E-KDE
Comment=This session starts KDE using enlightenment (e16) as window manager
-Exec=starte16 KDE
+Exec=e16-kde
[EMAIL PROTECTED]@/misc/e16.png
-Type=Application
===================================================================
RCS file: /cvs/e/e16/e/misc/e16.desktop.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e16.desktop.in 24 Feb 2007 18:46:22 -0000 1.1
+++ e16.desktop.in 5 Jun 2007 16:50:30 -0000 1.2
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
+Type=XSession
Name=E16
Comment=This session starts the Enlightenment (e16) window manager
-Exec=starte16
+Exec=e16
[EMAIL PROTECTED]@/misc/e16.png
-Type=Application
===================================================================
RCS file: /cvs/e/e16/e/misc/starte16,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- starte16 30 Dec 2004 19:44:44 -0000 1.2
+++ starte16 5 Jun 2007 16:50:30 -0000 1.3
@@ -1,10 +1,10 @@
#!/bin/sh
case "$1" in
-GNOME)
+gnome|GNOME)
export WINDOW_MANAGER=e16
exec gnome-session
;;
-KDE)
+kde|KDE)
export KDEWM=e16
exec startkde
;;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
