changeset 17772:e3fd996b7780

merge of 'd25352d4d47369224b6a555d8008b07f6a930ce4' and 'fddae6c06ad36c616e9e26413f15f4102f375fa1'
author Gabriel Schulhof <nix@go-nix.ca>
date Tue, 29 May 2007 22:21:35 +0000
parents af5f8bdc0bab (current diff) ce03892c4755 (diff)
children 5205be30c0be
files
diffstat 1 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkprefs.c	Tue May 29 20:46:02 2007 +0000
+++ b/pidgin/gtkprefs.c	Tue May 29 22:21:35 2007 +0000
@@ -525,17 +525,14 @@
 
 	if ((theme_rowref = theme_refresh_theme_list()) != NULL) {
 		GtkTreeIter itr;
-		GtkTreeModel *tm;
 		GtkTreePath *tp = NULL;
 		GtkTreeSelection *sel = NULL;
 
 		if ((sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(smiley_theme_tree_view))) != NULL) {
-			if ((tm = gtk_tree_row_reference_get_model(theme_rowref)) != NULL) {
-				if ((tp = gtk_tree_row_reference_get_path(theme_rowref)) != NULL) {
-					if (gtk_tree_model_get_iter(tm, &itr, tp))
-						gtk_tree_selection_select_iter(sel, &itr);
-					gtk_tree_path_free(tp);
-				}
+			if ((tp = gtk_tree_row_reference_get_path(theme_rowref)) != NULL) {
+				if (gtk_tree_model_get_iter(GTK_TREE_MODEL(smiley_theme_store), &itr, tp))
+					gtk_tree_selection_select_iter(sel, &itr);
+				gtk_tree_path_free(tp);
 			}
 		}
 		gtk_tree_row_reference_free(theme_rowref);