Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=2b147867c77aadbe70af6851efbe67bc6c4ad42e
commit 2b147867c77aadbe70af6851efbe67bc6c4ad42e Author: Elentir <[email protected]> Date: Mon May 24 20:08:30 2010 +0200 postconf: fix desktop manager selection * add lxdm support * remove entrance support (deprecated) diff --git a/src/plugins/postconf.c b/src/plugins/postconf.c index 75ffbbe..ab05dcc 100644 --- a/src/plugins/postconf.c +++ b/src/plugins/postconf.c @@ -310,6 +310,7 @@ int write_dms(char *dms) fprintf(fd, "#desktop=\"/usr/bin/slim\"\n"); fprintf(fd, "#desktop=\"/usr/sbin/gdm --nodaemon\"\n"); fprintf(fd, "desktop=\"/usr/bin/kdm -nodaemon\"\n"); + fprintf(fd, "#desktop=\"/usr/bin/lxdm\"\n"); } else if(!strcmp(dms, "GDM")) { @@ -317,6 +318,7 @@ int write_dms(char *dms) fprintf(fd, "#desktop=\"/usr/bin/slim\"\n"); fprintf(fd, "desktop=\"/usr/sbin/gdm --nodaemon\"\n"); fprintf(fd, "#desktop=\"/usr/bin/kdm -nodaemon\"\n"); + fprintf(fd, "#desktop=\"/usr/bin/lxdm\"\n"); } else if(!strcmp(dms, "Slim")) { @@ -324,14 +326,15 @@ int write_dms(char *dms) fprintf(fd, "desktop=\"/usr/bin/slim\"\n"); fprintf(fd, "#desktop=\"/usr/sbin/gdm --nodaemon\"\n"); fprintf(fd, "#desktop=\"/usr/bin/kdm -nodaemon\"\n"); + fprintf(fd, "#desktop=\"/usr/bin/lxdm\"\n"); } - else if(!strcmp(dms, "Entrance")) + else if(!strcmp(dms, "Lxdm")) { fprintf(fd, "#desktop=\"/usr/bin/xdm -nodaemon\"\n"); fprintf(fd, "#desktop=\"/usr/bin/slim\"\n"); fprintf(fd, "#desktop=\"/usr/sbin/gdm --nodaemon\"\n"); fprintf(fd, "#desktop=\"/usr/bin/kdm -nodaemon\"\n"); - fprintf(fd, "desktop=\"/usr/sbin/entranced -nodaemon\"\n"); + fprintf(fd, "desktop=\"/usr/bin/lxdm\"\n"); } else // default : XDM { @@ -339,6 +342,7 @@ int write_dms(char *dms) fprintf(fd, "#desktop=\"/usr/bin/slim\"\n"); fprintf(fd, "#desktop=\"/usr/sbin/gdm --nodaemon\"\n"); fprintf(fd, "#desktop=\"/usr/bin/kdm -nodaemon\"\n"); + fprintf(fd, "#desktop=\"/usr/bin/lxdm\"\n"); } return 0; @@ -358,7 +362,7 @@ void checkdms(GtkListStore *store) } gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, "XDM", 1, _(" X Window Display Manager"), -1); + gtk_list_store_set (store, &iter, 0, "XDM", 1, _(" X Window Display Manager"), -1); if(pacman_db_readpkg(db, "kdebase")) { gtk_list_store_append (store, &iter); @@ -374,10 +378,10 @@ void checkdms(GtkListStore *store) gtk_list_store_append (store, &iter); gtk_list_store_set (store, &iter, 0, "Slim", 1, _(" Simple Login Manager"), -1); } - if(pacman_db_readpkg(db, "entrace")) + if(pacman_db_readpkg(db, "lxdm")) { gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, "Entrance", 1, _(" E17 Login Manager"), -1); + gtk_list_store_set (store, &iter, 0, "Lxdm", 1, _(" LXDE Display Manager"), -1); } pacman_db_unregister(db); pacman_release(); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
