# HG changeset patch # User Mark Doliner # Date 1073854033 0 # Node ID 41e973dbca03d0ebc9c571338279a5b7c4f3cae8 # Parent 2ec7538dd3490044e384a2d8b20cb34b296fc778 [gaim-migrate @ 8774] This makes prefs correctly show which smiley theme is selected. The problem was that the index # of the selected theme was chosen from the unsorted list, but when actually selecting theme row the sorted list was used. committer: Tailor Script diff -r 2ec7538dd349 -r 41e973dbca03 src/gtkprefs.c --- a/src/gtkprefs.c Sun Jan 11 18:00:41 2004 +0000 +++ b/src/gtkprefs.c Sun Jan 11 20:47:13 2004 +0000 @@ -567,11 +567,9 @@ gtk_box_pack_start(GTK_BOX(ret), sw, TRUE, TRUE, 0); smiley_theme_store = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING); - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(smiley_theme_store), - 1, GTK_SORT_ASCENDING); path = theme_refresh_theme_list(); - + view = gtk_tree_view_new_with_model (GTK_TREE_MODEL(smiley_theme_store)); gtk_drag_dest_set(view, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, te, @@ -586,6 +584,8 @@ gtk_tree_selection_select_path(sel, path); gtk_tree_path_free(path); } + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(smiley_theme_store), + 1, GTK_SORT_ASCENDING); col = gtk_tree_view_column_new_with_attributes (_("Icon"), rend, @@ -602,10 +602,7 @@ g_object_unref(G_OBJECT(smiley_theme_store)); gtk_container_add(GTK_CONTAINER(sw), view); - g_signal_connect (G_OBJECT (sel), "changed", - G_CALLBACK (smiley_sel), - NULL); - + g_signal_connect(G_OBJECT(sel), "changed", G_CALLBACK(smiley_sel), NULL); gtk_widget_show_all(ret); return ret;