Revision 2303

src/addressbook.c (revision 2303)
633 633
	gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
634 634
	gtk_tree_view_set_expander_column(GTK_TREE_VIEW(treeview), column);
635 635

  
636
	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(tree_store),
637
					     COL_FOLDER_NAME,
638
					     GTK_SORT_ASCENDING);
639

  
636 640
	g_signal_connect(G_OBJECT(selection), "changed",
637 641
			 G_CALLBACK(addressbook_tree_selection_changed), NULL);
638 642
	g_signal_connect(G_OBJECT(treeview), "button_press_event",
......
708 712
	gtk_tree_view_column_set_resizable(column, TRUE);
709 713
	gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column);
710 714

  
715
	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(list_store),
716
					     COL_NAME, GTK_SORT_ASCENDING);
717

  
711 718
	g_signal_connect(G_OBJECT(selection), "changed",
712 719
			 G_CALLBACK(addressbook_list_selection_changed), NULL);
713 720
	g_signal_connect(G_OBJECT(listview), "button_press_event",
......
3204 3211
				     GtkTreeIter *b, gpointer data)
3205 3212
{
3206 3213
	gchar *name1 = NULL, *name2 = NULL;
3214
	AddressObject *obj1 = NULL, *obj2 = NULL;
3207 3215
	gint ret;
3208 3216

  
3209
	gtk_tree_model_get(model, a, COL_FOLDER_NAME, &name1, -1);
3210
	gtk_tree_model_get(model, b, COL_FOLDER_NAME, &name2, -1);
3217
	gtk_tree_model_get(model, a, COL_FOLDER_NAME, &name1, COL_OBJ, &obj1,
3218
			   -1);
3219
	gtk_tree_model_get(model, b, COL_FOLDER_NAME, &name2, COL_OBJ, &obj2,
3220
			   -1);
3211 3221

  
3222
	/* Do not sort toplevel row */
3223
	if (obj1 && obj1->type == ADDR_INTERFACE)
3224
		return 0;
3225

  
3212 3226
	if (!name1 || !name2) {
3213 3227
		if (!name1)
3214 3228
			ret = (name2 != NULL);
ChangeLog (revision 2303)
1 1
2009-10-28
2 2

  
3
	* src/addressbook.c: automatically sort the tree and list.
4

  
5
2009-10-28
6

  
3 7
	* src/addressbook.c: don't change selection when the list is right-
4 8
	  clicked.
5 9

  

Also available in: Unified diff