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

[mccann svn gnome org]

Author: mccann
Date: Mon Mar 17 20:04:48 2008
New Revision: 6032
URL: http://svn.gnome.org/viewvc/gdm?rev=6032&view=rev

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

	* data/session-setup.entries:
	* gui/simple-greeter/gdm-greeter-session.c: (launch_compiz),
	(start_window_manager):
	Lock down some compiz keys.  Set LIBGL_ALWAYS_INDIRECT for compiz.



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	Mon Mar 17 20:04:48 2008
@@ -13,6 +13,278 @@
       </value>
     </entry>
     <entry>
+      <key>/apps/compiz/general/allscreens/options/active_plugins</key>
+      <value>
+        <list type="string">
+          <value>
+            <string>cube</string>
+          </value>
+          <value>
+            <string>wobbly</string>
+          </value>
+        </list>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command_screenshot</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command_terminal</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command0</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command1</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command2</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command3</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command4</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command5</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command6</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command7</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command8</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command9</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command10</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command11</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/command_window_screenshot</key>
+      <value>
+        <string></string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/main_menu_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/main_menu_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command0_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command0_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command0_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command0_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command1_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command1_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command2_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command2_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command3_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command3_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command4_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command4_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command5_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command5_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command6_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command6_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command7_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command7_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command8_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command8_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command10_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command10_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command11_button</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+    <entry>
+      <key>/apps/compiz/general/allscreens/options/run_command11_key</key>
+      <value>
+        <string>Disabled</string>
+      </value>
+    </entry>
+
+    <entry>
       <key>/apps/metacity/general/num_workspaces</key>
       <value>
         <int>1</int>

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	Mon Mar 17 20:04:48 2008
@@ -353,6 +353,8 @@
 
         ret = FALSE;
 
+        g_setenv ("LIBGL_ALWAYS_INDIRECT", "1", TRUE);
+
         error = NULL;
         g_spawn_command_line_async ("gtk-window-decorator", &error);
         if (error != NULL) {
@@ -362,7 +364,7 @@
         }
 
         error = NULL;
-        g_spawn_command_line_async ("compiz glib gconf", &error);
+        g_spawn_command_line_async ("compiz --replace glib gconf", &error);
         if (error != NULL) {
                 g_warning ("Error starting WM: %s", error->message);
                 g_error_free (error);
@@ -407,6 +409,8 @@
         gboolean     use_compiz;
         GConfClient *client;
 
+        /* FIXME: check for COMPOSITE */
+
         client = gconf_client_get_default ();
         use_compiz = gconf_client_get_bool (client, KEY_WM_USE_COMPIZ, NULL);
         g_object_unref (client);