[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: unofficial gdm2 package available



Bastien,
    Since I wanted to play with both KDE 3.0.2 and Gnome2 at the
same time I came up with the following patch that resolves
Debian bug report  #144206, gdm: The KDE session script in
gdm does not work. It should apply cleanly to gdm 2.4.0.0.
So far it has worked okay here allowing me to select a kde
session from the gdm login box. You might want to add it into
your test gdm packages.
                Jack
------------------------------------------------------------------
diff -uNr gdm-2.4.0.0.old/config/gdm.conf.in gdm-2.4.0.0/config/gdm.conf.in
--- gdm-2.4.0.0.old/config/gdm.conf.in	Wed Jul  3 21:52:22 2002
+++ gdm-2.4.0.0/config/gdm.conf.in	Wed Jul  3 21:53:00 2002
@@ -120,6 +120,7 @@
 ShowGnomeChooserSession=true
 ShowGnomeFailsafeSession=true
 ShowXtermFailsafeSession=true
+ShowKDESession=true
 Use24Clock=false
 UseCirclesInEntry=false
 # These two keys are for the new greeter.  Circles is the standard
diff -uNr gdm-2.4.0.0.old/daemon/gdm.h gdm-2.4.0.0/daemon/gdm.h
--- gdm-2.4.0.0.old/daemon/gdm.h	Wed Jul  3 21:52:22 2002
+++ gdm-2.4.0.0/daemon/gdm.h	Wed Jul  3 22:26:14 2002
@@ -236,10 +236,12 @@
 #define GDM_KEY_SHOW_GNOME_CHOOSER "greeter/ShowGnomeChooserSession=true"
 #define GDM_KEY_SHOW_GNOME_FAILSAFE "greeter/ShowGnomeFailsafeSession=true"
 #define GDM_KEY_SHOW_XTERM_FAILSAFE "greeter/ShowXtermFailsafeSession=true"
+#define GDM_KEY_SHOW_KDE "greeter/ShowKDESession=true"
 #define GDM_KEY_SHOW_LAST_SESSION "greeter/ShowLastSession=true"
 
 #define GDM_SESSION_FAILSAFE_GNOME "GDM_Failsafe.GNOME"
 #define GDM_SESSION_FAILSAFE_XTERM "GDM_Failsafe.XTERM"
+#define GDM_SESSION_KDE "KDE"
 #define GDM_SESSION_GNOME_CHOOSER "Gnome Chooser"
 
 #define GDM_STANDARD "Standard"
diff -uNr gdm-2.4.0.0.old/gui/gdmlogin.c gdm-2.4.0.0/gui/gdmlogin.c
--- gdm-2.4.0.0.old/gui/gdmlogin.c	Wed Jul  3 21:52:22 2002
+++ gdm-2.4.0.0/gui/gdmlogin.c	Wed Jul  3 22:04:54 2002
@@ -125,6 +125,7 @@
 static gboolean GdmShowGnomeChooserSession;
 static gboolean GdmShowGnomeFailsafeSession;
 static gboolean GdmShowXtermFailsafeSession;
+static gboolean GdmShowKDESession;
 static gboolean GdmShowLastSession;
 
 static gboolean GdmUseCirclesInEntry;
@@ -836,6 +837,7 @@
     GdmShowXtermFailsafeSession = gnome_config_get_bool (GDM_KEY_SHOW_XTERM_FAILSAFE);
     GdmShowGnomeFailsafeSession = gnome_config_get_bool (GDM_KEY_SHOW_GNOME_FAILSAFE);
     GdmShowGnomeChooserSession = gnome_config_get_bool (GDM_KEY_SHOW_GNOME_CHOOSER);
+    GdmShowKDESession = gnome_config_get_bool (GDM_KEY_SHOW_KDE);
     GdmShowLastSession = gnome_config_get_bool (GDM_KEY_SHOW_LAST_SESSION);
     
     GdmTimedLoginEnable = gnome_config_get_bool (GDM_KEY_TIMED_LOGIN_ENABLE);
@@ -1518,6 +1520,27 @@
             sessgrp = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item));
             sessions = g_slist_append (sessions,
                                        g_strdup (GDM_SESSION_FAILSAFE_GNOME));
+            gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+            g_signal_connect (G_OBJECT (item), "activate",
+			      G_CALLBACK (gdm_login_session_handler),
+			      NULL);
+            gtk_widget_show (GTK_WIDGET (item));
+    }
+
+    if (GdmShowKDESession) {
+            /* For translators:  This is the kde login when the user */
+            item = gtk_radio_menu_item_new_with_label (sessgrp,
+                                                       _("KDE"));
+            gtk_tooltips_set_tip (tooltips, GTK_WIDGET (item),
+                                  _("This is a KDE session that will log you "
+                                    "into KDE."),
+                                  NULL);
+            g_object_set_data (G_OBJECT (item),
+			       SESSION_NAME, GDM_SESSION_KDE);
+
+            sessgrp = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item));
+            sessions = g_slist_append (sessions,
+                                       g_strdup (GDM_SESSION_KDE));
             gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
             g_signal_connect (G_OBJECT (item), "activate",
 			      G_CALLBACK (gdm_login_session_handler),
diff -uNr gdm-2.4.0.0.old/gui/greeter/greeter.c gdm-2.4.0.0/gui/greeter/greeter.c
--- gdm-2.4.0.0.old/gui/greeter/greeter.c	Wed Jul  3 21:52:22 2002
+++ gdm-2.4.0.0/gui/greeter/greeter.c	Wed Jul  3 21:58:26 2002
@@ -40,6 +40,7 @@
 gboolean GdmShowGnomeChooserSession = FALSE;
 gboolean GdmShowGnomeFailsafeSession = FALSE;
 gboolean GdmShowXtermFailsafeSession = FALSE;
+gboolean GdmShowKDESession = FALSE;
 gboolean GdmShowLastSession = FALSE;
 gchar *GdmSessionDir = NULL;
 gchar *GdmLocaleFile = NULL;
@@ -94,6 +95,7 @@
     GdmShowXtermFailsafeSession = gnome_config_get_bool (GDM_KEY_SHOW_XTERM_FAILSAFE);
     GdmShowGnomeFailsafeSession = gnome_config_get_bool (GDM_KEY_SHOW_GNOME_FAILSAFE);
     GdmShowGnomeChooserSession = gnome_config_get_bool (GDM_KEY_SHOW_GNOME_CHOOSER);
+    GdmShowKDESession = gnome_config_get_bool (GDM_KEY_SHOW_KDE);
     GdmShowLastSession = gnome_config_get_bool (GDM_KEY_SHOW_LAST_SESSION);
     GdmSessionDir = gnome_config_get_string (GDM_KEY_SESSDIR);
     GdmLocaleFile = gnome_config_get_string (GDM_KEY_LOCFILE);
------------------------------------------------------------


-- 
To UNSUBSCRIBE, email to debian-gtk-gnome-request@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org



Reply to: