1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
Index: gnome-session-3.2.1/data/session-properties.ui
===================================================================
--- gnome-session-3.2.1.orig/data/session-properties.ui	2011-03-22 21:31:43.000000000 +0100
+++ gnome-session-3.2.1/data/session-properties.ui	2012-04-12 10:23:28.214564202 +0200
@@ -2,9 +2,8 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkNotebook" id="main-notebook">
+  <object class="GtkVBox" id="main-notebook">
     <property name="visible">True</property>
-    <property name="can_focus">True</property>
     <property name="border_width">6</property>
     <child>
       <object class="GtkVBox" id="vbox1">
@@ -113,18 +112,9 @@
         </child>
       </object>
     </child>
-    <child type="tab">
-      <object class="GtkLabel" id="label4">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">Startup Programs</property>
-      </object>
-      <packing>
-        <property name="tab_fill">False</property>
-      </packing>
-    </child>
     <child>
       <object class="GtkVBox" id="vbox3">
-        <property name="visible">True</property>
+        <property name="visible">False</property>
         <property name="border_width">12</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
@@ -196,16 +186,6 @@
         <property name="position">1</property>
       </packing>
     </child>
-    <child type="tab">
-      <object class="GtkLabel" id="label5">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">Options</property>
-      </object>
-      <packing>
-        <property name="position">1</property>
-        <property name="tab_fill">False</property>
-      </packing>
-    </child>
   </object>
   <object class="GtkTable" id="main-table">
     <property name="visible">True</property>
Index: gnome-session-3.2.1/gnome-session/gsm-session-fill.c
===================================================================
--- gnome-session-3.2.1.orig/gnome-session/gsm-session-fill.c	2011-09-19 23:35:48.000000000 +0200
+++ gnome-session-3.2.1/gnome-session/gsm-session-fill.c	2012-04-12 10:23:48.730665915 +0200
@@ -232,7 +232,8 @@
                 autostart_dirs = gsm_util_get_autostart_dirs ();
 
 
-                maybe_load_saved_session_apps (manager);
+                if (g_getenv ("GNOME_SESSION_SAVE") != NULL)
+                        maybe_load_saved_session_apps (manager);
 
                 for (i = 0; autostart_dirs[i]; i++) {
                         gsm_manager_add_autostart_apps_from_dir (manager,