diff options
author | Scott Balneaves <[email protected]> | 2013-05-10 13:32:13 -0500 |
---|---|---|
committer | Scott Balneaves <[email protected]> | 2013-05-10 13:32:13 -0500 |
commit | ea467b205fc4e86124ea5d4779044a9fe102c73c (patch) | |
tree | d3aa0613e5c8df82c19037e4a79299c252e9fe30 /capplets/keybindings | |
parent | f153fc4ad4a09a31c5df22f67931d052f0a30385 (diff) | |
download | mate-control-center-ea467b205fc4e86124ea5d4779044a9fe102c73c.tar.bz2 mate-control-center-ea467b205fc4e86124ea5d4779044a9fe102c73c.tar.xz |
Fix for #45
Diffstat (limited to 'capplets/keybindings')
-rw-r--r-- | capplets/keybindings/mate-keybinding-properties.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c index 0b692ad3..ab3eaa6e 100644 --- a/capplets/keybindings/mate-keybinding-properties.c +++ b/capplets/keybindings/mate-keybinding-properties.c @@ -432,15 +432,14 @@ typedef struct { static gboolean key_match(GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, gpointer data) { KeyMatchData* match_data = data; - KeyEntry* element; + KeyEntry* element = NULL; + gchar *element_schema = NULL; + gchar *element_path = NULL; gtk_tree_model_get(model, iter, KEYENTRY_COLUMN, &element, -1); - gchar *element_schema; - gchar *element_path; - if (element && element->settings && G_IS_SETTINGS(element->settings)) { #if GLIB_CHECK_VERSION (2, 32, 0) @@ -450,10 +449,6 @@ static gboolean key_match(GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* i #endif g_object_get (element->settings, "path", &element_path, NULL); } - else { - element_schema = NULL; - element_path = NULL; - } if (element && g_strcmp0(element->gsettings_key, match_data->key) == 0 && g_strcmp0(element_schema, match_data->schema) == 0 |