From ea467b205fc4e86124ea5d4779044a9fe102c73c Mon Sep 17 00:00:00 2001 From: Scott Balneaves Date: Fri, 10 May 2013 13:32:13 -0500 Subject: Fix for #45 --- capplets/keybindings/mate-keybinding-properties.c | 11 +++-------- 1 file 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 -- cgit v1.2.1