X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Faddressadd.c;h=514ed72ce0f50759a17aba3db3795f27b74d9c66;hp=c67e56cc118cf4ba318794ea90e8aea03196a6e7;hb=a8af6b47766497c4810c71c0f16184b92714d6b9;hpb=8ff41787fcc462ac47c52efe1fb36d97f62e54d6;ds=sidebyside

diff --git a/src/addressadd.c b/src/addressadd.c
index c67e56cc1..514ed72ce 100644
--- a/src/addressadd.c
+++ b/src/addressadd.c
@@ -113,14 +113,15 @@ static void addressadd_cancel( GtkWidget *widget, gboolean *cancelled ) {
 	gtk_main_quit();
 }
 
-static void addressadd_folder_select( GtkCTree *ctree, gint row, gint column,
-					GdkEvent *event, gpointer data )
+static void addressadd_folder_select( GtkCTree *ctree, GtkCTreeNode *node,
+				      gint column, gpointer data )
 {
-	addressadd_dlg.fiSelected = gtk_clist_get_row_data( GTK_CLIST(ctree), row );
+	addressadd_dlg.fiSelected = gtk_ctree_node_get_row_data( ctree, node );
 }
 
 static gboolean addressadd_tree_button( GtkCTree *ctree, GdkEventButton *event, gpointer data ) {
-	if( ! event ) return FALSE;
+	if( ! event )
+		return FALSE;
 	if( event->button == 1 ) {
 		/* Handle double click */
 		if( event->type == GDK_2BUTTON_PRESS ) {
@@ -159,6 +160,7 @@ static void addressadd_create( void ) {
 	GtkWidget *cancel_btn;
 	gint top;
 	static GdkGeometry geometry;
+	gchar *titles[1];
 
 	window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "addressadd");
 	gtk_container_set_border_width( GTK_CONTAINER(window), VBOX_BORDER );
@@ -235,13 +237,22 @@ static void addressadd_create( void ) {
 				        GTK_POLICY_AUTOMATIC );
 	gtk_box_pack_start( GTK_BOX(vlbox), tree_win, TRUE, TRUE, 0 );
 
-	tree_folder = gtk_ctree_new( 1, 0 );
+	titles[0] = _( "Select Address Book Folder") ;
+
+	tree_folder = gtk_sctree_new_with_titles( 1, 0, titles );
 	gtk_container_add( GTK_CONTAINER(tree_win), tree_folder );
 	gtk_clist_column_titles_show( GTK_CLIST(tree_folder) );
-	gtk_clist_set_column_title( GTK_CLIST(tree_folder), 0, _( "Select Address Book Folder" ) );
-	gtk_ctree_set_line_style( GTK_CTREE(tree_folder), GTK_CTREE_LINES_DOTTED );
+	if (prefs_common.enable_dotted_lines) {
+		gtk_ctree_set_line_style(GTK_CTREE(tree_folder), GTK_CTREE_LINES_DOTTED);
+		gtk_ctree_set_expander_style(GTK_CTREE(tree_folder),
+				     GTK_CTREE_EXPANDER_SQUARE);
+	} else {
+		gtk_ctree_set_line_style(GTK_CTREE(tree_folder), GTK_CTREE_LINES_NONE);
+		gtk_ctree_set_expander_style(GTK_CTREE(tree_folder),
+				     GTK_CTREE_EXPANDER_TRIANGLE);
+	}
+	gtk_sctree_set_stripes(GTK_SCTREE(tree_folder), prefs_common.use_stripes_everywhere);
 	gtk_clist_set_selection_mode( GTK_CLIST(tree_folder), GTK_SELECTION_BROWSE );
-	gtk_ctree_set_expander_style( GTK_CTREE(tree_folder), GTK_CTREE_EXPANDER_SQUARE );
 	gtk_ctree_set_indent( GTK_CTREE(tree_folder), CTREE_INDENT );
 	gtk_clist_set_auto_sort( GTK_CLIST(tree_folder), TRUE );
 
@@ -257,7 +268,7 @@ static void addressadd_create( void ) {
 			 G_CALLBACK(addressadd_ok), NULL);
 	g_signal_connect(G_OBJECT(cancel_btn), "clicked",
 			 G_CALLBACK(addressadd_cancel), NULL);
-	g_signal_connect(G_OBJECT(tree_folder), "select_row",
+	g_signal_connect(G_OBJECT(tree_folder), "tree_select_row",
 			 G_CALLBACK(addressadd_folder_select), NULL);
 	g_signal_connect(G_OBJECT(tree_folder), "button_press_event",
 			 G_CALLBACK(addressadd_tree_button), NULL);