Tue, 29 May 2007 22:21:35 +0000
merge of '320dce1497adf175e6dcdd0839607a8cd3ee7052'
and '5166cddecd578c76ca90619ec29b5bee8c58b930'
--- 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);