brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash on startup with list bindings

Browse Source 
When we are reading bindings initially, update_list_binding() needs
to be passed the correct "string list type" since we are calling
it with a list of strings instead of a list of GConfValue.

https://bugzilla.gnome.org/show_bug.cgi?id=609101
This commit is contained in:
Owen W. Taylor 2010-02-18 14:04:05 -05:00
parent 65766fcaac
commit 8875e73765
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/core/prefs.c
View File

@ -126,11 +126,20 @@ static gboolean handle_preference_update_enum (const gchar *key, GConfValue *val
static gboolean update_key_binding (const char *name, static gboolean update_key_binding (const char *name,
const char *value); const char *value);
typedef enum
{
META_LIST_OF_STRINGS,
META_LIST_OF_GCONFVALUE_STRINGS
} MetaStringListType;
static gboolean find_and_update_list_binding (MetaKeyPref *bindings, static gboolean find_and_update_list_binding (MetaKeyPref *bindings,
const char *name, const char *name,
GSList *value); GSList *value,
MetaStringListType type_of_value);
static gboolean update_key_list_binding (const char *name, static gboolean update_key_list_binding (const char *name,
GSList *value); GSList *value,
MetaStringListType type_of_value);
static gboolean update_command (const char *name, static gboolean update_command (const char *name,
const char *value); const char *value);
static gboolean update_workspace_name (const char *name, static gboolean update_workspace_name (const char *name,
@ -145,12 +154,6 @@ static char* gconf_key_for_workspace_name (int i);
static void queue_changed (MetaPreference pref); static void queue_changed (MetaPreference pref);
typedef enum
{
META_LIST_OF_STRINGS,
META_LIST_OF_GCONFVALUE_STRINGS
} MetaStringListType;
static gboolean update_list_binding (MetaKeyPref *binding, static gboolean update_list_binding (MetaKeyPref *binding,
GSList *value, GSList *value,
MetaStringListType type_of_value); MetaStringListType type_of_value);
@ -1149,7 +1152,7 @@ change_notify (GConfClient *client,
list = value ? gconf_value_get_list (value) : NULL; list = value ? gconf_value_get_list (value) : NULL;
if (update_key_list_binding (key, list)) if (update_key_list_binding (key, list, META_LIST_OF_GCONFVALUE_STRINGS))
queue_changed (META_PREF_KEYBINDINGS); queue_changed (META_PREF_KEYBINDINGS);
} }
else else
@ -1919,7 +1922,7 @@ init_bindings (void)
{ {
list_val = gconf_client_get_list (default_client, key, GCONF_VALUE_STRING, NULL); list_val = gconf_client_get_list (default_client, key, GCONF_VALUE_STRING, NULL);
update_key_list_binding (key, list_val); update_key_list_binding (key, list_val, META_LIST_OF_STRINGS);
g_slist_foreach (list_val, (GFunc)g_free, NULL); g_slist_foreach (list_val, (GFunc)g_free, NULL);
g_slist_free (list_val); g_slist_free (list_val);
} }
@ -2306,7 +2309,8 @@ update_key_binding (const char *name,
static gboolean static gboolean
find_and_update_list_binding (MetaKeyPref *bindings, find_and_update_list_binding (MetaKeyPref *bindings,
const char *name, const char *name,
GSList *value) GSList *value,
MetaStringListType type_of_value)
{ {
const char *key; const char *key;
int i; int i;
@ -2327,16 +2331,17 @@ find_and_update_list_binding (MetaKeyPref *bindings,
g_free (name_without_suffix); g_free (name_without_suffix);
if (bindings[i].name) if (bindings[i].name)
return update_list_binding (&bindings[i], value, META_LIST_OF_GCONFVALUE_STRINGS); return update_list_binding (&bindings[i], value, type_of_value);
else else
return FALSE; return FALSE;
} }
static gboolean static gboolean
update_key_list_binding (const char *name, update_key_list_binding (const char *name,
GSList *value) GSList *value,
MetaStringListType type_of_value)
{ {
return find_and_update_list_binding (key_bindings, name, value); return find_and_update_list_binding (key_bindings, name, value, type_of_value);
} }
static gboolean static gboolean