attached is a patch that does what the subject says -- Diego González <diego pemas net>
Index: libnautilus-private/apps_nautilus_preferences.schemas
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/apps_nautilus_preferences.schemas,v
retrieving revision 1.12
diff -u -r1.12 apps_nautilus_preferences.schemas
--- libnautilus-private/apps_nautilus_preferences.schemas 5 Nov 2002 18:34:23 -0000 1.12
+++ libnautilus-private/apps_nautilus_preferences.schemas 17 Nov 2002 12:18:20 -0000
@@ -681,22 +681,5 @@
</long>
</locale>
</schema>
-
- <schema>
- <key>/schemas/apps/nautilus/preferences/add_to_session</key>
- <applyto>/apps/nautilus/preferences/add_to_session</applyto>
- <owner>nautilus</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Add nautilus to session</short>
- <long>
- If this is set to true, Nautilus adds itself to the session
- when it starts up. This means it will be started the next
- time you log in.
- </long>
- </locale>
- </schema>
-
</schemalist>
</gconfschemafile>
Index: libnautilus-private/nautilus-global-preferences.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-global-preferences.c,v
retrieving revision 1.205
diff -u -r1.205 nautilus-global-preferences.c
--- libnautilus-private/nautilus-global-preferences.c 5 Nov 2002 18:34:24 -0000 1.205
+++ libnautilus-private/nautilus-global-preferences.c 17 Nov 2002 12:18:21 -0000
@@ -492,12 +492,6 @@
"default_zoom_level"
},
- /* non-visible preferences */
- { NAUTILUS_PREFERENCES_ADD_TO_SESSION,
- PREFERENCE_BOOLEAN,
- GINT_TO_POINTER (TRUE)
- },
-
{ NULL }
};
Index: libnautilus-private/nautilus-global-preferences.h
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-global-preferences.h,v
retrieving revision 1.115
diff -u -r1.115 nautilus-global-preferences.h
--- libnautilus-private/nautilus-global-preferences.h 31 Oct 2002 22:38:46 -0000 1.115
+++ libnautilus-private/nautilus-global-preferences.h 17 Nov 2002 12:18:21 -0000
@@ -163,9 +163,6 @@
NAUTILUS_SIMPLE_SEARCH_BAR
} NautilusSearchBarMode;
-/* Gnome session management */
-#define NAUTILUS_PREFERENCES_ADD_TO_SESSION "preferences/add_to_session"
-
void nautilus_global_preferences_init (void);
void nautilus_global_preferences_init_with_folder_browsing (void);
void nautilus_global_preferences_set_default_folder_viewer (const char *iid);
Index: src/nautilus-application.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-application.c,v
retrieving revision 1.197
diff -u -r1.197 nautilus-application.c
--- src/nautilus-application.c 2 Oct 2002 05:36:51 -0000 1.197
+++ src/nautilus-application.c 17 Nov 2002 12:18:22 -0000
@@ -1015,13 +1015,8 @@
static void
update_session (gpointer callback_data)
{
- set_session_restart (callback_data,
- eel_preferences_get_boolean (NAUTILUS_PREFERENCES_ADD_TO_SESSION)
- /* Only ever add ourselves to the session
- * if we have a desktop window. Prevents the
- * session thrashing that's seen otherwise
- */
- && nautilus_application_desktop_windows != NULL);
+ set_session_restart (callback_data,
+ nautilus_application_desktop_windows != NULL);
}
static void
@@ -1037,10 +1032,6 @@
g_signal_connect (client, "die",
G_CALLBACK (removed_from_session), NULL);
- eel_preferences_add_callback
- (NAUTILUS_PREFERENCES_ADD_TO_SESSION,
- update_session, client);
-
update_session (client);
}
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5593
diff -u -r1.5593 ChangeLog
--- ChangeLog 13 Nov 2002 23:31:39 -0000 1.5593
+++ ChangeLog 17 Nov 2002 12:18:41 -0000
@@ -1,3 +1,11 @@
+2002-11-17 Diego Gonzalez <diego pemas net>
+
+ * libnautilus-private/apps_nautilus_preferences.schemas:
+ * libnautilus-private/nautilus-global-preferences.[c-h]:
+ * src/nautilus-application.c:
+ remove all references to add_to_session gconf key, since it's used
+ nowhere. Fixes bug 91534.
+
2002-11-13 Diego Gonzalez <diego pemas net>
* libnautilus-private/nautilus-theme.[c-h]:
Attachment:
signature.asc
Description: This is a digitally signed message part