Commit 358ad2c9 authored by Ramiro Estrugo's avatar Ramiro Estrugo
Browse files

Properly remove the item from the list so that we dont crash later trying

* nautilus-widgets/nautilus-preferences.c:
(pref_hash_info_remove_callback) Properly remove the item from
the list so that we dont crash later trying to munge a NULL node.

* libnautilus/nautilus-global-preferences.h:
(NAUTILUS_PREFERENCES_USER_LEVEL) Make sure the user level
defaults to hacker.
parent 73984179
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
* nautilus-widgets/nautilus-preferences.c:
(pref_hash_info_remove_callback) Properly remove the item from
the list so that we dont crash later trying to munge a NULL node.
* libnautilus/nautilus-global-preferences.h:
(NAUTILUS_PREFERENCES_USER_LEVEL) Make sure the user level
defaults to hacker.
2000-03-12 Ramiro Estrugo <ramiro@eazel.com>
*libnautilus/Makefile.am: Added nautilus_string_table
......
......@@ -31,7 +31,7 @@
BEGIN_GNOME_DECLS
/* User level */
#define NAUTILUS_PREFERENCES_USER_LEVEL "/nautilus/preferences/user_level"
#define NAUTILUS_PREFERENCES_USER_LEVEL "/nautilus/preferences/user_level=2"
/* Window options */
#define NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW "/nautilus/preferences/window_always_new"
......
......@@ -267,9 +267,10 @@ pref_hash_info_remove_callback (PrefHashInfo *pref_hash_info,
if (callback_info->callback_proc == callback_proc &&
callback_info->user_data == user_data)
{
g_list_remove (pref_hash_info->callback_list,
(gpointer) callback_info);
pref_hash_info->callback_list =
g_list_remove (pref_hash_info->callback_list,
(gpointer) callback_info);
pref_callback_info_free (callback_info);
}
}
......
......@@ -31,7 +31,7 @@
BEGIN_GNOME_DECLS
/* User level */
#define NAUTILUS_PREFERENCES_USER_LEVEL "/nautilus/preferences/user_level"
#define NAUTILUS_PREFERENCES_USER_LEVEL "/nautilus/preferences/user_level=2"
/* Window options */
#define NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW "/nautilus/preferences/window_always_new"
......
......@@ -267,9 +267,10 @@ pref_hash_info_remove_callback (PrefHashInfo *pref_hash_info,
if (callback_info->callback_proc == callback_proc &&
callback_info->user_data == user_data)
{
g_list_remove (pref_hash_info->callback_list,
(gpointer) callback_info);
pref_hash_info->callback_list =
g_list_remove (pref_hash_info->callback_list,
(gpointer) callback_info);
pref_callback_info_free (callback_info);
}
}
......
......@@ -31,7 +31,7 @@
BEGIN_GNOME_DECLS
/* User level */
#define NAUTILUS_PREFERENCES_USER_LEVEL "/nautilus/preferences/user_level"
#define NAUTILUS_PREFERENCES_USER_LEVEL "/nautilus/preferences/user_level=2"
/* Window options */
#define NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW "/nautilus/preferences/window_always_new"
......
......@@ -267,9 +267,10 @@ pref_hash_info_remove_callback (PrefHashInfo *pref_hash_info,
if (callback_info->callback_proc == callback_proc &&
callback_info->user_data == user_data)
{
g_list_remove (pref_hash_info->callback_list,
(gpointer) callback_info);
pref_hash_info->callback_list =
g_list_remove (pref_hash_info->callback_list,
(gpointer) callback_info);
pref_callback_info_free (callback_info);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment