gdm r6073 - in trunk: . data gui/simple-greeter

[mccann svn gnome org]

Author: mccann
Date: Wed Mar 26 17:28:01 2008
New Revision: 6073
URL: http://svn.gnome.org/viewvc/gdm?rev=6073&view=rev

Log:
2008-03-26  William Jon McCann  <jmccann redhat com>

	* data/session-setup.entries:
	Add more lockdown.

	* gui/simple-greeter/gdm-greeter-session.c:
	(activate_settings_daemon), (start_settings_daemon),
	(toggle_all_levels):
	Add back manually starting g-s-d if we can't activate it.



Modified:
   trunk/ChangeLog
   trunk/data/session-setup.entries
   trunk/gui/simple-greeter/gdm-greeter-session.c

Modified: trunk/data/session-setup.entries
==============================================================================
--- trunk/data/session-setup.entries	(original)
+++ trunk/data/session-setup.entries	Wed Mar 26 17:28:01 2008
@@ -383,12 +383,111 @@
         <string>/bin/true</string>
       </value>
     </entry>
+
     <entry>
       <key>/desktop/gnome/accessibility/keyboard/enable</key>
       <value>
         <bool>true</bool>
       </value>
     </entry>
+
+    <entry>
+      <key>/desktop/gnome/lockdown/disable_command_line</key>
+      <value>
+        <bool>true</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/lockdown/disable_lock_screen</key>
+      <value>
+        <bool>true</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/lockdown/disable_printing</key>
+      <value>
+        <bool>true</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/lockdown/disable_print_setup</key>
+      <value>
+        <bool>true</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/lockdown/disable_save_to_disk</key>
+      <value>
+        <bool>true</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/lockdown/disable_url_handlers</key>
+      <value>
+        <bool>true</bool>
+      </value>
+    </entry>
+
+    <entry>
+      <key>/desktop/gnome/url-handlers/about/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/aim/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/callto/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/cdda/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/feed/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/file/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/ftp/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/gg/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/ghelp/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/h323/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
     <entry>
       <key>/desktop/gnome/url-handlers/http/command</key>
       <value>
@@ -402,10 +501,148 @@
       </value>
     </entry>
     <entry>
+      <key>/desktop/gnome/url-handlers/icq/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/icy/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/icyx/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/info/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/irc/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/itms/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/itpc/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/lastfm/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
       <key>/desktop/gnome/url-handlers/mailto/command</key>
       <value>
         <string>/bin/true</string>
       </value>
     </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/man/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/mms/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/mmsh/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/msnim/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/net/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/note/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/pnm/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/rtp/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/rtsp/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/sip/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/trash/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/uvox/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/webcal/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/xmpp/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/desktop/gnome/url-handlers/ymsgr/command</key>
+      <value>
+        <string>/bin/true</string>
+      </value>
+    </entry>
   </entrylist>
 </gconfentryfile>

Modified: trunk/gui/simple-greeter/gdm-greeter-session.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-session.c	(original)
+++ trunk/gui/simple-greeter/gdm-greeter-session.c	Wed Mar 26 17:28:01 2008
@@ -641,6 +641,8 @@
 
         gdm_profile_start (NULL);
 
+        ret = FALSE;
+
         g_debug ("GdmGreeterLoginWindow: activating settings daemon");
 
         dbus_error_init (&local_error);
@@ -666,13 +668,39 @@
         return ret;
 }
 
+static gboolean
+start_settings_daemon (GdmGreeterSession *session)
+{
+        GError  *error;
+        gboolean ret;
+
+        g_debug ("GdmGreeterSession: Launching settings daemon");
+
+        ret = FALSE;
+
+        error = NULL;
+        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins", &error);
+        if (error != NULL) {
+                g_warning ("Error starting settings daemon: %s", error->message);
+                g_error_free (error);
+                goto out;
+        }
+
+        ret = TRUE;
+
+ out:
+        return ret;
+}
+
 static void
 toggle_all_levels (GdmSessionManager *manager,
                    gboolean           enabled,
                    GdmGreeterSession *session)
 {
         if (enabled) {
-                activate_settings_daemon (session);
+                if (!activate_settings_daemon (session)) {
+                        start_settings_daemon (session);
+                }
                 start_window_manager (session);
         } else {
         }