diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-04-18 08:10:49 +0800 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-04-21 18:30:40 +0800 |
| commit | 0b37bb5c6079e59e42090b5b1d08a1df0fc4d90b (patch) | |
| tree | b8f7f519bc70c706ddda7a6226863cef4e0e4e22 | |
| parent | 08f0f28844dc9a7bb2bda6ffd781fb3df239318e (diff) | |
| download | gsoc2013-empathy-0b37bb5c6079e59e42090b5b1d08a1df0fc4d90b.tar gsoc2013-empathy-0b37bb5c6079e59e42090b5b1d08a1df0fc4d90b.tar.gz gsoc2013-empathy-0b37bb5c6079e59e42090b5b1d08a1df0fc4d90b.tar.bz2 gsoc2013-empathy-0b37bb5c6079e59e42090b5b1d08a1df0fc4d90b.tar.lz gsoc2013-empathy-0b37bb5c6079e59e42090b5b1d08a1df0fc4d90b.tar.xz gsoc2013-empathy-0b37bb5c6079e59e42090b5b1d08a1df0fc4d90b.tar.zst gsoc2013-empathy-0b37bb5c6079e59e42090b5b1d08a1df0fc4d90b.zip | |
fix memleak in preferences_widget_sync_string_combo. Previously name was not
freed if it was a match.
| -rw-r--r-- | src/empathy-preferences.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index 0ad8e9bdf..13367ffc9 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * Copyright (C) 2003-2007 Imendio AB * @@ -688,9 +688,9 @@ preferences_widget_sync_string_combo (const gchar *key, GtkWidget *widget) found = FALSE; if (value && gtk_tree_model_get_iter_first (model, &iter)) { - gchar *name; do { + gchar *name; gtk_tree_model_get (model, &iter, COL_COMBO_NAME, &name, -1); @@ -698,13 +698,10 @@ preferences_widget_sync_string_combo (const gchar *key, GtkWidget *widget) if (strcmp (name, value) == 0) { found = TRUE; gtk_combo_box_set_active_iter (GTK_COMBO_BOX (widget), &iter); - break; - } else { - found = FALSE; } g_free (name); - } while (gtk_tree_model_iter_next (model, &iter)); + } while (!found && gtk_tree_model_iter_next (model, &iter)); } /* Fallback to the first one. */ |