2008-08-04 [colin] 3.5.0cvs48
authorColin Leroy <colin@colino.net>
Tue, 5 Aug 2008 01:36:42 +0000 (01:36 +0000)
committerColin Leroy <colin@colino.net>
Tue, 5 Aug 2008 01:36:42 +0000 (01:36 +0000)
* src/addressadd.c
* src/addressbook.c
* src/addressbook_foldersel.c
* src/addressitem.h
* src/addrgather.c
* src/browseldap.c
* src/compose.c
* src/compose.h
* src/editaddress.c
* src/editaddress_other_attributes_ldap.c
* src/editgroup.c
* src/editldap_basedn.c
* src/folderview.c
* src/folderview.h
* src/grouplistdialog.c
* src/image_viewer.c
* src/imap_gtk.c
* src/importldif.c
* src/main.c
* src/mainwindow.c
* src/message_search.c
* src/mh_gtk.c
* src/mimeview.c
* src/mimeview.h
* src/news_gtk.c
* src/noticeview.h
* src/prefs_account.c
* src/prefs_filtering_action.c
* src/prefs_matcher.c
* src/prefs_msg_colors.c
* src/prefs_summaries.c
* src/statusbar.c
* src/stock_pixmap.c
* src/summary_search.c
* src/summaryview.c
* src/summaryview.h
* src/textview.c
* src/toolbar.h
* src/gtk/Makefile.am
* src/gtk/claws-marshal.list
* src/gtk/colorsel.c
* src/gtk/foldersort.c
* src/gtk/gtkaspell.c
* src/gtk/gtkcmclist.c
* src/gtk/gtkcmclist.h
* src/gtk/gtkcmctree.c
* src/gtk/gtkcmctree.h
* src/gtk/gtksctree.c
* src/gtk/gtksctree.h
* src/gtk/gtkutils.c
* src/gtk/gtkutils.h
* src/gtk/gtkvscrollbutton.c
* src/gtk/menu.c
* src/gtk/menu.h
* src/gtk/quicksearch.c
* src/plugins/dillo_viewer/dillo_viewer.c
* src/plugins/pgpcore/select-keys.c
Include GtkCList/GtkCTree locally (renamed GTKCMCList/CTree)
Undeprecate their implementation (GtkArg, GtkType, ...)
Undeprecate a few other things here and there
Add -DGTK_DISABLE_DEPRECATED to CFLAGS in maintainer mode
Add #undef GTK_DISABLE_DEPRECATED in the files where we
still have work to do

31 files changed:
src/compose.h
src/editaddress.c
src/editaddress_other_attributes_ldap.c
src/editgroup.c
src/editldap_basedn.c
src/folderview.c
src/folderview.h
src/grouplistdialog.c
src/image_viewer.c
src/imap_gtk.c
src/importldif.c
src/main.c
src/mainwindow.c
src/message_search.c
src/mh_gtk.c
src/mimeview.c
src/mimeview.h
src/news_gtk.c
src/noticeview.h
src/prefs_account.c
src/prefs_filtering_action.c
src/prefs_matcher.c
src/prefs_msg_colors.c
src/prefs_summaries.c
src/statusbar.c
src/stock_pixmap.c
src/summary_search.c
src/summaryview.c
src/summaryview.h
src/textview.c
src/toolbar.h

index 53b37c8..98e5da6 100644 (file)
@@ -122,7 +122,9 @@ struct _Compose
        GtkWidget *scrolledwin;
        GtkWidget *text;
        GtkWidget *from_name;
+#if !GTK_CHECK_VERSION(2,12,0)
        GtkTooltips *tooltips;
+#endif
 
        GtkWidget *focused_editable;
 
index 1c782d8..b2f1981 100644 (file)
@@ -297,7 +297,7 @@ static void edit_person_switch_page( GtkNotebook *notebook, GtkNotebookPage *pag
 */
 static void edit_person_load_email( ItemPerson *person ) {
        GList *node = person->listEMail;
-       GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+       GtkCMCList *clist = GTK_CMCLIST(personeditdlg.clist_email);
        gchar *text[ EMAIL_N_COLS ];
        while( node ) {
                ItemEMail *emorig = ( ItemEMail * ) node->data;
@@ -308,14 +308,14 @@ static void edit_person_load_email( ItemPerson *person ) {
                text[ EMAIL_COL_ALIAS   ] = email->obj.name;
                text[ EMAIL_COL_REMARKS ] = email->remarks;
 #endif
-               row = gtk_clist_append( clist, text );
-               gtk_clist_set_row_data( clist, row, email );
+               row = gtk_cmclist_append( clist, text );
+               gtk_cmclist_set_row_data( clist, row, email );
                node = g_list_next( node );
        }
 }
 
-static void edit_person_email_list_selected( GtkCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
-       ItemEMail *email = gtk_clist_get_row_data( clist, row );
+static void edit_person_email_list_selected( GtkCMCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
+       ItemEMail *email = gtk_cmclist_get_row_data( clist, row );
        if( email ) {
                if( email->address )
                        gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_email), email->address );
@@ -326,7 +326,7 @@ static void edit_person_email_list_selected( GtkCList *clist, gint row, gint col
                if (!personeditdlg.read_only) {
                        gtk_widget_set_sensitive(personeditdlg.email_del, TRUE);
                        gtk_widget_set_sensitive(personeditdlg.email_up, row > 0);
-                       gtk_widget_set_sensitive(personeditdlg.email_down, gtk_clist_get_row_data(clist, row + 1) != NULL);
+                       gtk_widget_set_sensitive(personeditdlg.email_down, gtk_cmclist_get_row_data(clist, row + 1) != NULL);
                }
        } else {
                gtk_widget_set_sensitive(personeditdlg.email_del, FALSE);
@@ -338,15 +338,15 @@ static void edit_person_email_list_selected( GtkCList *clist, gint row, gint col
 }
 
 static void edit_person_email_move( gint dir ) {
-       GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+       GtkCMCList *clist = GTK_CMCLIST(personeditdlg.clist_email);
        gint row = personeditdlg.rowIndEMail + dir;
-       ItemEMail *email = gtk_clist_get_row_data( clist, row );
+       ItemEMail *email = gtk_cmclist_get_row_data( clist, row );
        if( email ) {
-               gtk_clist_row_move( clist, personeditdlg.rowIndEMail, row );
+               gtk_cmclist_row_move( clist, personeditdlg.rowIndEMail, row );
                personeditdlg.rowIndEMail = row;
                if (!personeditdlg.read_only) {
                        gtk_widget_set_sensitive(personeditdlg.email_up, row > 0);
-                       gtk_widget_set_sensitive(personeditdlg.email_down, gtk_clist_get_row_data(clist, row + 1) != NULL);
+                       gtk_widget_set_sensitive(personeditdlg.email_down, gtk_cmclist_get_row_data(clist, row + 1) != NULL);
                }
        } else {
                gtk_widget_set_sensitive(personeditdlg.email_up, FALSE);
@@ -365,26 +365,26 @@ static void edit_person_email_move_down( gpointer data ) {
 }
 
 static void edit_person_email_delete( gpointer data ) {
-       GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+       GtkCMCList *clist = GTK_CMCLIST(personeditdlg.clist_email);
        gint row = personeditdlg.rowIndEMail;
-       ItemEMail *email = gtk_clist_get_row_data( clist, row );
+       ItemEMail *email = gtk_cmclist_get_row_data( clist, row );
        edit_person_email_clear( NULL );
        if( email ) {
                /* Remove list entry */
-               gtk_clist_remove( clist, row );
+               gtk_cmclist_remove( clist, row );
                addritem_free_item_email( email );
                email = NULL;
        }
 
        /* Position hilite bar */
-       email = gtk_clist_get_row_data( clist, row );
+       email = gtk_cmclist_get_row_data( clist, row );
        if( ! email ) {
                personeditdlg.rowIndEMail = -1 + row;
        }
        if (!personeditdlg.read_only) {
-               gtk_widget_set_sensitive(personeditdlg.email_del, gtk_clist_get_row_data(clist, 0) != NULL);
-               gtk_widget_set_sensitive(personeditdlg.email_up, gtk_clist_get_row_data(clist, personeditdlg.rowIndEMail + 1) != NULL);
-               gtk_widget_set_sensitive(personeditdlg.email_down, gtk_clist_get_row_data(clist, personeditdlg.rowIndEMail - 1) != NULL);
+               gtk_widget_set_sensitive(personeditdlg.email_del, gtk_cmclist_get_row_data(clist, 0) != NULL);
+               gtk_widget_set_sensitive(personeditdlg.email_up, gtk_cmclist_get_row_data(clist, personeditdlg.rowIndEMail + 1) != NULL);
+               gtk_widget_set_sensitive(personeditdlg.email_down, gtk_cmclist_get_row_data(clist, personeditdlg.rowIndEMail - 1) != NULL);
        }
        edit_person_status_show( NULL );
 }
@@ -423,26 +423,26 @@ static ItemEMail *edit_person_email_edit( gboolean *error, ItemEMail *email ) {
 
 static void edit_person_email_modify( gpointer data ) {
        gboolean errFlg = FALSE;
-       GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+       GtkCMCList *clist = GTK_CMCLIST(personeditdlg.clist_email);
        gint row = personeditdlg.rowIndEMail;
-       ItemEMail *email = gtk_clist_get_row_data( clist, row );
+       ItemEMail *email = gtk_cmclist_get_row_data( clist, row );
        if( email ) {
                edit_person_email_edit( &errFlg, email );
                if( ! errFlg ) {
-                       gtk_clist_set_text( clist, row, EMAIL_COL_EMAIL, email->address );
-                       gtk_clist_set_text( clist, row, EMAIL_COL_ALIAS, email->obj.name );
-                       gtk_clist_set_text( clist, row, EMAIL_COL_REMARKS, email->remarks );
+                       gtk_cmclist_set_text( clist, row, EMAIL_COL_EMAIL, email->address );
+                       gtk_cmclist_set_text( clist, row, EMAIL_COL_ALIAS, email->obj.name );
+                       gtk_cmclist_set_text( clist, row, EMAIL_COL_REMARKS, email->remarks );
                        edit_person_email_clear( NULL );
                }
        }
 }
 
 static void edit_person_email_add( gpointer data ) {
-       GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+       GtkCMCList *clist = GTK_CMCLIST(personeditdlg.clist_email);
        gboolean errFlg = FALSE;
        ItemEMail *email = NULL;
        gint row = personeditdlg.rowIndEMail;
-       if( gtk_clist_get_row_data( clist, row ) == NULL ) row = 0;
+       if( gtk_cmclist_get_row_data( clist, row ) == NULL ) row = 0;
 
        email = edit_person_email_edit( &errFlg, NULL );
        if( ! errFlg ) {
@@ -452,9 +452,9 @@ static void edit_person_email_add( gpointer data ) {
                text[ EMAIL_COL_ALIAS   ] = email->obj.name;
                text[ EMAIL_COL_REMARKS ] = email->remarks;
 #endif
-               row = gtk_clist_insert( clist, 1 + row, text );
-               gtk_clist_set_row_data( clist, row, email );
-               gtk_clist_select_row( clist, row, 0 );
+               row = gtk_cmclist_insert( clist, 1 + row, text );
+               gtk_cmclist_set_row_data( clist, row, email );
+               gtk_cmclist_select_row( clist, row, 0 );
                edit_person_email_clear( NULL );
        }
 }
@@ -464,10 +464,10 @@ static void edit_person_email_add( gpointer data ) {
 * address index widget.
 */
 static gint edit_person_attrib_compare_func(
-       GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
+       GtkCMCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
 {
-       GtkCell *cell1 = ((GtkCListRow *)ptr1)->cell;
-       GtkCell *cell2 = ((GtkCListRow *)ptr2)->cell;
+       GtkCMCell *cell1 = ((GtkCMCListRow *)ptr1)->cell;
+       GtkCMCell *cell2 = ((GtkCMCListRow *)ptr2)->cell;
        gchar *name1 = NULL, *name2 = NULL;
 
        if( cell1 ) name1 = cell1->u.text;
@@ -479,12 +479,12 @@ static gint edit_person_attrib_compare_func(
 
 static gboolean list_find_attribute(const gchar *attr)
 {
-       GtkCList *clist = GTK_CLIST(personeditdlg.clist_attrib);
+       GtkCMCList *clist = GTK_CMCLIST(personeditdlg.clist_attrib);
        UserAttribute *attrib;
        gint row = 0;
-       while( (attrib = gtk_clist_get_row_data( clist, row )) ) {
+       while( (attrib = gtk_cmclist_get_row_data( clist, row )) ) {
                if (!g_ascii_strcasecmp(attrib->name, attr)) {
-                       gtk_clist_select_row(clist, row, 0);
+                       gtk_cmclist_select_row(clist, row, 0);
                        return TRUE;
                }
                row++;
@@ -494,12 +494,12 @@ static gboolean list_find_attribute(const gchar *attr)
 
 static gboolean list_find_email(const gchar *addr)
 {
-       GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+       GtkCMCList *clist = GTK_CMCLIST(personeditdlg.clist_email);
        ItemEMail *email;
        gint row = 0;
-       while( (email = gtk_clist_get_row_data( clist, row )) ) {
+       while( (email = gtk_cmclist_get_row_data( clist, row )) ) {
                if (!g_ascii_strcasecmp(email->address, addr)) {
-                       gtk_clist_select_row(clist, row, 0);
+                       gtk_cmclist_select_row(clist, row, 0);
                        return TRUE;
                }
                row++;
@@ -512,7 +512,7 @@ static gboolean list_find_email(const gchar *addr)
 */
 static void edit_person_load_attrib( ItemPerson *person ) {
        GList *node = person->listAttrib;
-       GtkCList *clist = GTK_CLIST(personeditdlg.clist_attrib);
+       GtkCMCList *clist = GTK_CMCLIST(personeditdlg.clist_attrib);
        gchar *text[ ATTRIB_N_COLS ];
        while( node ) {
                UserAttribute *atorig = ( UserAttribute * ) node->data;
@@ -522,14 +522,14 @@ static void edit_person_load_attrib( ItemPerson *person ) {
                text[ ATTRIB_COL_NAME  ] = attrib->name;
                text[ ATTRIB_COL_VALUE ] = attrib->value;
 
-               row = gtk_clist_append( clist, text );
-               gtk_clist_set_row_data( clist, row, attrib );
+               row = gtk_cmclist_append( clist, text );
+               gtk_cmclist_set_row_data( clist, row, attrib );
                node = g_list_next( node );
        }
 }
 
-static void edit_person_attrib_list_selected( GtkCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
-       UserAttribute *attrib = gtk_clist_get_row_data( clist, row );
+static void edit_person_attrib_list_selected( GtkCMCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
+       UserAttribute *attrib = gtk_cmclist_get_row_data( clist, row );
        if( attrib && !personeditdlg.read_only && !personeditdlg.ldap ) {
                gtk_entry_set_text( GTK_ENTRY(GTK_BIN(personeditdlg.entry_atname)->child ), attrib->name );
                gtk_entry_set_text( GTK_ENTRY(personeditdlg.entry_atvalue), attrib->value );
@@ -542,25 +542,25 @@ static void edit_person_attrib_list_selected( GtkCList *clist, gint row, gint co
 }
 
 static void edit_person_attrib_delete( gpointer data ) {
-       GtkCList *clist = GTK_CLIST(personeditdlg.clist_attrib);
+       GtkCMCList *clist = GTK_CMCLIST(personeditdlg.clist_attrib);
        gint row = personeditdlg.rowIndAttrib;
-       UserAttribute *attrib = gtk_clist_get_row_data( clist, row );
+       UserAttribute *attrib = gtk_cmclist_get_row_data( clist, row );
        edit_person_attrib_clear( NULL );
        if( attrib ) {
                /* Remove list entry */
-               gtk_clist_remove( clist, row );
+               gtk_cmclist_remove( clist, row );
                addritem_free_attribute( attrib );
                attrib = NULL;
        }
 
        /* Position hilite bar */
-       attrib = gtk_clist_get_row_data( clist, row );
+       attrib = gtk_cmclist_get_row_data( clist, row );
        if( ! attrib ) {
                personeditdlg.rowIndAttrib = -1 + row;
        } 
        
        if (!personeditdlg.read_only && !personeditdlg.ldap)
-               gtk_widget_set_sensitive(personeditdlg.attrib_del, gtk_clist_get_row_data(clist, 0) != NULL);
+               gtk_widget_set_sensitive(personeditdlg.attrib_del, gtk_cmclist_get_row_data(clist, 0) != NULL);
        
        edit_person_status_show( NULL );
 }
@@ -598,25 +598,25 @@ static UserAttribute *edit_person_attrib_edit( gboolean *error, UserAttribute *a
 
 static void edit_person_attrib_modify( gpointer data ) {
        gboolean errFlg = FALSE;
-       GtkCList *clist = GTK_CLIST(personeditdlg.clist_attrib);
+       GtkCMCList *clist = GTK_CMCLIST(personeditdlg.clist_attrib);
        gint row = personeditdlg.rowIndAttrib;
-       UserAttribute *attrib = gtk_clist_get_row_data( clist, row );
+       UserAttribute *attrib = gtk_cmclist_get_row_data( clist, row );
        if( attrib ) {
                edit_person_attrib_edit( &errFlg, attrib );
                if( ! errFlg ) {
-                       gtk_clist_set_text( clist, row, ATTRIB_COL_NAME, attrib->name );
-                       gtk_clist_set_text( clist, row, ATTRIB_COL_VALUE, attrib->value );
+                       gtk_cmclist_set_text( clist, row, ATTRIB_COL_NAME, attrib->name );
+                       gtk_cmclist_set_text( clist, row, ATTRIB_COL_VALUE, attrib->value );
                        edit_person_attrib_clear( NULL );
                }
        }
 }
 
 static void edit_person_attrib_add( gpointer data ) {
-       GtkCList *clist = GTK_CLIST(personeditdlg.clist_attrib);
+       GtkCMCList *clist = GTK_CMCLIST(personeditdlg.clist_attrib);
        gboolean errFlg = FALSE;
        UserAttribute *attrib = NULL;
        gint row = personeditdlg.rowIndAttrib;
-       if( gtk_clist_get_row_data( clist, row ) == NULL ) row = 0;
+       if( gtk_cmclist_get_row_data( clist, row ) == NULL ) row = 0;
 
        attrib = edit_person_attrib_edit( &errFlg, NULL );
        if( ! errFlg ) {
@@ -624,9 +624,9 @@ static void edit_person_attrib_add( gpointer data ) {
                text[ ATTRIB_COL_NAME  ] = attrib->name;
                text[ ATTRIB_COL_VALUE ] = attrib->value;
 
-               row = gtk_clist_insert( clist, 1 + row, text );
-               gtk_clist_set_row_data( clist, row, attrib );
-               gtk_clist_select_row( clist, row, 0 );
+               row = gtk_cmclist_insert( clist, 1 + row, text );
+               gtk_cmclist_set_row_data( clist, row, attrib );
+               gtk_cmclist_select_row( clist, row, 0 );
                edit_person_attrib_clear( NULL );
        }
 }
@@ -1000,7 +1000,7 @@ static gboolean email_adding = FALSE, email_saving = FALSE;
 
 static void edit_person_entry_email_changed (GtkWidget *entry, gpointer data)
 {
-       gboolean non_empty = gtk_clist_get_row_data(GTK_CLIST(personeditdlg.clist_email), 0) != NULL;
+       gboolean non_empty = gtk_cmclist_get_row_data(GTK_CMCLIST(personeditdlg.clist_email), 0) != NULL;
 
        if (personeditdlg.read_only)
                return;
@@ -1090,15 +1090,15 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
 
-       clist = gtk_clist_new_with_titles( EMAIL_N_COLS, titles );
+       clist = gtk_cmclist_new_with_titles( EMAIL_N_COLS, titles );
 
        gtk_container_add( GTK_CONTAINER(clist_swin), clist );
-       gtk_clist_set_selection_mode( GTK_CLIST(clist), GTK_SELECTION_BROWSE );
-       gtk_clist_set_column_width( GTK_CLIST(clist), EMAIL_COL_EMAIL, EMAIL_COL_WIDTH_EMAIL );
-       gtk_clist_set_column_width( GTK_CLIST(clist), EMAIL_COL_ALIAS, EMAIL_COL_WIDTH_ALIAS );
+       gtk_cmclist_set_selection_mode( GTK_CMCLIST(clist), GTK_SELECTION_BROWSE );
+       gtk_cmclist_set_column_width( GTK_CMCLIST(clist), EMAIL_COL_EMAIL, EMAIL_COL_WIDTH_EMAIL );
+       gtk_cmclist_set_column_width( GTK_CMCLIST(clist), EMAIL_COL_ALIAS, EMAIL_COL_WIDTH_ALIAS );
 
        for( i = 0; i < EMAIL_N_COLS; i++ )
-               GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button, GTK_CAN_FOCUS);
+               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(clist)->column[i].button, GTK_CAN_FOCUS);
 
        /* Data entry area */
        table = gtk_table_new( 4, 2, FALSE);
@@ -1109,7 +1109,7 @@ static void addressbook_edit_person_page_email( gint pageNum, gchar *pageLbl ) {
 #else
        gtk_box_pack_start(GTK_BOX(vboxl), table, FALSE, FALSE, 0);
        gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
-       gtk_clist_column_titles_hide(GTK_CLIST(clist));
+       gtk_cmclist_column_titles_hide(GTK_CMCLIST(clist));
 #endif
        gtk_container_set_border_width( GTK_CONTAINER(table), 4 );
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
@@ -1213,7 +1213,7 @@ static gboolean attrib_adding = FALSE, attrib_saving = FALSE;
 
 static void edit_person_entry_att_changed (GtkWidget *entry, gpointer data)
 {
-       gboolean non_empty = gtk_clist_get_row_data(GTK_CLIST(personeditdlg.clist_attrib), 0) != NULL;
+       gboolean non_empty = gtk_cmclist_get_row_data(GTK_CMCLIST(personeditdlg.clist_attrib), 0) != NULL;
        const gchar *atname;
 
        if (personeditdlg.read_only || personeditdlg.ldap)
@@ -1299,16 +1299,16 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
 
-       clist = gtk_clist_new_with_titles( ATTRIB_N_COLS, titles );
+       clist = gtk_cmclist_new_with_titles( ATTRIB_N_COLS, titles );
        gtk_container_add( GTK_CONTAINER(clist_swin), clist );
-       gtk_clist_set_selection_mode( GTK_CLIST(clist), GTK_SELECTION_BROWSE );
-       gtk_clist_set_compare_func( GTK_CLIST(clist), edit_person_attrib_compare_func );
-       gtk_clist_set_auto_sort( GTK_CLIST(clist), TRUE );
-       gtk_clist_set_column_width( GTK_CLIST(clist), ATTRIB_COL_NAME, ATTRIB_COL_WIDTH_NAME );
-       gtk_clist_set_column_width( GTK_CLIST(clist), ATTRIB_COL_VALUE, ATTRIB_COL_WIDTH_VALUE );
+       gtk_cmclist_set_selection_mode( GTK_CMCLIST(clist), GTK_SELECTION_BROWSE );
+       gtk_cmclist_set_compare_func( GTK_CMCLIST(clist), edit_person_attrib_compare_func );
+       gtk_cmclist_set_auto_sort( GTK_CMCLIST(clist), TRUE );
+       gtk_cmclist_set_column_width( GTK_CMCLIST(clist), ATTRIB_COL_NAME, ATTRIB_COL_WIDTH_NAME );
+       gtk_cmclist_set_column_width( GTK_CMCLIST(clist), ATTRIB_COL_VALUE, ATTRIB_COL_WIDTH_VALUE );
 
        for( i = 0; i < ATTRIB_N_COLS; i++ )
-               GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button, GTK_CAN_FOCUS);
+               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(clist)->column[i].button, GTK_CAN_FOCUS);
 
        /* Data entry area */
 #ifndef GENERIC_UMPC
@@ -1319,7 +1319,7 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
        table = gtk_table_new( 2, 4, FALSE);
        gtk_box_pack_start(GTK_BOX(vboxl), table, FALSE, FALSE, 0);
        gtk_container_add( GTK_CONTAINER(vboxl), clist_swin );
-       gtk_clist_column_titles_hide(GTK_CLIST(clist));
+       gtk_cmclist_column_titles_hide(GTK_CMCLIST(clist));
 #endif
        gtk_container_set_border_width( GTK_CONTAINER(table), 4 );
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
@@ -1435,11 +1435,11 @@ static void addressbook_edit_person_create( GtkWidget *parent, gboolean *cancell
 * Return list of email items.
 */
 static GList *edit_person_build_email_list() {
-       GtkCList *clist = GTK_CLIST(personeditdlg.clist_email);
+       GtkCMCList *clist = GTK_CMCLIST(personeditdlg.clist_email);
        GList *listEMail = NULL;
        ItemEMail *email;
        gint row = 0;
-       while( (email = gtk_clist_get_row_data( clist, row )) ) {
+       while( (email = gtk_cmclist_get_row_data( clist, row )) ) {
                listEMail = g_list_append( listEMail, email );
                row++;
        }
@@ -1450,11 +1450,11 @@ static GList *edit_person_build_email_list() {
 * Return list of attributes.
 */
 static GList *edit_person_build_attrib_list() {
-       GtkCList *clist = GTK_CLIST(personeditdlg.clist_attrib);
+       GtkCMCList *clist = GTK_CMCLIST(personeditdlg.clist_attrib);
        GList *listAttrib = NULL;
        UserAttribute *attrib;
        gint row = 0;
-       while( (attrib = gtk_clist_get_row_data( clist, row )) ) {
+       while( (attrib = gtk_cmclist_get_row_data( clist, row )) ) {
                listAttrib = g_list_append( listAttrib, attrib );
                row++;
        }
@@ -1526,8 +1526,8 @@ static gboolean addressbook_edit_person_close( gboolean cancelled )
        if( cancelled ) {
                addritem_free_list_email( listEMail );
                addritem_free_list_attribute( listAttrib );
-               gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
-               gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
+               gtk_cmclist_clear( GTK_CMCLIST(personeditdlg.clist_email) );
+               gtk_cmclist_clear( GTK_CMCLIST(personeditdlg.clist_attrib) );
 
                if (!prefs_common.addressbook_use_editaddress_dialog)
                        gtk_widget_hide( personeditdlg.container );
@@ -1608,8 +1608,8 @@ static gboolean addressbook_edit_person_close( gboolean cancelled )
                g_free( name );
        }
 
-       gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
-       gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
+       gtk_cmclist_clear( GTK_CMCLIST(personeditdlg.clist_email) );
+       gtk_cmclist_clear( GTK_CMCLIST(personeditdlg.clist_attrib) );
 
        if (!prefs_common.addressbook_use_editaddress_dialog)
                gtk_widget_hide( personeditdlg.container );
@@ -1667,8 +1667,8 @@ ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent_fo
        personeditdlg.rowIndEMail = -1;
        personeditdlg.rowIndAttrib = -1;
        edit_person_status_show( "" );
-       gtk_clist_clear( GTK_CLIST(personeditdlg.clist_email) );
-       gtk_clist_clear( GTK_CLIST(personeditdlg.clist_attrib) );
+       gtk_cmclist_clear( GTK_CMCLIST(personeditdlg.clist_email) );
+       gtk_cmclist_clear( GTK_CMCLIST(personeditdlg.clist_attrib) );
        gtk_entry_set_text(GTK_ENTRY(personeditdlg.entry_name), "" );
        gtk_entry_set_text(GTK_ENTRY(personeditdlg.entry_first), "" );
        gtk_entry_set_text(GTK_ENTRY(personeditdlg.entry_last), "" );
@@ -1733,11 +1733,11 @@ no_img:
                gtk_notebook_set_current_page( GTK_NOTEBOOK(personeditdlg.notebook), PAGE_BASIC );
        }
 
-       gtk_clist_select_row( GTK_CLIST(personeditdlg.clist_email), 0, 0 );
-       gtk_clist_select_row( GTK_CLIST(personeditdlg.clist_attrib), 0, 0 );
+       gtk_cmclist_select_row( GTK_CMCLIST(personeditdlg.clist_email), 0, 0 );
+       gtk_cmclist_select_row( GTK_CMCLIST(personeditdlg.clist_attrib), 0, 0 );
        edit_person_email_clear( NULL );
        if (current_person)
-               edit_person_email_list_selected(GTK_CLIST(personeditdlg.clist_email), 0, 0, NULL, NULL);
+               edit_person_email_list_selected(GTK_CMCLIST(personeditdlg.clist_email), 0, 0, NULL, NULL);
 
        edit_person_attrib_clear( NULL );
 
index f642851..d75e109 100644 (file)
@@ -78,12 +78,12 @@ static void edit_person_attrib_clear(gpointer data) {
 
 static gboolean list_find_attribute(const gchar *attr)
 {
-       GtkCList *clist = GTK_CLIST(personEditDlg->clist_attrib);
+       GtkCMCList *clist = GTK_CMCLIST(personEditDlg->clist_attrib);
        UserAttribute *attrib;
        gint row = 0;
-       while((attrib = gtk_clist_get_row_data(clist, row))) {
+       while((attrib = gtk_cmclist_get_row_data(clist, row))) {
                if (!g_ascii_strcasecmp(attrib->name, attr)) {
-                       gtk_clist_select_row(clist, row, 0);
+                       gtk_cmclist_select_row(clist, row, 0);
                        return TRUE;
                }
                row++;
@@ -95,9 +95,9 @@ static gboolean list_find_attribute(const gchar *attr)
 * Comparison using cell contents (text in first column). Used for sort
 * address index widget.
 */
-static gint edit_person_attrib_compare_func(GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2) {
-       GtkCell *cell1 = ((GtkCListRow *)ptr1)->cell;
-       GtkCell *cell2 = ((GtkCListRow *)ptr2)->cell;
+static gint edit_person_attrib_compare_func(GtkCMCList *clist, gconstpointer ptr1, gconstpointer ptr2) {
+       GtkCMCell *cell1 = ((GtkCMCListRow *)ptr1)->cell;
+       GtkCMCell *cell2 = ((GtkCMCListRow *)ptr2)->cell;
        gchar *name1 = NULL, *name2 = NULL;
 
        if (cell1) name1 = cell1->u.text;
@@ -109,9 +109,9 @@ static gint edit_person_attrib_compare_func(GtkCList *clist, gconstpointer ptr1,
 
 static void edit_person_combo_box_changed(GtkComboBox *opt_menu, gpointer data)
 {
-       GtkCList *clist = GTK_CLIST(data);
+       GtkCMCList *clist = GTK_CMCLIST(data);
        gint row = personEditDlg->rowIndAttrib;
-       UserAttribute *attrib = gtk_clist_get_row_data(clist, row);
+       UserAttribute *attrib = gtk_cmclist_get_row_data(clist, row);
        gint option = gtk_combo_box_get_active(opt_menu);
        const gchar *str = attrib ? attrib->name:"";
 
@@ -127,8 +127,8 @@ static void edit_person_combo_box_changed(GtkComboBox *opt_menu, gpointer data)
        }
 }
 
-static void edit_person_attrib_list_selected(GtkCList *clist, gint row, gint column, GdkEvent *event, gpointer data) {
-       UserAttribute *attrib = gtk_clist_get_row_data(clist, row);
+static void edit_person_attrib_list_selected(GtkCMCList *clist, gint row, gint column, GdkEvent *event, gpointer data) {
+       UserAttribute *attrib = gtk_cmclist_get_row_data(clist, row);
        if (attrib && !personEditDlg->read_only) {
                int index = get_attribute_index(attrib->name);
                if (index == -1)
@@ -148,25 +148,25 @@ static void edit_person_attrib_list_selected(GtkCList *clist, gint row, gint col
 }
 
 static void edit_person_attrib_delete(gpointer data) {
-       GtkCList *clist = GTK_CLIST(personEditDlg->clist_attrib);
+       GtkCMCList *clist = GTK_CMCLIST(personEditDlg->clist_attrib);
        gint row = personEditDlg->rowIndAttrib;
-       UserAttribute *attrib = gtk_clist_get_row_data(clist, row);
+       UserAttribute *attrib = gtk_cmclist_get_row_data(clist, row);
        edit_person_attrib_clear(NULL);
        if (attrib) {
                /* Remove list entry */
-               gtk_clist_remove(clist, row);
+               gtk_cmclist_remove(clist, row);
                addritem_free_attribute(attrib);
                attrib = NULL;
        }
 
        /* Position hilite bar */
-       attrib = gtk_clist_get_row_data(clist, row);
+       attrib = gtk_cmclist_get_row_data(clist, row);
        if (!attrib) {
                personEditDlg->rowIndAttrib = -1 + row;
        } 
        
        if (!personEditDlg->read_only)
-               gtk_widget_set_sensitive(personEditDlg->attrib_del, gtk_clist_get_row_data(clist, 0) != NULL);
+               gtk_widget_set_sensitive(personEditDlg->attrib_del, gtk_cmclist_get_row_data(clist, 0) != NULL);
        
        edit_person_status_show(NULL);
 }
@@ -206,25 +206,25 @@ static UserAttribute *edit_person_attrib_edit(gboolean *error, UserAttribute *at
 
 static void edit_person_attrib_modify(gpointer data) {
        gboolean errFlg = FALSE;
-       GtkCList *clist = GTK_CLIST(personEditDlg->clist_attrib);
+       GtkCMCList *clist = GTK_CMCLIST(personEditDlg->clist_attrib);
        gint row = personEditDlg->rowIndAttrib;
-       UserAttribute *attrib = gtk_clist_get_row_data(clist, row);
+       UserAttribute *attrib = gtk_cmclist_get_row_data(clist, row);
        if (attrib) {
                edit_person_attrib_edit(&errFlg, attrib);
                if (!errFlg) {
-                       gtk_clist_set_text(clist, row, ATTRIB_COL_NAME, attrib->name);
-                       gtk_clist_set_text(clist, row, ATTRIB_COL_VALUE, attrib->value);
+                       gtk_cmclist_set_text(clist, row, ATTRIB_COL_NAME, attrib->name);
+                       gtk_cmclist_set_text(clist, row, ATTRIB_COL_VALUE, attrib->value);
                        edit_person_attrib_clear(NULL);
                }
        }
 }
 
 static void edit_person_attrib_add(gpointer data) {
-       GtkCList *clist = GTK_CLIST(personEditDlg->clist_attrib);
+       GtkCMCList *clist = GTK_CMCLIST(personEditDlg->clist_attrib);
        gboolean errFlg = FALSE;
        UserAttribute *attrib = NULL;
        gint row = personEditDlg->rowIndAttrib;
-       if (gtk_clist_get_row_data(clist, row) == NULL) row = 0;
+       if (gtk_cmclist_get_row_data(clist, row) == NULL) row = 0;
 
        attrib = edit_person_attrib_edit(&errFlg, NULL);
        if (!errFlg) {
@@ -232,16 +232,16 @@ static void edit_person_attrib_add(gpointer data) {
                text[ATTRIB_COL_NAME] = attrib->name;
                text[ATTRIB_COL_VALUE] = attrib->value;
 
-               row = gtk_clist_insert(clist, 1 + row, text);
-               gtk_clist_set_row_data(clist, row, attrib);
-               gtk_clist_select_row(clist, row, 0);
+               row = gtk_cmclist_insert(clist, 1 + row, text);
+               gtk_cmclist_set_row_data(clist, row, attrib);
+               gtk_cmclist_select_row(clist, row, 0);
                edit_person_attrib_clear(NULL);
        }
 }
 
 static void edit_person_entry_att_changed (GtkWidget *entry, gpointer data)
 {
-       gboolean non_empty = gtk_clist_get_row_data(GTK_CLIST(personEditDlg->clist_attrib), 0) != NULL;
+       gboolean non_empty = gtk_cmclist_get_row_data(GTK_CMCLIST(personEditDlg->clist_attrib), 0) != NULL;
        const gchar *sName;
        int index;
 
@@ -326,16 +326,16 @@ void addressbook_edit_person_page_attrib_ldap(PersonEditDlg *dialog, gint pageNu
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(clist_swin),
                                       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
-       clist = gtk_clist_new_with_titles(ATTRIB_N_COLS, titles);
+       clist = gtk_cmclist_new_with_titles(ATTRIB_N_COLS, titles);
        gtk_container_add(GTK_CONTAINER(clist_swin), clist);
-       gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_BROWSE);
-       gtk_clist_set_column_width(GTK_CLIST(clist), ATTRIB_COL_NAME, ATTRIB_COL_WIDTH_NAME);
-       gtk_clist_set_column_width(GTK_CLIST(clist), ATTRIB_COL_VALUE, ATTRIB_COL_WIDTH_VALUE);
-       gtk_clist_set_compare_func(GTK_CLIST(clist), edit_person_attrib_compare_func);
-       gtk_clist_set_auto_sort(GTK_CLIST(clist), TRUE);
+       gtk_cmclist_set_selection_mode(GTK_CMCLIST(clist), GTK_SELECTION_BROWSE);
+       gtk_cmclist_set_column_width(GTK_CMCLIST(clist), ATTRIB_COL_NAME, ATTRIB_COL_WIDTH_NAME);
+       gtk_cmclist_set_column_width(GTK_CMCLIST(clist), ATTRIB_COL_VALUE, ATTRIB_COL_WIDTH_VALUE);
+       gtk_cmclist_set_compare_func(GTK_CMCLIST(clist), edit_person_attrib_compare_func);
+       gtk_cmclist_set_auto_sort(GTK_CMCLIST(clist), TRUE);
 
        for (i = 0; i < ATTRIB_N_COLS; i++)
-               GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist)->column[i].button, GTK_CAN_FOCUS);
+               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(clist)->column[i].button, GTK_CAN_FOCUS);
 
        /* Data entry area */
        table = gtk_table_new(4, 2, FALSE);
index aa4464e..360c8fd 100644 (file)
@@ -63,8 +63,8 @@ static struct _GroupEdit_dlg {
 
        /* Basic data tab */
        GtkWidget *entry_name;
-       GtkCList *clist_group;
-       GtkCList *clist_avail;
+       GtkCMCList *clist_group;
+       GtkCMCList *clist_avail;
 
        GHashTable *hashEMail;
 
@@ -134,7 +134,7 @@ static gchar *edit_group_format_item_clist( ItemPerson *person, ItemEMail *email
        return str;
 }
 
-static gint edit_group_clist_add_email( GtkCList *clist, ItemEMail *email ) {
+static gint edit_group_clist_add_email( GtkCMCList *clist, ItemEMail *email ) {
        ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(email);
        gchar *str = edit_group_format_item_clist( person, email );
        gchar *text[ GROUP_N_COLS ];
@@ -148,71 +148,71 @@ static gint edit_group_clist_add_email( GtkCList *clist, ItemEMail *email ) {
        text[ GROUP_COL_EMAIL   ] = email->address;
        text[ GROUP_COL_REMARKS ] = email->remarks;
 
-       row = gtk_clist_append( clist, text );
-       gtk_clist_set_row_data( clist, row, email );
+       row = gtk_cmclist_append( clist, text );
+       gtk_cmclist_set_row_data( clist, row, email );
        return row;
 }
 
-static void edit_group_load_clist( GtkCList *clist, GList *listEMail ) {
+static void edit_group_load_clist( GtkCMCList *clist, GList *listEMail ) {
        GList *node = listEMail;
-       gtk_clist_freeze(clist);
+       gtk_cmclist_freeze(clist);
        while( node ) {
                ItemEMail *email = node->data;
                edit_group_clist_add_email( clist, email );
                node = g_list_next( node );
        }
-       gtk_clist_thaw(clist);
+       gtk_cmclist_thaw(clist);
 }
 
 
-static void edit_group_move_email( GtkCList *clist_from, GtkCList *clist_to, GtkCTreeNode *node ) {
-       ItemEMail *email = gtk_ctree_node_get_row_data( GTK_CTREE(clist_from), node );
-       GtkCTreeNode *next = gtkut_ctree_node_next(GTK_CTREE(clist_from), node);
-       GtkCTreeNode *prev = gtkut_ctree_node_prev(GTK_CTREE(clist_from), node);
+static void edit_group_move_email( GtkCMCList *clist_from, GtkCMCList *clist_to, GtkCMCTreeNode *node ) {
+       ItemEMail *email = gtk_cmctree_node_get_row_data( GTK_CMCTREE(clist_from), node );
+       GtkCMCTreeNode *next = gtkut_ctree_node_next(GTK_CMCTREE(clist_from), node);
+       GtkCMCTreeNode *prev = gtkut_ctree_node_prev(GTK_CMCTREE(clist_from), node);
        int rrow = 0;
        if( email ) {
-               gtk_ctree_remove_node(GTK_CTREE(clist_from), node);
+               gtk_cmctree_remove_node(GTK_CMCTREE(clist_from), node);
                rrow = edit_group_clist_add_email( clist_to, email );
-               gtk_clist_select_row( clist_to, rrow, 0 );
+               gtk_cmclist_select_row( clist_to, rrow, 0 );
                if (next)
-                       gtk_ctree_select(GTK_CTREE(clist_from), next);
+                       gtk_cmctree_select(GTK_CMCTREE(clist_from), next);
                else if (prev)
-                       gtk_ctree_select(GTK_CTREE(clist_from), prev);
+                       gtk_cmctree_select(GTK_CMCTREE(clist_from), prev);
        }
 }
 
 static void edit_group_to_group( GtkWidget *widget, gpointer data ) {
-       GList *selected = g_list_copy(GTK_CLIST(groupeditdlg.clist_avail)->selection);
+       GList *selected = g_list_copy(GTK_CMCLIST(groupeditdlg.clist_avail)->selection);
        /* Clear the selected rows on destination clist */
-       gtk_clist_freeze(groupeditdlg.clist_avail);
-       gtk_clist_freeze(groupeditdlg.clist_group);
-       gtk_clist_unselect_all(groupeditdlg.clist_group);
+       gtk_cmclist_freeze(groupeditdlg.clist_avail);
+       gtk_cmclist_freeze(groupeditdlg.clist_group);
+       gtk_cmclist_unselect_all(groupeditdlg.clist_group);
        while (selected) {
                edit_group_move_email( groupeditdlg.clist_avail,
-                                       groupeditdlg.clist_group, GTK_CTREE_NODE(selected->data) );
+                                       groupeditdlg.clist_group, GTK_CMCTREE_NODE(selected->data) );
                selected = selected->next;
        }
        g_list_free(selected);
-       gtk_clist_thaw(groupeditdlg.clist_avail);
-       gtk_clist_thaw(groupeditdlg.clist_group);
+       gtk_cmclist_thaw(groupeditdlg.clist_avail);
+       gtk_cmclist_thaw(groupeditdlg.clist_group);
 }
 
 static void edit_group_to_avail( GtkWidget *widget, gpointer data ) {
-       GList *selected = g_list_copy(GTK_CLIST(groupeditdlg.clist_group)->selection);
-       gtk_clist_freeze(groupeditdlg.clist_avail);
-       gtk_clist_freeze(groupeditdlg.clist_group);
-       gtk_clist_unselect_all(groupeditdlg.clist_avail);
+       GList *selected = g_list_copy(GTK_CMCLIST(groupeditdlg.clist_group)->selection);
+       gtk_cmclist_freeze(groupeditdlg.clist_avail);
+       gtk_cmclist_freeze(groupeditdlg.clist_group);
+       gtk_cmclist_unselect_all(groupeditdlg.clist_avail);
        while (selected) {
                edit_group_move_email( groupeditdlg.clist_group,
-                                       groupeditdlg.clist_avail, GTK_CTREE_NODE(selected->data) );
+                                       groupeditdlg.clist_avail, GTK_CMCTREE_NODE(selected->data) );
                selected = selected->next;
        }
        g_list_free(selected);
-       gtk_clist_thaw(groupeditdlg.clist_avail);
-       gtk_clist_thaw(groupeditdlg.clist_group);
+       gtk_cmclist_thaw(groupeditdlg.clist_avail);
+       gtk_cmclist_thaw(groupeditdlg.clist_group);
 }
 
-static gboolean edit_group_list_group_button( GtkCList *clist, GdkEventButton *event, gpointer data ) {
+static gboolean edit_group_list_group_button( GtkCMCList *clist, GdkEventButton *event, gpointer data ) {
        if( ! event ) return FALSE;
 
        if( event->button == 1 ) {
@@ -223,7 +223,7 @@ static gboolean edit_group_list_group_button( GtkCList *clist, GdkEventButton *e
        return FALSE;
 }
 
-static gboolean edit_group_list_avail_button( GtkCList *clist, GdkEventButton *event, gpointer data ) {
+static gboolean edit_group_list_avail_button( GtkCMCList *clist, GdkEventButton *event, gpointer data ) {
        if( ! event ) return FALSE;
 
        if( event->button == 1 ) {
@@ -234,9 +234,9 @@ static gboolean edit_group_list_avail_button( GtkCList *clist, GdkEventButton *e
        return FALSE;
 }
 
-static gint edit_group_list_compare_func( GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 ) {
-       GtkCell *cell1 = ((GtkCListRow *)ptr1)->cell;
-       GtkCell *cell2 = ((GtkCListRow *)ptr2)->cell;
+static gint edit_group_list_compare_func( GtkCMCList *clist, gconstpointer ptr1, gconstpointer ptr2 ) {
+       GtkCMCell *cell1 = ((GtkCMCListRow *)ptr1)->cell;
+       GtkCMCell *cell2 = ((GtkCMCListRow *)ptr2)->cell;
        gchar *name1 = NULL, *name2 = NULL;
        if( cell1 ) name1 = cell1->u.text;
        if( cell2 ) name2 = cell2->u.text;
@@ -353,23 +353,23 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
        clist_group = gtk_sctree_new_with_titles( GROUP_N_COLS, GROUP_N_COLS, titles );
        gtk_container_add( GTK_CONTAINER(clist_swin), clist_group );
        if (prefs_common.enable_dotted_lines) {
-               gtk_ctree_set_line_style(GTK_CTREE(clist_group), GTK_CTREE_LINES_DOTTED);
-               gtk_ctree_set_expander_style(GTK_CTREE(clist_group),
-                                    GTK_CTREE_EXPANDER_SQUARE);
+               gtk_cmctree_set_line_style(GTK_CMCTREE(clist_group), GTK_CMCTREE_LINES_DOTTED);
+               gtk_cmctree_set_expander_style(GTK_CMCTREE(clist_group),
+                                    GTK_CMCTREE_EXPANDER_SQUARE);
        } else {
-               gtk_ctree_set_line_style(GTK_CTREE(clist_group), GTK_CTREE_LINES_NONE);
-               gtk_ctree_set_expander_style(GTK_CTREE(clist_group),
-                                    GTK_CTREE_EXPANDER_TRIANGLE);
+               gtk_cmctree_set_line_style(GTK_CMCTREE(clist_group), GTK_CMCTREE_LINES_NONE);
+               gtk_cmctree_set_expander_style(GTK_CMCTREE(clist_group),
+                                    GTK_CMCTREE_EXPANDER_TRIANGLE);
        }
        gtk_sctree_set_stripes(GTK_SCTREE(clist_group), prefs_common.use_stripes_in_summaries);
-       gtk_clist_set_selection_mode( GTK_CLIST(clist_group), GTK_SELECTION_EXTENDED );
-       gtk_clist_set_column_width( GTK_CLIST(clist_group), GROUP_COL_NAME, GROUP_COL_WIDTH_NAME );
-       gtk_clist_set_column_width( GTK_CLIST(clist_group), GROUP_COL_EMAIL, GROUP_COL_WIDTH_EMAIL );
-       gtk_clist_set_compare_func( GTK_CLIST(clist_group), edit_group_list_compare_func );
-       gtk_clist_set_auto_sort( GTK_CLIST(clist_group), TRUE );
+       gtk_cmclist_set_selection_mode( GTK_CMCLIST(clist_group), GTK_SELECTION_EXTENDED );
+       gtk_cmclist_set_column_width( GTK_CMCLIST(clist_group), GROUP_COL_NAME, GROUP_COL_WIDTH_NAME );
+       gtk_cmclist_set_column_width( GTK_CMCLIST(clist_group), GROUP_COL_EMAIL, GROUP_COL_WIDTH_EMAIL );
+       gtk_cmclist_set_compare_func( GTK_CMCLIST(clist_group), edit_group_list_compare_func );
+       gtk_cmclist_set_auto_sort( GTK_CMCLIST(clist_group), TRUE );
 
        for( i = 0; i < GROUP_N_COLS; i++ )
-               GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist_group)->column[i].button, GTK_CAN_FOCUS);
+               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(clist_group)->column[i].button, GTK_CAN_FOCUS);
 
        /* Available list */
        vboxl = gtk_vbox_new( FALSE, 0 );
@@ -391,14 +391,14 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
 
        clist_avail = gtk_sctree_new_with_titles( GROUP_N_COLS, GROUP_N_COLS, titles );
        gtk_container_add( GTK_CONTAINER(clist_swin), clist_avail );
-       gtk_clist_set_selection_mode( GTK_CLIST(clist_avail), GTK_SELECTION_EXTENDED );
-       gtk_clist_set_column_width( GTK_CLIST(clist_avail), GROUP_COL_NAME, GROUP_COL_WIDTH_NAME );
-       gtk_clist_set_column_width( GTK_CLIST(clist_avail), GROUP_COL_EMAIL, GROUP_COL_WIDTH_EMAIL );
-       gtk_clist_set_compare_func( GTK_CLIST(clist_avail), edit_group_list_compare_func );
-       gtk_clist_set_auto_sort( GTK_CLIST(clist_avail), TRUE );
+       gtk_cmclist_set_selection_mode( GTK_CMCLIST(clist_avail), GTK_SELECTION_EXTENDED );
+       gtk_cmclist_set_column_width( GTK_CMCLIST(clist_avail), GROUP_COL_NAME, GROUP_COL_WIDTH_NAME );
+       gtk_cmclist_set_column_width( GTK_CMCLIST(clist_avail), GROUP_COL_EMAIL, GROUP_COL_WIDTH_EMAIL );
+       gtk_cmclist_set_compare_func( GTK_CMCLIST(clist_avail), edit_group_list_compare_func );
+       gtk_cmclist_set_auto_sort( GTK_CMCLIST(clist_avail), TRUE );
 
        for( i = 0; i < GROUP_N_COLS; i++ )
-               GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(clist_avail)->column[i].button, GTK_CAN_FOCUS);
+               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(clist_avail)->column[i].button, GTK_CAN_FOCUS);
 
        /* Status line */
        hsbox = gtk_hbox_new(FALSE, 0);
@@ -448,8 +448,8 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
        groupeditdlg.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Edit Group Dialog" );
 
        groupeditdlg.entry_name  = entry_name;
-       groupeditdlg.clist_group = GTK_CLIST( clist_group );
-       groupeditdlg.clist_avail = GTK_CLIST( clist_avail );
+       groupeditdlg.clist_group = GTK_CMCLIST( clist_group );
+       groupeditdlg.clist_avail = GTK_CMCLIST( clist_avail );
 
        if( ! _edit_group_dfl_message_ ) {
                _edit_group_dfl_message_ = _( "Move Email Addresses to or from Group with arrow buttons" );
@@ -460,11 +460,11 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
 * Return list of email items.
 */
 static GList *edit_group_build_email_list() {
-       GtkCList *clist = GTK_CLIST(groupeditdlg.clist_group);
+       GtkCMCList *clist = GTK_CMCLIST(groupeditdlg.clist_group);
        GList *listEMail = NULL;
        ItemEMail *email;
        gint row = 0;
-       while( (email = gtk_clist_get_row_data( clist, row )) ) {
+       while( (email = gtk_cmclist_get_row_data( clist, row )) ) {
                listEMail = g_list_append( listEMail, email );
                row++;
        }
@@ -493,8 +493,8 @@ ItemGroup *addressbook_edit_group( AddressBookFile *abf, ItemFolder *parent, Ite
 
        /* Clear all fields */
        edit_group_status_show( "" );
-       gtk_clist_clear( GTK_CLIST(groupeditdlg.clist_group) );
-       gtk_clist_clear( GTK_CLIST(groupeditdlg.clist_avail) );
+       gtk_cmclist_clear( GTK_CMCLIST(groupeditdlg.clist_group) );
+       gtk_cmclist_clear( GTK_CMCLIST(groupeditdlg.clist_avail) );
 
        if( group ) {
                if( ADDRITEM_NAME(group) )
@@ -511,8 +511,8 @@ ItemGroup *addressbook_edit_group( AddressBookFile *abf, ItemFolder *parent, Ite
        edit_group_load_clist( groupeditdlg.clist_avail, listEMail );
        mgu_clear_list( listEMail );
        listEMail = NULL;
-       gtk_clist_select_row( groupeditdlg.clist_group, 0, 0 );
-       gtk_clist_select_row( groupeditdlg.clist_avail, 0, 0 );
+       gtk_cmclist_select_row( groupeditdlg.clist_group, 0, 0 );
+       gtk_cmclist_select_row( groupeditdlg.clist_avail, 0, 0 );
 
        edit_group_status_show( _edit_group_dfl_message_ );
 
index b2040dd..9bc8db8 100644 (file)
@@ -97,17 +97,17 @@ static void edit_ldap_bdn_cancel( GtkWidget *widget, gboolean *cancelled ) {
        gtk_main_quit();
 }
 
-static void edit_ldap_bdn_list_select( GtkCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
+static void edit_ldap_bdn_list_select( GtkCMCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
        gchar *text = NULL;
 
-       if( gtk_clist_get_text( clist, row, 0, &text ) ) {
+       if( gtk_cmclist_get_text( clist, row, 0, &text ) ) {
                if( text ) {
                        gtk_entry_set_text(GTK_ENTRY(ldapedit_basedn.basedn_entry), text );
                }
        }
 }
 
-static gboolean edit_ldap_bdn_list_button( GtkCList *clist, GdkEventButton *event, gpointer data ) {
+static gboolean edit_ldap_bdn_list_button( GtkCMCList *clist, GdkEventButton *event, gpointer data ) {
        if( ! event ) return FALSE;
        if( event->button == 1 ) {
                if( event->type == GDK_2BUTTON_PRESS ) {
@@ -198,11 +198,11 @@ static void edit_ldap_bdn_create(void) {
                                       GTK_POLICY_AUTOMATIC);
        gtk_box_pack_start(GTK_BOX(vlbox), lwindow, TRUE, TRUE, 0);
 
-       basedn_list = gtk_clist_new(1);
+       basedn_list = gtk_cmclist_new(1);
        gtk_container_add(GTK_CONTAINER(lwindow), basedn_list);
-       gtk_clist_column_titles_show( GTK_CLIST(basedn_list) );
-       gtk_clist_set_column_title( GTK_CLIST(basedn_list), 0, _( "Available Search Base(s)" ) );
-       gtk_clist_set_selection_mode(GTK_CLIST(basedn_list), GTK_SELECTION_BROWSE);
+       gtk_cmclist_column_titles_show( GTK_CMCLIST(basedn_list) );
+       gtk_cmclist_set_column_title( GTK_CMCLIST(basedn_list), 0, _( "Available Search Base(s)" ) );
+       gtk_cmclist_set_selection_mode(GTK_CMCLIST(basedn_list), GTK_SELECTION_BROWSE);
 
        /* Status line */
        hsbox = gtk_hbox_new(FALSE, 0);
@@ -257,7 +257,7 @@ static void edit_ldap_bdn_load_data(
        GList *baseDN = NULL;
 
        edit_ldap_bdn_status_show( "" );
-       gtk_clist_clear(GTK_CLIST(ldapedit_basedn.basedn_list));
+       gtk_cmclist_clear(GTK_CMCLIST(ldapedit_basedn.basedn_list));
        ldapedit_basedn_bad_server = TRUE;
        flgConn = flgDN = FALSE;
        sHost = g_strdup( hostName );
@@ -275,7 +275,7 @@ static void edit_ldap_bdn_load_data(
 
                                while( node ) {
                                        text[0] = (gchar *)node->data;
-                                       gtk_clist_append(GTK_CLIST(ldapedit_basedn.basedn_list), text);
+                                       gtk_cmclist_append(GTK_CMCLIST(ldapedit_basedn.basedn_list), text);
                                        node = g_list_next( node );
                                        flgDN = TRUE;
                                }
index e33d19b..2a3bff2 100644 (file)
@@ -170,17 +170,17 @@ static GdkPixmap *readxpm;
 static GdkBitmap *readxpmmask;
 
 static void folderview_select_node      (FolderView    *folderview,
-                                         GtkCTreeNode  *node);
+                                         GtkCMCTreeNode        *node);
 static void folderview_set_folders      (FolderView    *folderview);
 static void folderview_sort_folders     (FolderView    *folderview,
-                                         GtkCTreeNode  *root,
+                                         GtkCMCTreeNode        *root,
                                          Folder        *folder);
 static void folderview_append_folder    (FolderView    *folderview,
                                          Folder        *folder);
 static void folderview_update_node      (FolderView    *folderview,
-                                         GtkCTreeNode  *node);
+                                         GtkCMCTreeNode        *node);
 
-static gint folderview_clist_compare   (GtkCList       *clist,
+static gint folderview_clist_compare   (GtkCMCList     *clist,
                                         gconstpointer   ptr1,
                                         gconstpointer   ptr2);
 
@@ -194,19 +194,19 @@ static gboolean folderview_button_released        (GtkWidget      *ctree,
 static gboolean folderview_key_pressed (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         FolderView     *folderview);
-static void folderview_selected                (GtkCTree       *ctree,
-                                        GtkCTreeNode   *row,
+static void folderview_selected                (GtkCMCTree     *ctree,
+                                        GtkCMCTreeNode *row,
                                         gint            column,
                                         FolderView     *folderview);
-static void folderview_tree_expanded   (GtkCTree       *ctree,
-                                        GtkCTreeNode   *node,
+static void folderview_tree_expanded   (GtkCMCTree     *ctree,
+                                        GtkCMCTreeNode *node,
                                         FolderView     *folderview);
-static void folderview_tree_collapsed  (GtkCTree       *ctree,
-                                        GtkCTreeNode   *node,
+static void folderview_tree_collapsed  (GtkCMCTree     *ctree,
+                                        GtkCMCTreeNode *node,
                                         FolderView     *folderview);
 static void folderview_popup_close     (GtkMenuShell   *menu_shell,
                                         FolderView     *folderview);
-static void folderview_col_resized     (GtkCList       *clist,
+static void folderview_col_resized     (GtkCMCList     *clist,
                                         gint            column,
                                         gint            width,
                                         FolderView     *folderview);
@@ -388,7 +388,7 @@ static void folderview_column_set_titles(FolderView *folderview)
        label_unread = gtk_image_new_from_pixmap(unreadxpm, unreadxpmmask);
        label_total = gtk_image_new_from_pixmap(readxpm, readxpmmask);
        
-       gtk_clist_column_titles_active(GTK_CLIST(ctree));
+       gtk_cmclist_column_titles_active(GTK_CMCLIST(ctree));
         
        hbox_folder = gtk_hbox_new(FALSE, 4);
        hbox_new = gtk_hbox_new(FALSE, 4);
@@ -416,10 +416,10 @@ static void folderview_column_set_titles(FolderView *folderview)
        gtk_widget_set_size_request(hbox_total, -1, 20);
 #endif
 
-       gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_FOLDER],hbox_folder);
-       gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_NEW],hbox_new);
-       gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_UNREAD],hbox_unread);
-       gtk_clist_set_column_widget(GTK_CLIST(ctree),col_pos[F_COL_TOTAL],hbox_total);
+       gtk_cmclist_set_column_widget(GTK_CMCLIST(ctree),col_pos[F_COL_FOLDER],hbox_folder);
+       gtk_cmclist_set_column_widget(GTK_CMCLIST(ctree),col_pos[F_COL_NEW],hbox_new);
+       gtk_cmclist_set_column_widget(GTK_CMCLIST(ctree),col_pos[F_COL_UNREAD],hbox_unread);
+       gtk_cmclist_set_column_widget(GTK_CMCLIST(ctree),col_pos[F_COL_TOTAL],hbox_total);
 
 #ifdef GENERIC_UMPC
        GTK_EVENTS_FLUSH();
@@ -481,42 +481,42 @@ static GtkWidget *folderview_ctree_create(FolderView *folderview)
                                           titles);
 
        if (prefs_common.show_col_headers == FALSE)
-               gtk_clist_column_titles_hide(GTK_CLIST(ctree));
+               gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
 
 
-       gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), col_pos[F_COL_NEW],
+       gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_BROWSE);
+       gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), col_pos[F_COL_NEW],
                                           GTK_JUSTIFY_RIGHT);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree),
+       gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree),
                                           col_pos[F_COL_UNREAD],
                                           GTK_JUSTIFY_RIGHT);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), 
+       gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), 
                                           col_pos[F_COL_TOTAL],
                                           GTK_JUSTIFY_RIGHT);
        if (prefs_common.enable_dotted_lines) {
-               gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
-               gtk_ctree_set_expander_style(GTK_CTREE(ctree),
-                                    GTK_CTREE_EXPANDER_SQUARE);
+               gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_DOTTED);
+               gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
+                                    GTK_CMCTREE_EXPANDER_SQUARE);
        } else {
-               gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_NONE);
-               gtk_ctree_set_expander_style(GTK_CTREE(ctree),
-                                    GTK_CTREE_EXPANDER_TRIANGLE);
+               gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
+               gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
+                                    GTK_CMCTREE_EXPANDER_TRIANGLE);
        }
 
        gtk_sctree_set_stripes(GTK_SCTREE(ctree), prefs_common.use_stripes_in_summaries);
        gtk_sctree_set_recursive_expand(GTK_SCTREE(ctree), FALSE);
 
-       gtk_ctree_set_indent(GTK_CTREE(ctree), CTREE_INDENT);
-       gtk_clist_set_compare_func(GTK_CLIST(ctree), folderview_clist_compare);
+       gtk_cmctree_set_indent(GTK_CMCTREE(ctree), CTREE_INDENT);
+       gtk_cmclist_set_compare_func(GTK_CMCLIST(ctree), folderview_clist_compare);
 
        /* don't let title buttons take key focus */
        for (i = 0; i < N_FOLDER_COLS; i++) {
-               GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
+               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[i].button,
                                       GTK_CAN_FOCUS);
-               gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[i],
+               gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), col_pos[i],
                                   prefs_common.folder_col_size[i]);
-               gtk_clist_set_column_visibility
-                       (GTK_CLIST(ctree), i, col_state[i].visible);
+               gtk_cmclist_set_column_visibility
+                       (GTK_CMCLIST(ctree), i, col_state[i].visible);
        }
 
        g_signal_connect(G_OBJECT(ctree), "key_press_event",
@@ -590,9 +590,9 @@ void folderview_set_column_order(FolderView *folderview)
        GtkWidget *scrolledwin = folderview->scrolledwin;
 
        if (folderview->selected)
-               sel_item = gtk_ctree_node_get_row_data(GTK_CTREE(ctree), folderview->selected);
+               sel_item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(ctree), folderview->selected);
        if (folderview->opened)
-               op_item = gtk_ctree_node_get_row_data(GTK_CTREE(ctree), folderview->opened);
+               op_item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(ctree), folderview->opened);
 
        debug_print("recreating tree...\n");
        gtk_widget_destroy(folderview->ctree);
@@ -600,15 +600,15 @@ void folderview_set_column_order(FolderView *folderview)
 
        folderview->ctree = ctree = folderview_ctree_create(folderview);
        gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
-                                           GTK_CLIST(ctree)->hadjustment);
+                                           GTK_CMCLIST(ctree)->hadjustment);
        gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
-                                           GTK_CLIST(ctree)->vadjustment);
+                                           GTK_CMCLIST(ctree)->vadjustment);
        gtk_widget_show(ctree);
        
        if (sel_item)
-               folderview->selected = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, sel_item);
+               folderview->selected = gtk_cmctree_find_by_row_data(GTK_CMCTREE(ctree), NULL, sel_item);
        if (op_item)
-               folderview->opened = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, op_item);
+               folderview->opened = gtk_cmctree_find_by_row_data(GTK_CMCTREE(ctree), NULL, op_item);
 
        folderview_set(folderview);
        folderview_column_set_titles(folderview);
@@ -769,7 +769,7 @@ static gboolean folderview_defer_set(gpointer data)
 
 void folderview_set(FolderView *folderview)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        MainWindow *mainwin = folderview->mainwin;
        FolderItem *sel_item = NULL, *op_item = NULL;
 
@@ -791,24 +791,24 @@ void folderview_set(FolderView *folderview)
        main_window_cursor_wait(mainwin);
 
        if (folderview->selected)
-               sel_item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+               sel_item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        if (folderview->opened)
-               op_item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
+               op_item = gtk_cmctree_node_get_row_data(ctree, folderview->opened);
 
        folderview->selected = NULL;
        folderview->opened = NULL;
 
-       gtk_clist_freeze(GTK_CLIST(ctree));
-       gtk_clist_clear(GTK_CLIST(ctree));
+       gtk_cmclist_freeze(GTK_CMCLIST(ctree));
+       gtk_cmclist_clear(GTK_CMCLIST(ctree));
 
        folderview_set_folders(folderview);
 
        if (sel_item)
-               folderview->selected = gtk_ctree_find_by_row_data(ctree, NULL, sel_item);
+               folderview->selected = gtk_cmctree_find_by_row_data(ctree, NULL, sel_item);
        if (op_item)
-               folderview->opened = gtk_ctree_find_by_row_data(ctree, NULL, op_item);
+               folderview->opened = gtk_cmctree_find_by_row_data(ctree, NULL, op_item);
 
-       gtk_clist_thaw(GTK_CLIST(ctree));
+       gtk_cmclist_thaw(GTK_CMCLIST(ctree));
        main_window_cursor_normal(mainwin);
        STATUSBAR_POP(mainwin);
        inc_unlock();
@@ -824,13 +824,13 @@ void folderview_set_all(void)
 
 void folderview_select(FolderView *folderview, FolderItem *item)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       GtkCTreeNode *node;
-       GtkCTreeNode *old_selected = folderview->selected;
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+       GtkCMCTreeNode *node;
+       GtkCMCTreeNode *old_selected = folderview->selected;
 
        if (!item) return;
 
-       node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+       node = gtk_cmctree_find_by_row_data(ctree, NULL, item);
        if (node) folderview_select_node(folderview, node);
 
        if (old_selected != node)
@@ -876,9 +876,9 @@ static void mark_all_read_cb(GtkAction *action, gpointer data)
        folder_item_update_thaw();
 }
 
-static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
+static void folderview_select_node(FolderView *folderview, GtkCMCTreeNode *node)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
 
        g_return_if_fail(node != NULL);
 
@@ -888,7 +888,7 @@ static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
 
        folderview->open_folder = TRUE;
        gtkut_ctree_set_focus_row(ctree, node);
-       gtk_ctree_select(ctree, node);
+       gtk_cmctree_select(ctree, node);
        if (folderview->summaryview->folder_item &&
            folderview->summaryview->folder_item->total_msgs > 0)
                summary_grab_focus(folderview->summaryview);
@@ -900,25 +900,25 @@ static void folderview_select_node(FolderView *folderview, GtkCTreeNode *node)
 
 void folderview_unselect(FolderView *folderview)
 {
-       if (folderview->opened && !GTK_CTREE_ROW(folderview->opened)->children)
-               gtk_ctree_collapse
-                       (GTK_CTREE(folderview->ctree), folderview->opened);
+       if (folderview->opened && !GTK_CMCTREE_ROW(folderview->opened)->children)
+               gtk_cmctree_collapse
+                       (GTK_CMCTREE(folderview->ctree), folderview->opened);
 
        folderview->selected = folderview->opened = NULL;
 }
 
-static GtkCTreeNode *folderview_find_next_marked(GtkCTree *ctree,
-                                                GtkCTreeNode *node)
+static GtkCMCTreeNode *folderview_find_next_marked(GtkCMCTree *ctree,
+                                                GtkCMCTreeNode *node)
 {
        FolderItem *item;
 
        if (node)
                node = gtkut_ctree_node_next(ctree, node);
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
-               item = gtk_ctree_node_get_row_data(ctree, node);
+               item = gtk_cmctree_node_get_row_data(ctree, node);
                if (item && item->marked_msgs > 0 && item->stype != F_TRASH)
                        return node;
        }
@@ -928,8 +928,8 @@ static GtkCTreeNode *folderview_find_next_marked(GtkCTree *ctree,
 
 void folderview_select_next_marked(FolderView *folderview)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       GtkCTreeNode *node = NULL;
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+       GtkCMCTreeNode *node = NULL;
        EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
        gboolean last_open = prefs_common.always_show_msg;
        
@@ -943,7 +943,7 @@ void folderview_select_next_marked(FolderView *folderview)
        }
 
        if (!folderview->opened ||
-           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list)) {
+           folderview->opened == GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list)) {
                goto out;
        }
        /* search again from the first node */
@@ -955,18 +955,18 @@ out:
        prefs_common.always_show_msg = last_open;
 }
 
-static GtkCTreeNode *folderview_find_next_unread(GtkCTree *ctree,
-                                                GtkCTreeNode *node)
+static GtkCMCTreeNode *folderview_find_next_unread(GtkCMCTree *ctree,
+                                                GtkCMCTreeNode *node)
 {
        FolderItem *item;
 
        if (node)
                node = gtkut_ctree_node_next(ctree, node);
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
-               item = gtk_ctree_node_get_row_data(ctree, node);
+               item = gtk_cmctree_node_get_row_data(ctree, node);
                if (item && item->unread_msgs > 0 && item->stype != F_TRASH)
                        return node;
        }
@@ -976,8 +976,8 @@ static GtkCTreeNode *folderview_find_next_unread(GtkCTree *ctree,
 
 void folderview_select_next_unread(FolderView *folderview, gboolean force_open)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       GtkCTreeNode *node = NULL;
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+       GtkCMCTreeNode *node = NULL;
        EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
        gboolean last_open = prefs_common.always_show_msg;
        
@@ -991,7 +991,7 @@ void folderview_select_next_unread(FolderView *folderview, gboolean force_open)
        }
 
        if (!folderview->opened ||
-           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list)) {
+           folderview->opened == GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list)) {
                goto out;
        }
        /* search again from the first node */
@@ -1003,18 +1003,18 @@ out:
        prefs_common.always_show_msg = last_open;
 }
 
-static GtkCTreeNode *folderview_find_next_new(GtkCTree *ctree,
-                                                GtkCTreeNode *node)
+static GtkCMCTreeNode *folderview_find_next_new(GtkCMCTree *ctree,
+                                                GtkCMCTreeNode *node)
 {
        FolderItem *item;
 
        if (node)
                node = gtkut_ctree_node_next(ctree, node);
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
-               item = gtk_ctree_node_get_row_data(ctree, node);
+               item = gtk_cmctree_node_get_row_data(ctree, node);
                if (item && item->new_msgs > 0 && item->stype != F_TRASH)
                        return node;
        }
@@ -1024,8 +1024,8 @@ static GtkCTreeNode *folderview_find_next_new(GtkCTree *ctree,
 
 void folderview_select_next_new(FolderView *folderview)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       GtkCTreeNode *node = NULL;
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+       GtkCMCTreeNode *node = NULL;
        EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
        gboolean last_open = prefs_common.always_show_msg;
        
@@ -1039,7 +1039,7 @@ void folderview_select_next_new(FolderView *folderview)
        }
 
        if (!folderview->opened ||
-           folderview->opened == GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list)) {
+           folderview->opened == GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list)) {
                goto out;
        }
        /* search again from the first node */
@@ -1053,10 +1053,10 @@ out:
 
 FolderItem *folderview_get_selected_item(FolderView *folderview)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
 
        if (!folderview->selected) return NULL;
-       return gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       return gtk_cmctree_node_get_row_data(ctree, folderview->selected);
 }
 
 static void folderview_set_folders(FolderView *folderview)
@@ -1199,23 +1199,23 @@ gint folderview_check_new(Folder *folder)
        GList *list;
        FolderItem *item;
        FolderView *folderview;
-       GtkCTree *ctree;
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree;
+       GtkCMCTreeNode *node;
        gint new_msgs = 0;
        gint former_new_msgs = 0;
        gint former_new = 0, former_unread = 0, former_total;
 
        for (list = folderview_list; list != NULL; list = list->next) {
                folderview = (FolderView *)list->data;
-               ctree = GTK_CTREE(folderview->ctree);
+               ctree = GTK_CMCTREE(folderview->ctree);
                folderview->scanning_folder = folder;
                inc_lock();
                main_window_lock(folderview->mainwin);
 
-               for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
                     node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                        gchar *str = NULL;
-                       item = gtk_ctree_node_get_row_data(ctree, node);
+                       item = gtk_cmctree_node_get_row_data(ctree, node);
                        if (!item || !item->path || !item->folder) continue;
                        if (item->no_select) continue;
                        if (folder && folder != item->folder) continue;
@@ -1477,9 +1477,9 @@ static gboolean folderview_have_marked_children(FolderView *folderview,
        return folderview_have_marked_children_sub(folderview, item, FALSE);
 }
 
-static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
+static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        GtkStyle *style = NULL;
        GtkStyle *color_style = NULL;
        FolderItem *item;
@@ -1496,10 +1496,10 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        gint *col_pos = folderview->col_pos;
        SpecialFolderItemType stype;
        
-       item = gtk_ctree_node_get_row_data(ctree, node);
+       item = gtk_cmctree_node_get_row_data(ctree, node);
        g_return_if_fail(item != NULL);
 
-       if (!GTK_CTREE_ROW(node)->expanded)
+       if (!GTK_CMCTREE_ROW(node)->expanded)
                mark = folderview_have_marked_children(folderview, item);
        else
                mark = (item->marked_msgs != 0);
@@ -1595,7 +1595,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 
        name = folder_item_get_name(item);
 
-       if (!GTK_CTREE_ROW(node)->expanded) {
+       if (!GTK_CMCTREE_ROW(node)->expanded) {
                add_unread_mark = folderview_have_unread_children(
                                        folderview, item);
                add_sub_match_mark = folderview_have_matching_children(
@@ -1661,18 +1661,18 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        }
                gtk_sctree_set_node_info(ctree, node, str, FOLDER_SPACING,
                                        xpm, mask, openxpm, openmask,
-                                       FALSE, GTK_CTREE_ROW(node)->expanded);
+                                       FALSE, GTK_CMCTREE_ROW(node)->expanded);
                g_free(str);
        g_free(name);
 
        if (!folder_item_parent(item)) {
-               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW],    "-");
-               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], "-");
-               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL],  "-");
+               gtk_cmctree_node_set_text(ctree, node, col_pos[F_COL_NEW],    "-");
+               gtk_cmctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], "-");
+               gtk_cmctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL],  "-");
        } else {
-               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_NEW],    item->new_msgs    > 0 ? itos(item->new_msgs)    : prefs_common.zero_replacement);
-               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], item->unread_msgs > 0 ? itos(item->unread_msgs) : prefs_common.zero_replacement);
-               gtk_ctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL],  item->total_msgs  > 0 ? itos(item->total_msgs)  : prefs_common.zero_replacement);
+               gtk_cmctree_node_set_text(ctree, node, col_pos[F_COL_NEW],    item->new_msgs    > 0 ? itos(item->new_msgs)    : prefs_common.zero_replacement);
+               gtk_cmctree_node_set_text(ctree, node, col_pos[F_COL_UNREAD], item->unread_msgs > 0 ? itos(item->unread_msgs) : prefs_common.zero_replacement);
+               gtk_cmctree_node_set_text(ctree, node, col_pos[F_COL_TOTAL],  item->total_msgs  > 0 ? itos(item->total_msgs)  : prefs_common.zero_replacement);
        }
 
        if (folder_has_parent_of_type(item, F_OUTBOX) ||
@@ -1693,7 +1693,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                         folderview_have_new_children(folderview, item));       
        }
 
-       gtk_ctree_node_set_foreground(ctree, node, NULL);
+       gtk_cmctree_node_set_foreground(ctree, node, NULL);
 
        if (use_bold) {
                GdkColor gdk_color;
@@ -1712,7 +1712,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                }
        } else if (use_color) {
                style = normal_color_style;
-               gtk_ctree_node_set_foreground(ctree, node,
+               gtk_cmctree_node_set_foreground(ctree, node,
                                              &folderview->color_new);
        } else if (item->op_count > 0) {
                style = bold_tgtfold_style;
@@ -1726,7 +1726,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                style = normal_style;
        }
 
-       gtk_ctree_node_set_row_style(ctree, node, style);
+       gtk_cmctree_node_set_row_style(ctree, node, style);
 
        if ((node = gtkut_ctree_find_collapsed_parent(ctree, node)) != NULL)
                folderview_update_node(folderview, node);
@@ -1736,16 +1736,16 @@ void folderview_update_search_icon(FolderItem *item, gboolean matches)
 {
        GList *list;
        FolderView *folderview;
-       GtkCTree *ctree;
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree;
+       GtkCMCTreeNode *node;
 
        g_return_if_fail(item != NULL);
 
        for (list = folderview_list; list != NULL; list = list->next) {
                folderview = (FolderView *)list->data;
-               ctree = GTK_CTREE(folderview->ctree);
+               ctree = GTK_CMCTREE(folderview->ctree);
 
-               node = gtk_ctree_find_by_row_data(ctree, NULL, item);
+               node = gtk_cmctree_find_by_row_data(ctree, NULL, item);
                if (node) {
                        item->search_match = matches;
                        folderview_update_node(folderview, node);
@@ -1757,15 +1757,15 @@ static gboolean folderview_update_item_claws(gpointer source, gpointer data)
 {
        FolderItemUpdateData *update_info = (FolderItemUpdateData *)source;
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree;
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree;
+       GtkCMCTreeNode *node;
        g_return_val_if_fail(update_info != NULL, TRUE);
        g_return_val_if_fail(update_info->item != NULL, TRUE);
        g_return_val_if_fail(folderview != NULL, FALSE);
 
-       ctree = GTK_CTREE(folderview->ctree);
+       ctree = GTK_CMCTREE(folderview->ctree);
 
-       node = gtk_ctree_find_by_row_data(ctree, NULL, update_info->item);
+       node = gtk_cmctree_find_by_row_data(ctree, NULL, update_info->item);
 
        if (node) {
                if (update_info->update_flags & (F_ITEM_UPDATE_MSGCNT | F_ITEM_UPDATE_NAME))
@@ -1781,8 +1781,8 @@ static gboolean folderview_update_item_claws(gpointer source, gpointer data)
        return FALSE;
 }
 
-static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
-                                     GNode *gnode, GtkCTreeNode *cnode,
+static gboolean folderview_gnode_func(GtkCMCTree *ctree, guint depth,
+                                     GNode *gnode, GtkCMCTreeNode *cnode,
                                      gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
@@ -1790,72 +1790,72 @@ static gboolean folderview_gnode_func(GtkCTree *ctree, guint depth,
 
        g_return_val_if_fail(item != NULL, FALSE);
 
-       gtk_ctree_node_set_row_data(ctree, cnode, item);
+       gtk_cmctree_node_set_row_data(ctree, cnode, item);
        folderview_update_node(folderview, cnode);
 
        return TRUE;
 }
 
-static void folderview_expand_func(GtkCTree *ctree, GtkCTreeNode *node,
+static void folderview_expand_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                   gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
        FolderItem *item;
 
-       if (GTK_CTREE_ROW(node)->children) {
-               item = gtk_ctree_node_get_row_data(ctree, node);
+       if (GTK_CMCTREE_ROW(node)->children) {
+               item = gtk_cmctree_node_get_row_data(ctree, node);
                g_return_if_fail(item != NULL);
 
                if (!item->collapsed)
-                       gtk_ctree_expand(ctree, node);
+                       gtk_cmctree_expand(ctree, node);
                else
                        folderview_update_node(folderview, node);
        }
 }
 
-static void set_special_folder(GtkCTree *ctree, FolderItem *item,
-                              GtkCTreeNode *root, GtkCTreeNode **prev)
+static void set_special_folder(GtkCMCTree *ctree, FolderItem *item,
+                              GtkCMCTreeNode *root, GtkCMCTreeNode **prev)
 {
        if (item) {
-               GtkCTreeNode *node, *parent, *sibling;
+               GtkCMCTreeNode *node, *parent, *sibling;
 
-               node = gtk_ctree_find_by_row_data(ctree, root, item);
+               node = gtk_cmctree_find_by_row_data(ctree, root, item);
                if (!node)
                        g_warning("%s not found.\n", item->path);
                else {
-                       parent = GTK_CTREE_ROW(node)->parent;
-                       if (*prev && parent == GTK_CTREE_ROW(*prev)->parent)
-                               sibling = GTK_CTREE_ROW(*prev)->sibling;
+                       parent = GTK_CMCTREE_ROW(node)->parent;
+                       if (*prev && parent == GTK_CMCTREE_ROW(*prev)->parent)
+                               sibling = GTK_CMCTREE_ROW(*prev)->sibling;
                        else
-                               sibling = GTK_CTREE_ROW(parent)->children;
+                               sibling = GTK_CMCTREE_ROW(parent)->children;
                        while (sibling) {
                                FolderItem *tmp;
 
-                               tmp = gtk_ctree_node_get_row_data
+                               tmp = gtk_cmctree_node_get_row_data
                                        (ctree, sibling);
                                if (tmp->stype != F_NORMAL)
-                                       sibling = GTK_CTREE_ROW(sibling)->sibling;
+                                       sibling = GTK_CMCTREE_ROW(sibling)->sibling;
                                else
                                        break;
                        }
                        if (node != sibling)
-                               gtk_ctree_move(ctree, node, parent, sibling);
+                               gtk_cmctree_move(ctree, node, parent, sibling);
                }
 
                *prev = node;
        }
 }
 
-static void folderview_sort_folders(FolderView *folderview, GtkCTreeNode *root,
+static void folderview_sort_folders(FolderView *folderview, GtkCMCTreeNode *root,
                                    Folder *folder)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       GtkCTreeNode *prev = NULL;
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+       GtkCMCTreeNode *prev = NULL;
 
-       gtk_clist_freeze(GTK_CLIST(ctree));
+       gtk_cmclist_freeze(GTK_CMCLIST(ctree));
        gtk_sctree_sort_recursive(ctree, root);
-       if (root && GTK_CTREE_ROW(root)->parent) {
-               gtk_clist_thaw(GTK_CLIST(ctree));
+       if (root && GTK_CMCTREE_ROW(root)->parent) {
+               gtk_cmclist_thaw(GTK_CMCLIST(ctree));
                return;
        }
        set_special_folder(ctree, folder->inbox, root, &prev);
@@ -1863,19 +1863,19 @@ static void folderview_sort_folders(FolderView *folderview, GtkCTreeNode *root,
        set_special_folder(ctree, folder->draft, root, &prev);
        set_special_folder(ctree, folder->queue, root, &prev);
        set_special_folder(ctree, folder->trash, root, &prev);
-       gtk_clist_thaw(GTK_CLIST(ctree));
+       gtk_cmclist_thaw(GTK_CMCLIST(ctree));
 }
 
 static void folderview_append_folder(FolderView *folderview, Folder *folder)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       GtkCTreeNode *root;
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+       GtkCMCTreeNode *root;
 
        g_return_if_fail(folder != NULL);
 
        root = gtk_sctree_insert_gnode(ctree, NULL, NULL, folder->node,
                                      folderview_gnode_func, folderview);
-       gtk_ctree_pre_recursive(ctree, root, folderview_expand_func,
+       gtk_cmctree_pre_recursive(ctree, root, folderview_expand_func,
                                folderview);
        folderview_sort_folders(folderview, root, folder);
 }
@@ -1985,7 +1985,7 @@ static void folderview_set_sens_and_popup_menu(FolderView *folderview, gint row,
 static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                                          FolderView *folderview)
 {
-       GtkCList *clist = GTK_CLIST(ctree);
+       GtkCMCList *clist = GTK_CMCLIST(ctree);
        gint prev_row = -1, row = -1, column = -1;
 
        if (!event) return FALSE;
@@ -1996,12 +1996,12 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
 
                if (event->type == GDK_2BUTTON_PRESS) {
                        if (clist->selection) {
-                               GtkCTreeNode *node;
+                               GtkCMCTreeNode *node;
 
-                               node = GTK_CTREE_NODE(clist->selection->data);
+                               node = GTK_CMCTREE_NODE(clist->selection->data);
                                if (node) {
-                                       gtk_ctree_toggle_expansion(
-                                               GTK_CTREE(ctree),
+                                       gtk_cmctree_toggle_expansion(
+                                               GTK_CMCTREE(ctree),
                                                node);
                                        folderview->open_folder = FALSE;
                                }
@@ -2013,26 +2013,26 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
        if (event->button == 2 || event->button == 3) {
                /* right clicked */
                if (clist->selection) {
-                       GtkCTreeNode *node;
+                       GtkCMCTreeNode *node;
 
-                       node = GTK_CTREE_NODE(clist->selection->data);
+                       node = GTK_CMCTREE_NODE(clist->selection->data);
                        if (node)
                                prev_row = gtkut_ctree_get_nth_from_node
-                                       (GTK_CTREE(ctree), node);
+                                       (GTK_CMCTREE(ctree), node);
                }
 
-               if (!gtk_clist_get_selection_info(clist, event->x, event->y,
+               if (!gtk_cmclist_get_selection_info(clist, event->x, event->y,
                                                  &row, &column))
                        return FALSE;
                if (prev_row != row) {
-                       gtk_clist_unselect_all(clist);
+                       gtk_cmclist_unselect_all(clist);
                        if (event->button == 2)
                                folderview_select_node
                                        (folderview,
-                                        gtk_ctree_node_nth(GTK_CTREE(ctree),
+                                        gtk_cmctree_node_nth(GTK_CMCTREE(ctree),
                                                            row));
                        else
-                               gtk_clist_select_row(clist, row, column);
+                               gtk_cmclist_select_row(clist, row, column);
                }
        }
 
@@ -2049,14 +2049,14 @@ static gboolean folderview_button_released(GtkWidget *ctree, GdkEventButton *eve
 
        if (!event) return FALSE;
 
-       if (!gtk_clist_get_selection_info(GTK_CLIST(ctree), event->x, event->y,
+       if (!gtk_cmclist_get_selection_info(GTK_CMCLIST(ctree), event->x, event->y,
                                          &row, &column))
                return FALSE;
        if (event->button == 1 && folderview->open_folder == FALSE &&
            folderview->opened != NULL) {
-               gtkut_ctree_set_focus_row(GTK_CTREE(ctree),
+               gtkut_ctree_set_focus_row(GTK_CMCTREE(ctree),
                                          folderview->opened);
-               gtk_ctree_select(GTK_CTREE(ctree), folderview->opened);
+               gtk_cmctree_select(GTK_CMCTREE(ctree), folderview->opened);
        }
 
        return FALSE;
@@ -2083,9 +2083,9 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                break;
 #ifdef GENERIC_UMPC
        case GDK_Return:
-               if (folderview->selected && GTK_CTREE_ROW(folderview->selected)->children) {
-                       gtk_ctree_toggle_expansion(
-                               GTK_CTREE(folderview->ctree),
+               if (folderview->selected && GTK_CMCTREE_ROW(folderview->selected)->children) {
+                       gtk_cmctree_toggle_expansion(
+                               GTK_CMCTREE(folderview->ctree),
                                folderview->selected);
                }
                break;  
@@ -2110,8 +2110,8 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
 typedef struct _PostponedSelectData
 {
-       GtkCTree *ctree;
-       GtkCTreeNode *row;
+       GtkCMCTree *ctree;
+       GtkCMCTreeNode *row;
        gint column;
        FolderView *folderview;
 } PostponedSelectData;
@@ -2134,7 +2134,7 @@ void folderview_close_opened(FolderView *folderview)
        if (folderview->opened) {
                FolderItem *olditem;
                
-               olditem = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree), 
+               olditem = gtk_cmctree_node_get_row_data(GTK_CMCTREE(folderview->ctree), 
                                                      folderview->opened);
                if (olditem) {
                        gchar *buf = g_strdup_printf(_("Closing Folder %s..."), 
@@ -2155,12 +2155,12 @@ void folderview_close_opened(FolderView *folderview)
        }
 
        if (folderview->opened &&
-           !GTK_CTREE_ROW(folderview->opened)->children)
-               gtk_ctree_collapse(GTK_CTREE(folderview->ctree), folderview->opened);
+           !GTK_CMCTREE_ROW(folderview->opened)->children)
+               gtk_cmctree_collapse(GTK_CMCTREE(folderview->ctree), folderview->opened);
 
        folderview->opened = NULL;
 }
-static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
+static void folderview_selected(GtkCMCTree *ctree, GtkCMCTreeNode *row,
                                gint column, FolderView *folderview)
 {
        static gboolean can_select = TRUE;      /* exclusive lock */
@@ -2168,7 +2168,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        FolderItem *item;
        gchar *buf;
        int res = 0;
-       GtkCTreeNode *old_opened = folderview->opened;
+       GtkCMCTreeNode *old_opened = folderview->opened;
        START_TIMING("");
        folderview->selected = row;
 
@@ -2180,7 +2180,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                return;
        }
        
-       item = gtk_ctree_node_get_row_data(ctree, row);
+       item = gtk_cmctree_node_get_row_data(ctree, row);
        if (!item) {
                END_TIMING();
                folderview->open_folder = FALSE;
@@ -2190,7 +2190,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        if (!can_select || summary_is_locked(folderview->summaryview)) {
                if (folderview->opened) {
                        gtkut_ctree_set_focus_row(ctree, folderview->opened);
-                       gtk_ctree_select(ctree, folderview->opened);
+                       gtk_cmctree_select(ctree, folderview->opened);
                }
                folderview->open_folder = FALSE;
                END_TIMING();
@@ -2220,8 +2220,8 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        if (item->path)
                debug_print("Folder %s is selected\n", item->path);
 
-       if (!GTK_CTREE_ROW(row)->children)
-               gtk_ctree_expand(ctree, row);
+       if (!GTK_CMCTREE_ROW(row)->children)
+               gtk_cmctree_expand(ctree, row);
 
        /* ungrab the mouse event */
        if (GTK_WIDGET_HAS_GRAB(ctree)) {
@@ -2281,13 +2281,13 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        if (!opened) {
                gtkut_ctree_set_focus_row(ctree, old_opened);
-               gtk_ctree_select(ctree, old_opened);
+               gtk_cmctree_select(ctree, old_opened);
                folderview->opened = old_opened;
        } else {
                folderview->opened = row;
-               if (gtk_ctree_node_is_visible(ctree, row)
+               if (gtk_cmctree_node_is_visible(ctree, row)
                    != GTK_VISIBILITY_FULL)
-                       gtk_ctree_node_moveto(ctree, row, -1, 0.5, 0);
+                       gtk_cmctree_node_moveto(ctree, row, -1, 0.5, 0);
        }
 
        STATUSBAR_POP(folderview->mainwin);
@@ -2297,23 +2297,23 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        END_TIMING();
 }
 
-static void folderview_tree_expanded(GtkCTree *ctree, GtkCTreeNode *node,
+static void folderview_tree_expanded(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                     FolderView *folderview)
 {
        FolderItem *item;
 
-       item = gtk_ctree_node_get_row_data(ctree, node);
+       item = gtk_cmctree_node_get_row_data(ctree, node);
        g_return_if_fail(item != NULL);
        item->collapsed = FALSE;
        folderview_update_node(folderview, node);
 }
 
-static void folderview_tree_collapsed(GtkCTree *ctree, GtkCTreeNode *node,
+static void folderview_tree_collapsed(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                      FolderView *folderview)
 {
        FolderItem *item;
 
-       item = gtk_ctree_node_get_row_data(ctree, node);
+       item = gtk_cmctree_node_get_row_data(ctree, node);
        g_return_if_fail(item != NULL);
        item->collapsed = TRUE;
        folderview_update_node(folderview, node);
@@ -2324,10 +2324,10 @@ static void folderview_popup_close(GtkMenuShell *menu_shell,
 {
        if (!folderview->opened) return;
 
-       gtk_ctree_select(GTK_CTREE(folderview->ctree), folderview->opened);
+       gtk_cmctree_select(GTK_CMCTREE(folderview->ctree), folderview->opened);
 }
 
-static void folderview_col_resized(GtkCList *clist, gint column, gint width,
+static void folderview_col_resized(GtkCMCList *clist, gint column, gint width,
                                   FolderView *folderview)
 {
        FolderColumnType type = folderview->col_state[column].type;
@@ -2358,17 +2358,17 @@ static void folderview_create_folder_node_recursive(FolderView *folderview, Fold
 
 static void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
-       GtkCTreeNode *node, *parent_node;
+       GtkCMCTreeNode *node, *parent_node;
        gint *col_pos = folderview->col_pos;
        FolderItemUpdateData hookdata;
 
-       parent_node = gtk_ctree_find_by_row_data(ctree, NULL, folder_item_parent(item));
+       parent_node = gtk_cmctree_find_by_row_data(ctree, NULL, folder_item_parent(item));
        if (parent_node == NULL)
                return;
 
-       gtk_clist_freeze(GTK_CLIST(ctree));
+       gtk_cmclist_freeze(GTK_CMCLIST(ctree));
 
        text[col_pos[F_COL_FOLDER]] = item->name;
        node = gtk_sctree_insert_node(ctree, parent_node, NULL, text,
@@ -2376,10 +2376,10 @@ static void folderview_create_folder_node(FolderView *folderview, FolderItem *it
                                     folderxpm, folderxpmmask,
                                     folderopenxpm, folderopenxpmmask,
                                     FALSE, FALSE);
-       gtk_ctree_expand(ctree, parent_node);
-       gtk_ctree_node_set_row_data(ctree, node, item);
+       gtk_cmctree_expand(ctree, parent_node);
+       gtk_cmctree_node_set_row_data(ctree, node, item);
        if (normal_style)
-               gtk_ctree_node_set_row_style(ctree, node, normal_style);
+               gtk_cmctree_node_set_row_style(ctree, node, normal_style);
        folderview_sort_folders(folderview, parent_node, item->folder);
 
        hookdata.item = item;
@@ -2387,13 +2387,13 @@ static void folderview_create_folder_node(FolderView *folderview, FolderItem *it
        hookdata.msg = NULL;
        hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &hookdata);
 
-       gtk_clist_thaw(GTK_CLIST(ctree));
+       gtk_cmclist_thaw(GTK_CMCLIST(ctree));
 }
 
 static void folderview_empty_trash_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        GSList *mlist = NULL;
        GSList *cur = NULL;
@@ -2401,7 +2401,7 @@ static void folderview_empty_trash_cb(GtkAction *action, gpointer data)
        PrefsAccount *ac;
 
        if (!folderview->selected) return;
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
@@ -2437,14 +2437,14 @@ static void folderview_empty_trash_cb(GtkAction *action, gpointer data)
 static void folderview_send_queue_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        FolderItem *special_queue = NULL;
        PrefsAccount *ac;
        gchar *errstr = NULL;
 
        if (!folderview->selected) return;
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
@@ -2499,12 +2499,12 @@ static void folderview_search_cb(GtkAction *action, gpointer data)
 static void folderview_run_processing_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
 
        if (!folderview->selected) return;
 
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
@@ -2516,29 +2516,29 @@ static void folderview_run_processing_cb(GtkAction *action, gpointer data)
 static void folderview_property_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
 
        if (!folderview->selected) return;
 
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
        prefs_folder_item_open(item);
 }
 
-static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)
+static void folderview_recollapse_nodes(FolderView *folderview, GtkCMCTreeNode *node)
 {
        GSList *list = NULL;
        GSList *done = NULL;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        
        for (list = folderview->nodes_to_recollapse; list != NULL; list = g_slist_next(list)) {
-               if (!gtkut_ctree_node_is_parent(GTK_CTREE_NODE(list->data), node)
+               if (!gtkut_ctree_node_is_parent(GTK_CMCTREE_NODE(list->data), node)
                &&  list->data != node) {
-                       gtk_ctree_collapse(ctree, GTK_CTREE_NODE(list->data));
-                       done = g_slist_append(done, GTK_CTREE_NODE(list->data));
+                       gtk_cmctree_collapse(ctree, GTK_CMCTREE_NODE(list->data));
+                       done = g_slist_append(done, GTK_CMCTREE_NODE(list->data));
                }
        }
        for (list = done; list != NULL; list = g_slist_next(list)) {
@@ -2553,7 +2553,7 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
 {
        FolderItem *from_parent = NULL;
        FolderItem *new_folder = NULL;
-       GtkCTreeNode *src_node = NULL;
+       GtkCMCTreeNode *src_node = NULL;
        gchar *buf;
        gint status;
 
@@ -2561,7 +2561,7 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
        g_return_if_fail(from_folder != NULL);
        g_return_if_fail(to_folder != NULL);
 
-       src_node = gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), NULL, from_folder);
+       src_node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(folderview->ctree), NULL, from_folder);
        from_parent = folder_item_parent(from_folder);
        
        if (prefs_common.warn_dnd) {
@@ -2600,7 +2600,7 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
                folder_item_update_recursive(new_folder, F_ITEM_UPDATE_MSGCNT);
 
                folderview_sort_folders(folderview, 
-                       gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), 
+                       gtk_cmctree_find_by_row_data(GTK_CMCTREE(folderview->ctree), 
                                NULL, to_folder), new_folder->folder);
                folderview_select(folderview, new_folder);
        } else {
@@ -2628,11 +2628,11 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
        gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), TRUE);
 }
 
-static gint folderview_clist_compare(GtkCList *clist,
+static gint folderview_clist_compare(GtkCMCList *clist,
                                     gconstpointer ptr1, gconstpointer ptr2)
 {
-       FolderItem *item1 = ((GtkCListRow *)ptr1)->data;
-       FolderItem *item2 = ((GtkCListRow *)ptr2)->data;
+       FolderItem *item1 = ((GtkCMCListRow *)ptr1)->data;
+       FolderItem *item2 = ((GtkCMCListRow *)ptr2)->data;
 
        if (item1->order > 0 && item2->order > 0)  // if we have an order item, use it
        {
@@ -2660,13 +2660,13 @@ static gint folderview_clist_compare(GtkCList *clist,
 static void folderview_processing_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        gchar *id, *title;
 
        if (!folderview->selected) return;
 
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
@@ -2737,7 +2737,7 @@ void folderview_reflect_prefs(void)
 
                folderview_init(folderview);
        }
-       gtk_clist_freeze(GTK_CLIST(folderview->ctree));
+       gtk_cmclist_freeze(GTK_CMCLIST(folderview->ctree));
        folderview_column_set_titles(folderview);
        folderview_set_all();
 
@@ -2746,8 +2746,8 @@ void folderview_reflect_prefs(void)
                 G_CALLBACK(folderview_selected), folderview);
 
        if (item) {
-               GtkCTreeNode *node = gtk_ctree_find_by_row_data(
-                       GTK_CTREE(folderview->ctree), NULL, item);
+               GtkCMCTreeNode *node = gtk_cmctree_find_by_row_data(
+                       GTK_CMCTREE(folderview->ctree), NULL, item);
 
                folderview_select(folderview, item);
                folderview->open_folder = FALSE;
@@ -2762,7 +2762,7 @@ void folderview_reflect_prefs(void)
                                GTK_SCROLLED_WINDOW(folderview->scrolledwin));
        gtk_adjustment_set_value(pos, height);
        gtk_adjustment_changed(pos);
-       gtk_clist_thaw(GTK_CLIST(folderview->ctree));
+       gtk_cmclist_thaw(GTK_CMCLIST(folderview->ctree));
 }
 
 static void drag_state_stop(FolderView *folderview)
@@ -2778,7 +2778,7 @@ static gint folderview_defer_expand(FolderView *folderview)
        if (folderview->drag_node) {
                folderview_recollapse_nodes(folderview, folderview->drag_node);
                if (folderview->drag_item->collapsed) {
-                       gtk_ctree_expand(GTK_CTREE(folderview->ctree), folderview->drag_node);
+                       gtk_cmctree_expand(GTK_CMCTREE(folderview->ctree), folderview->drag_node);
                        folderview->nodes_to_recollapse = g_slist_append
                                (folderview->nodes_to_recollapse, folderview->drag_node);
                }
@@ -2788,7 +2788,7 @@ static gint folderview_defer_expand(FolderView *folderview)
        return FALSE;
 }
 
-static void drag_state_start(FolderView *folderview, GtkCTreeNode *node, FolderItem *item)
+static void drag_state_start(FolderView *folderview, GtkCMCTreeNode *node, FolderItem *item)
 {
        /* the idea is that we call drag_state_start() whenever we want expansion to
         * start after 'prefs_common.hover_time' msecs. if we want to cancel expansion,
@@ -2830,11 +2830,11 @@ static void folderview_drag_data_get(GtkWidget        *widget,
        GList *cur;
        gchar *source = NULL;
        if (info == TARGET_DUMMY) {
-               for (cur = GTK_CLIST(folderview->ctree)->selection;
+               for (cur = GTK_CMCLIST(folderview->ctree)->selection;
                     cur != NULL; cur = cur->next) {
-                       item = gtk_ctree_node_get_row_data
-                               (GTK_CTREE(folderview->ctree), 
-                                GTK_CTREE_NODE(cur->data));
+                       item = gtk_cmctree_node_get_row_data
+                               (GTK_CMCTREE(folderview->ctree), 
+                                GTK_CMCTREE_NODE(cur->data));
                        if (item) {
                                source = g_strdup_printf ("FROM_OTHER_FOLDER%s", folder_item_get_identifier(item));
                                gtk_selection_data_set(selection_data,
@@ -2866,15 +2866,15 @@ static gboolean folderview_update_folder(gpointer source, gpointer userdata)
        if (hookdata->update_flags & FOLDER_ADD_FOLDERITEM)
                folderview_create_folder_node(folderview, hookdata->item);
        else if (hookdata->update_flags & FOLDER_RENAME_FOLDERITEM) {
-               GtkCTreeNode *node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree),
+               GtkCMCTreeNode *node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(ctree),
                                NULL, folder_item_parent(hookdata->item));
                folderview_sort_folders(folderview, node, hookdata->folder);
        } else if (hookdata->update_flags & FOLDER_REMOVE_FOLDERITEM) {
-               GtkCTreeNode *node;
+               GtkCMCTreeNode *node;
 
-               node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, hookdata->item);
+               node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(ctree), NULL, hookdata->item);
                if (node != NULL) {
-                       gtk_ctree_remove_node(GTK_CTREE(ctree), node);
+                       gtk_cmctree_remove_node(GTK_CMCTREE(ctree), node);
                        if (folderview->selected == node)
                                folderview->selected = NULL;
                        if (folderview->opened == node)
@@ -2895,7 +2895,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
 {
        gint row, column;
        FolderItem *item = NULL, *src_item = NULL;
-       GtkCTreeNode *node = NULL;
+       GtkCMCTreeNode *node = NULL;
        gboolean acceptable = FALSE;
        GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
                                GTK_SCROLLED_WINDOW(folderview->scrolledwin));
@@ -2904,8 +2904,8 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
        int vpos = (int) pos->value;
        int offset = prefs_common.show_col_headers ? 24:0;
        
-       if (gtk_clist_get_selection_info
-               (GTK_CLIST(widget), x - offset, y - offset, &row, &column)) {
+       if (gtk_cmclist_get_selection_info
+               (GTK_CMCLIST(widget), x - offset, y - offset, &row, &column)) {
                GtkWidget *srcwidget;
 
                if (y > height - 24 && height + vpos < total_height) {
@@ -2917,8 +2917,8 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                        gtk_adjustment_changed(pos);
                }
 
-               node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
-               item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
+               node = gtk_cmctree_node_nth(GTK_CMCTREE(widget), row);
+               item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(widget), node);
                src_item = folderview->summaryview->folder_item;
 
                srcwidget = gtk_drag_get_source_widget(context);
@@ -2958,7 +2958,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                g_signal_handlers_block_by_func
                        (G_OBJECT(widget),
                         G_CALLBACK(folderview_selected), folderview);
-               gtk_ctree_select(GTK_CTREE(widget), node);
+               gtk_cmctree_select(GTK_CMCTREE(widget), node);
                g_signal_handlers_unblock_by_func
                        (G_OBJECT(widget),
                         G_CALLBACK(folderview_selected), folderview);
@@ -2967,7 +2967,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                        GDK_ACTION_COPY : GDK_ACTION_MOVE) , time);
        } else {
                if (folderview->opened)
-                       gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
+                       gtk_cmctree_select(GTK_CMCTREE(widget), folderview->opened);
                gdk_drag_status(context, 0, time);
        }
 
@@ -2980,7 +2980,7 @@ static void folderview_drag_leave_cb(GtkWidget      *widget,
                                     FolderView     *folderview)
 {
        drag_state_stop(folderview);
-       gtk_ctree_select(GTK_CTREE(widget), folderview->opened);
+       gtk_cmctree_select(GTK_CMCTREE(widget), folderview->opened);
 }
 
 static void free_info (gpointer stuff, gpointer data)
@@ -3043,19 +3043,19 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
 {
        gint row, column;
        FolderItem *item = NULL, *src_item;
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
        int offset = prefs_common.show_col_headers ? 24:0;
 
        if (info == TARGET_DUMMY) {
                drag_state_stop(folderview);
                if ((void *)strstr(data->data, "FROM_OTHER_FOLDER") != (void *)data->data) {
                        /* comes from summaryview */
-                       if (gtk_clist_get_selection_info
-                               (GTK_CLIST(widget), x - offset, y - offset, &row, &column) == 0)
+                       if (gtk_cmclist_get_selection_info
+                               (GTK_CMCLIST(widget), x - offset, y - offset, &row, &column) == 0)
                                return;
 
-                       node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
-                       item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
+                       node = gtk_cmctree_node_nth(GTK_CMCTREE(widget), row);
+                       item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(widget), node);
                        src_item = folderview->summaryview->folder_item;
 
                        if (item->no_select) {
@@ -3092,14 +3092,14 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                        gboolean copy = (drag_context->action == GDK_ACTION_COPY);
 
                        source = data->data + 17;
-                       if (gtk_clist_get_selection_info
-                           (GTK_CLIST(widget), x - offset, y - offset, &row, &column) == 0
+                       if (gtk_cmclist_get_selection_info
+                           (GTK_CMCLIST(widget), x - offset, y - offset, &row, &column) == 0
                            || *source == 0) {
                                gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
                                return;
                        }
-                       node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
-                       item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
+                       node = gtk_cmctree_node_nth(GTK_CMCTREE(widget), row);
+                       item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(widget), node);
                        src_item = folder_find_item_from_identifier(source);
 
                        folder_is_normal = 
@@ -3119,17 +3119,17 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                }
                folderview->nodes_to_recollapse = NULL;
        } else if (info == TARGET_MAIL_URI_LIST) {
-               if (gtk_clist_get_selection_info
-                       (GTK_CLIST(widget), x - offset, y - offset, &row, &column) == 0)
+               if (gtk_cmclist_get_selection_info
+                       (GTK_CMCLIST(widget), x - offset, y - offset, &row, &column) == 0)
                        return;
 
-               node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
+               node = gtk_cmctree_node_nth(GTK_CMCTREE(widget), row);
                if (!node) {
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);
                        debug_print("no node\n");               
                        return;
                }
-               item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
+               item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(widget), node);
                if (!item) {
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
                        debug_print("no item\n");
index af75e17..ed7ec4c 100644 (file)
@@ -25,8 +25,8 @@ typedef struct _FolderViewPopup       FolderViewPopup;
 typedef struct _FolderColumnState      FolderColumnState;
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkctree.h>
+#include <gtk/gtk.h>
+#include "gtk/gtksctree.h"
 
 #include "mainwindow.h"
 #include "summaryview.h"
@@ -55,8 +55,8 @@ struct _FolderView
 
        GHashTable *popups;
 
-       GtkCTreeNode *selected;
-       GtkCTreeNode *opened;
+       GtkCMCTreeNode *selected;
+       GtkCMCTreeNode *opened;
 
        gboolean open_folder;
 
@@ -73,7 +73,7 @@ struct _FolderView
        GSList *nodes_to_recollapse;
        guint   drag_timer;             /* timer id */
        FolderItem *drag_item;          /* dragged item */
-       GtkCTreeNode *drag_node;        /* drag node */
+       GtkCMCTreeNode *drag_node;      /* drag node */
        
        GtkTargetList *target_list; /* DnD */
        FolderColumnState col_state[N_FOLDER_COLS];
index 36534a0..66c8e2b 100644 (file)
@@ -93,7 +93,7 @@ static void refresh_clicked   (GtkWidget      *widget,
 static gboolean key_pressed    (GtkWidget      *widget,
                                 GdkEventKey    *event,
                                 gpointer        data);
-static gboolean button_press_cb (GtkCTree      *ctree,
+static gboolean button_press_cb (GtkCMCTree    *ctree,
                                 GdkEventButton *button,
                                 gpointer        data);
 static void entry_activated    (GtkEditable    *editable);
@@ -216,17 +216,17 @@ static void grouplist_dialog_create(void)
        titles[0] = _("Newsgroup name");
        titles[1] = _("Messages");
        titles[2] = _("Type");
-       ctree = gtk_ctree_new_with_titles(3, 0, titles);
+       ctree = gtk_cmctree_new_with_titles(3, 0, titles);
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
-       gtk_clist_set_column_width
-               (GTK_CLIST(ctree), 0, GROUPLIST_COL_NAME_WIDTH);
-       gtk_clist_set_column_auto_resize(GTK_CLIST(ctree), 0, TRUE);
-       gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_MULTIPLE);
-       gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
-       gtk_ctree_set_expander_style(GTK_CTREE(ctree),
-                                    GTK_CTREE_EXPANDER_SQUARE);
+       gtk_cmclist_set_column_width
+               (GTK_CMCLIST(ctree), 0, GROUPLIST_COL_NAME_WIDTH);
+       gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), 0, TRUE);
+       gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_MULTIPLE);
+       gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_DOTTED);
+       gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
+                                    GTK_CMCTREE_EXPANDER_SQUARE);
        for (i = 0; i < 3; i++)
-               GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
+               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[i].button,
                                       GTK_CAN_FOCUS);
        g_signal_connect(G_OBJECT(ctree), "button-press-event",
                         G_CALLBACK(button_press_cb), NULL);
@@ -268,13 +268,13 @@ static void grouplist_hash_done(void)
        g_hash_table_destroy(branch_node_table);
 }
 
-static GtkCTreeNode *grouplist_hash_get_branch_node(const gchar *name)
+static GtkCMCTreeNode *grouplist_hash_get_branch_node(const gchar *name)
 {
        return g_hash_table_lookup(branch_node_table, name);
 }
 
 static void grouplist_hash_set_branch_node(const gchar *name,
-                                          GtkCTreeNode *node)
+                                          GtkCMCTreeNode *node)
 {
        g_hash_table_insert(branch_node_table, g_strdup(name), node);
 }
@@ -289,11 +289,11 @@ static gchar *grouplist_get_parent_name(const gchar *name)
        return g_strndup(name, p - name);
 }
 
-static GtkCTreeNode *grouplist_create_parent(const gchar *name,
+static GtkCMCTreeNode *grouplist_create_parent(const gchar *name,
                                             const gchar *pattern)
 {
-       GtkCTreeNode *parent;
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *parent;
+       GtkCMCTreeNode *node;
        gchar *cols[3];
        gchar *parent_name;
 
@@ -307,14 +307,14 @@ static GtkCTreeNode *grouplist_create_parent(const gchar *name,
        parent_name = grouplist_get_parent_name(name);
        parent = grouplist_create_parent(parent_name, pattern);
 
-       node = parent ? GTK_CTREE_ROW(parent)->children
-               : GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-       node = gtk_sctree_insert_node(GTK_CTREE(ctree), parent, node,
+       node = parent ? GTK_CMCTREE_ROW(parent)->children
+               : GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
+       node = gtk_sctree_insert_node(GTK_CMCTREE(ctree), parent, node,
                                     cols, 0, NULL, NULL, NULL, NULL,
                                     FALSE, FALSE);
        if (parent && g_pattern_match_simple(pattern, parent_name) == FALSE)
-               gtk_ctree_expand(GTK_CTREE(ctree), parent);
-       gtk_ctree_node_set_selectable(GTK_CTREE(ctree), node, FALSE);
+               gtk_cmctree_expand(GTK_CMCTREE(ctree), parent);
+       gtk_cmctree_node_set_selectable(GTK_CMCTREE(ctree), node, FALSE);
 
        grouplist_hash_set_branch_node(name, node);
 
@@ -323,11 +323,11 @@ static GtkCTreeNode *grouplist_create_parent(const gchar *name,
        return node;
 }
 
-static GtkCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo,
+static GtkCMCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo,
                                             const gchar *pattern)
 {
-       GtkCTreeNode *node;
-       GtkCTreeNode *parent;
+       GtkCMCTreeNode *node;
+       GtkCMCTreeNode *parent;
        gchar *name = (gchar *)ginfo->name;
        gchar *parent_name;
        gchar *count_str;
@@ -354,36 +354,36 @@ static GtkCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo,
        parent = grouplist_create_parent(parent_name, pattern);
        node = grouplist_hash_get_branch_node(name);
        if (node) {
-               gtk_sctree_set_node_info(GTK_CTREE(ctree), node, cols[0], 0,
+               gtk_sctree_set_node_info(GTK_CMCTREE(ctree), node, cols[0], 0,
                                        NULL, NULL, NULL, NULL, FALSE, FALSE);
-               gtk_ctree_node_set_text(GTK_CTREE(ctree), node, 1, cols[1]);
-               gtk_ctree_node_set_text(GTK_CTREE(ctree), node, 2, cols[2]);
+               gtk_cmctree_node_set_text(GTK_CMCTREE(ctree), node, 1, cols[1]);
+               gtk_cmctree_node_set_text(GTK_CMCTREE(ctree), node, 2, cols[2]);
        } else {
-               node = parent ? GTK_CTREE_ROW(parent)->children
-                       : GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
-               node = gtk_sctree_insert_node(GTK_CTREE(ctree), parent, node,
+               node = parent ? GTK_CMCTREE_ROW(parent)->children
+                       : GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
+               node = gtk_sctree_insert_node(GTK_CMCTREE(ctree), parent, node,
                                             cols, 0, NULL, NULL, NULL, NULL,
                                             TRUE, FALSE);
                if (parent &&
                    g_pattern_match_simple(pattern, parent_name) == FALSE)
-                       gtk_ctree_expand(GTK_CTREE(ctree), parent);
+                       gtk_cmctree_expand(GTK_CMCTREE(ctree), parent);
        }
-       gtk_ctree_node_set_selectable(GTK_CTREE(ctree), node, TRUE);
+       gtk_cmctree_node_set_selectable(GTK_CMCTREE(ctree), node, TRUE);
        if (node)
-               gtk_ctree_node_set_row_data(GTK_CTREE(ctree), node, ginfo);
+               gtk_cmctree_node_set_row_data(GTK_CMCTREE(ctree), node, ginfo);
 
        g_free(parent_name);
 
        return node;
 }
 
-static void grouplist_expand_upwards(GtkCTree *ctree, const gchar *name) {
+static void grouplist_expand_upwards(GtkCMCTree *ctree, const gchar *name) {
        const gchar *ptr;
        gchar *newname=g_malloc0(strlen(name));
 
        for (ptr=name; *ptr; ptr++) {
                if (*ptr == '.')
-                       gtk_ctree_expand(ctree, 
+                       gtk_cmctree_expand(ctree, 
                                grouplist_hash_get_branch_node(newname));
                newname[ptr-name] = *ptr;
        }
@@ -394,7 +394,7 @@ static void grouplist_dialog_set_list(const gchar *pattern, gboolean refresh)
 {
        static GdkCursor *watch_cursor = NULL;
        GSList *cur;
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
        GPatternSpec *pspec;
 
        if (locked) return;
@@ -424,13 +424,13 @@ static void grouplist_dialog_set_list(const gchar *pattern, gboolean refresh)
                        return;
                }
        } else
-               gtk_clist_clear(GTK_CLIST(ctree));
+               gtk_cmclist_clear(GTK_CMCLIST(ctree));
 
        gtk_entry_set_text(GTK_ENTRY(entry), pattern);
 
        grouplist_hash_init();
 
-       gtk_clist_freeze(GTK_CLIST(ctree));
+       gtk_cmclist_freeze(GTK_CMCLIST(ctree));
 
        pspec = g_pattern_spec_new(pattern);
 
@@ -442,15 +442,15 @@ static void grouplist_dialog_set_list(const gchar *pattern, gboolean refresh)
                        if (g_slist_find_custom(subscribed, ginfo->name,
                                                (GCompareFunc)g_ascii_strcasecmp)
                            != NULL)
-                               gtk_ctree_select(GTK_CTREE(ctree), node);
+                               gtk_cmctree_select(GTK_CMCTREE(ctree), node);
                }
        }
        for (cur = subscribed; cur; cur = g_slist_next(cur))
-               grouplist_expand_upwards(GTK_CTREE(ctree), (gchar *)cur->data);
+               grouplist_expand_upwards(GTK_CMCTREE(ctree), (gchar *)cur->data);
 
        g_pattern_spec_free(pspec);
 
-       gtk_clist_thaw(GTK_CLIST(ctree));
+       gtk_cmclist_thaw(GTK_CMCLIST(ctree));
 
        grouplist_hash_done();
 
@@ -475,7 +475,7 @@ static void grouplist_search(void)
 
 static void grouplist_clear(void)
 {
-       gtk_clist_clear(GTK_CLIST(ctree));
+       gtk_cmclist_clear(GTK_CMCLIST(ctree));
        gtk_entry_set_text(GTK_ENTRY(entry), "");
        news_group_list_free(group_list);
        group_list = NULL;
@@ -546,28 +546,28 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data
  * - handle click on expander
  * - update "subscribed" list and un-/select row
  */
-static gboolean button_press_cb(GtkCTree *ctree, GdkEventButton *button,
+static gboolean button_press_cb(GtkCMCTree *ctree, GdkEventButton *button,
                                gpointer data)
 {
        gint row, col;
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
        NewsGroupInfo *ginfo;
        GSList *list;
 
        if (button->type != GDK_BUTTON_PRESS) return TRUE;
        if (button->button != 1) return TRUE;
 
-       gtk_clist_get_selection_info(GTK_CLIST(ctree), 
+       gtk_cmclist_get_selection_info(GTK_CMCLIST(ctree), 
                                     button->x, button->y, &row, &col);
-       node = gtk_ctree_node_nth(ctree, row);
+       node = gtk_cmctree_node_nth(ctree, row);
        if (!node) return TRUE;
 
-       if (gtk_ctree_is_hot_spot(ctree, button->x, button->y)) {
-               gtk_ctree_toggle_expansion(ctree, node);
+       if (gtk_cmctree_is_hot_spot(ctree, button->x, button->y)) {
+               gtk_cmctree_toggle_expansion(ctree, node);
                return TRUE;
        }
 
-       ginfo = gtk_ctree_node_get_row_data(ctree, node);
+       ginfo = gtk_cmctree_node_get_row_data(ctree, node);
        if (!ginfo) return TRUE;
 
        list = g_slist_find_custom(subscribed, ginfo->name,
@@ -575,10 +575,10 @@ static gboolean button_press_cb(GtkCTree *ctree, GdkEventButton *button,
        if (list) {
                g_free(list->data);
                subscribed = g_slist_remove(subscribed, list->data);
-               gtk_clist_unselect_row(GTK_CLIST(ctree), row, 0);
+               gtk_cmclist_unselect_row(GTK_CMCLIST(ctree), row, 0);
        } else {
                subscribed = g_slist_append(subscribed, g_strdup(ginfo->name));
-               gtk_clist_select_row(GTK_CLIST(ctree), row, 0);
+               gtk_cmclist_select_row(GTK_CMCLIST(ctree), row, 0);
        }
 
        return TRUE;
index 5c36572..9ec3e1c 100644 (file)
@@ -391,7 +391,7 @@ static MimeViewer *image_viewer_create(void)
        imageviewer->error_msg    = error_msg;
        imageviewer->error_lbl    = error_lbl;
 
-       gtk_widget_ref(notebook);
+       g_object_ref(notebook);
 
        g_signal_connect(G_OBJECT(load_button), "clicked",
                         G_CALLBACK(load_cb), imageviewer);
index 6146cf8..b14d016 100644 (file)
@@ -173,7 +173,7 @@ static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item)
 static void new_folder_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder;
@@ -183,7 +183,7 @@ static void new_folder_cb(GtkAction *action, gpointer data)
        
        if (!folderview->selected) return;
 
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
        g_return_if_fail(item->folder->account != NULL);
@@ -341,7 +341,7 @@ static void copy_folder_cb(GtkAction *action, gpointer data)
 static void delete_folder_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        gchar *message, *name;
        AlertValue avalue;
@@ -350,7 +350,7 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
 
        if (!folderview->selected) return;
 
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->path != NULL);
        g_return_if_fail(item->folder != NULL);
@@ -371,7 +371,7 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
        old_id = folder_item_get_identifier(item);
 
        if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
+           gtk_cmctree_is_ancestor(ctree,
                                  folderview->selected,
                                  folderview->opened)) {
                summary_clear_all(folderview->summaryview);
@@ -485,7 +485,7 @@ static gboolean imap_gtk_subscribe_func(GNode *node, gpointer data)
 
 static void subscribe_cb_full(FolderView *folderview, guint action)
 {
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        gchar *message, *name;
        AlertValue avalue;
@@ -494,7 +494,7 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
 
        if (!folderview->selected) return;
 
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
@@ -580,7 +580,7 @@ static void subscribe_cb_full(FolderView *folderview, guint action)
        
        if (!action) {
                if (folderview->opened == folderview->selected ||
-                   gtk_ctree_is_ancestor(ctree,
+                   gtk_cmctree_is_ancestor(ctree,
                                          folderview->selected,
                                          folderview->opened)) {
                        summary_clear_all(folderview->summaryview);
@@ -612,8 +612,8 @@ static void unsubscribe_cb(GtkAction *action, gpointer data)
 static void subscribed_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       FolderItem *item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+       FolderItem *item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        
        if (!item || !item->folder || !item->folder->account)
                return;
@@ -621,7 +621,7 @@ static void subscribed_cb(GtkAction *action, gpointer data)
                return;
 
        if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
+           gtk_cmctree_is_ancestor(ctree,
                                  folderview->selected,
                                  folderview->opened)) {
                summary_clear_all(folderview->summaryview);
@@ -635,11 +635,11 @@ static void subscribed_cb(GtkAction *action, gpointer data)
 static void download_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
 
        if (!folderview->selected) return;
 
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        imap_gtk_synchronise(item, 0);
 }
index a1ebc08..2ed95d4 100644 (file)
@@ -203,7 +203,7 @@ static void imp_ldif_message( void ) {
  * Update list with data for current row.
  * \param clist List to update.
  */
-static void imp_ldif_update_row( GtkCList *clist ) {
+static void imp_ldif_update_row( GtkCMCList *clist ) {
        Ldif_FieldRec *rec;
        gchar *text[ FIELDS_N_COLS ];
        gint row;
@@ -211,31 +211,31 @@ static void imp_ldif_update_row( GtkCList *clist ) {
        if( impldif_dlg.rowIndSelect < 0 ) return;
        row = impldif_dlg.rowIndSelect;
 
-       rec = gtk_clist_get_row_data( clist, row );
+       rec = gtk_cmclist_get_row_data( clist, row );
        text[ FIELD_COL_RESERVED ] = "";
        text[ FIELD_COL_SELECT   ] = "";
        text[ FIELD_COL_FIELD    ] = rec->tagName;
        text[ FIELD_COL_ATTRIB   ] = rec->userName;
 
-       gtk_clist_freeze( clist );
-       gtk_clist_remove( clist, row );
+       gtk_cmclist_freeze( clist );
+       gtk_cmclist_remove( clist, row );
        if( row == impldif_dlg.rowCount - 1 ) {
-               gtk_clist_append( clist, text );
+               gtk_cmclist_append( clist, text );
        }
        else {
-               gtk_clist_insert( clist, row, text );
+               gtk_cmclist_insert( clist, row, text );
        }
        if( rec->selected ) {
-               gtk_clist_set_pixmap(
+               gtk_cmclist_set_pixmap(
                        clist, row, FIELD_COL_SELECT, markxpm, markxpmmask );
        }
        if( rec->reserved ) {
-               gtk_clist_set_pixmap(
+               gtk_cmclist_set_pixmap(
                        clist, row, FIELD_COL_RESERVED, markxpm, markxpmmask );
        }
 
-       gtk_clist_set_row_data( clist, row, rec );
-       gtk_clist_thaw( clist );
+       gtk_cmclist_set_row_data( clist, row, rec );
+       gtk_cmclist_thaw( clist );
 }
 
 /**
@@ -243,14 +243,14 @@ static void imp_ldif_update_row( GtkCList *clist ) {
  * \param ldf LDIF control data.
  */
 static void imp_ldif_load_fields( LdifFile *ldf ) {
-       GtkCList *clist = GTK_CLIST(impldif_dlg.clist_field);
+       GtkCMCList *clist = GTK_CMCLIST(impldif_dlg.clist_field);
        GList *node, *list;
        gchar *text[ FIELDS_N_COLS ];
 
        impldif_dlg.rowIndSelect = -1;
        impldif_dlg.rowCount = 0;
        if( ! ldf->accessFlag ) return;
-       gtk_clist_clear( clist );
+       gtk_cmclist_clear( clist );
        list = ldif_get_fieldlist( ldf );
        node = list;
        while( node ) {
@@ -261,14 +261,14 @@ static void imp_ldif_load_fields( LdifFile *ldf ) {
                text[ FIELD_COL_SELECT   ] = "";
                text[ FIELD_COL_FIELD    ] = rec->tagName;
                text[ FIELD_COL_ATTRIB   ] = rec->userName;
-               row = gtk_clist_append( clist, text );
-               gtk_clist_set_row_data( clist, row, rec );
+               row = gtk_cmclist_append( clist, text );
+               gtk_cmclist_set_row_data( clist, row, rec );
                if( rec->selected ) {
-                       gtk_clist_set_pixmap( clist, row,
+                       gtk_cmclist_set_pixmap( clist, row,
                                FIELD_COL_SELECT, markxpm, markxpmmask );
                }
                if( rec->reserved ) {
-                       gtk_clist_set_pixmap( clist, row,
+                       gtk_cmclist_set_pixmap( clist, row,
                                FIELD_COL_RESERVED, markxpm, markxpmmask );
                }
                impldif_dlg.rowCount++;
@@ -288,10 +288,10 @@ static void imp_ldif_load_fields( LdifFile *ldf ) {
  * \param data  User data.
  */
 static void imp_ldif_field_list_selected(
-               GtkCList *clist, gint row, gint column, GdkEvent *event,
+               GtkCMCList *clist, gint row, gint column, GdkEvent *event,
                gpointer data )
 {
-       Ldif_FieldRec *rec = gtk_clist_get_row_data( clist, row );
+       Ldif_FieldRec *rec = gtk_cmclist_get_row_data( clist, row );
 
        impldif_dlg.rowIndSelect = row;
        gtk_entry_set_text( GTK_ENTRY(impldif_dlg.entryAttrib), "" );
@@ -324,7 +324,7 @@ static void imp_ldif_field_list_selected(
  * \param data  Data.
  */
 static gboolean imp_ldif_field_list_toggle(
-               GtkCList *clist, GdkEventButton *event, gpointer data )
+               GtkCMCList *clist, GdkEventButton *event, gpointer data )
 {
        Ldif_FieldRec *rec;
        gboolean toggle = FALSE;
@@ -338,7 +338,7 @@ static gboolean imp_ldif_field_list_toggle(
                        gint y = event->y;
                        gint row, col;
 
-                       gtk_clist_get_selection_info( clist, x, y, &row, &col );
+                       gtk_cmclist_get_selection_info( clist, x, y, &row, &col );
                        if( col != FIELD_COL_SELECT ) return FALSE;
                        if( row > impldif_dlg.rowCount ) return FALSE;
 
@@ -354,7 +354,7 @@ static gboolean imp_ldif_field_list_toggle(
        }
        /* Toggle field selection */
        if( toggle ) {
-               rec = gtk_clist_get_row_data(
+               rec = gtk_cmclist_get_row_data(
                        clist, impldif_dlg.rowIndSelect );
                if( rec ) {
                        ldif_field_toggle( rec );
@@ -370,20 +370,20 @@ static gboolean imp_ldif_field_list_toggle(
  * \param data   User data.
  */
 static void imp_ldif_modify_pressed( GtkWidget *widget, gpointer data ) {
-       GtkCList *clist = GTK_CLIST(impldif_dlg.clist_field);
+       GtkCMCList *clist = GTK_CMCLIST(impldif_dlg.clist_field);
        Ldif_FieldRec *rec;
        gint row;
 
        if( impldif_dlg.rowIndSelect < 0 ) return;
        row = impldif_dlg.rowIndSelect;
-       rec = gtk_clist_get_row_data( clist, impldif_dlg.rowIndSelect );
+       rec = gtk_cmclist_get_row_data( clist, impldif_dlg.rowIndSelect );
 
        ldif_field_set_name( rec, gtk_editable_get_chars(
                GTK_EDITABLE(impldif_dlg.entryAttrib), 0, -1 ) );
        ldif_field_set_selected( rec, gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON( impldif_dlg.checkSelect) ) );
        imp_ldif_update_row( clist );
-       gtk_clist_select_row( clist, row, 0 );
+       gtk_cmclist_select_row( clist, row, 0 );
        gtk_label_set_text( GTK_LABEL(impldif_dlg.entryField), "" );
        gtk_entry_set_text( GTK_ENTRY(impldif_dlg.entryAttrib), "" );
        gtk_toggle_button_set_active(
@@ -752,23 +752,23 @@ static void imp_ldif_page_fields( gint pageNum, gchar *pageLbl ) {
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
 
-       clist_field = gtk_clist_new_with_titles( FIELDS_N_COLS, titles );
+       clist_field = gtk_cmclist_new_with_titles( FIELDS_N_COLS, titles );
        gtk_container_add( GTK_CONTAINER(clist_swin), clist_field );
-       gtk_clist_set_selection_mode(
-               GTK_CLIST(clist_field), GTK_SELECTION_BROWSE );
-       gtk_clist_set_column_width( GTK_CLIST(clist_field),
+       gtk_cmclist_set_selection_mode(
+               GTK_CMCLIST(clist_field), GTK_SELECTION_BROWSE );
+       gtk_cmclist_set_column_width( GTK_CMCLIST(clist_field),
                FIELD_COL_RESERVED, FIELDS_COL_WIDTH_RESERVED );
-       gtk_clist_set_column_width( GTK_CLIST(clist_field),
+       gtk_cmclist_set_column_width( GTK_CMCLIST(clist_field),
                FIELD_COL_SELECT, FIELDS_COL_WIDTH_SELECT );
-       gtk_clist_set_column_width( GTK_CLIST(clist_field),
+       gtk_cmclist_set_column_width( GTK_CMCLIST(clist_field),
                FIELD_COL_FIELD, FIELDS_COL_WIDTH_FIELD );
-       gtk_clist_set_column_width( GTK_CLIST(clist_field),
+       gtk_cmclist_set_column_width( GTK_CMCLIST(clist_field),
                FIELD_COL_ATTRIB, FIELDS_COL_WIDTH_ATTRIB );
 
        /* Remove focus capability for column headers */
        for( i = 0; i < FIELDS_N_COLS; i++ ) {
                GTK_WIDGET_UNSET_FLAGS(
-                       GTK_CLIST(clist_field)->column[i].button,
+                       GTK_CMCLIST(clist_field)->column[i].button,
                        GTK_CAN_FOCUS);
        }
 
@@ -1055,7 +1055,7 @@ AddressBookFile *addressbook_imp_ldif( AddressIndex *addrIndex ) {
        gtk_entry_set_text( GTK_ENTRY(impldif_dlg.entryFile), "" );
        gtk_label_set_text( GTK_LABEL(impldif_dlg.entryField), "" );
        gtk_entry_set_text( GTK_ENTRY(impldif_dlg.entryAttrib), "" );
-       gtk_clist_clear( GTK_CLIST(impldif_dlg.clist_field) );
+       gtk_cmclist_clear( GTK_CMCLIST(impldif_dlg.clist_field) );
        gtk_notebook_set_current_page( GTK_NOTEBOOK(impldif_dlg.notebook), PAGE_FILE_INFO );
        gtk_widget_set_sensitive( impldif_dlg.btnPrev, FALSE );
        gtk_widget_set_sensitive( impldif_dlg.btnNext, TRUE );
index 94bd154..e6fe315 100644 (file)
@@ -323,7 +323,7 @@ static void startup_notification_complete(gboolean with_window)
                 * if we have been launched from a menu.
                 * We have to display a window, so let it be very little */
                hack = gtk_window_new(GTK_WINDOW_POPUP);
-               gtk_widget_set_uposition(hack, 0, 0);
+               gtk_window_move(GTK_WINDOW(hack), 0, 0);
                gtk_widget_set_size_request(hack, 1, 1);
                gtk_widget_show(hack);
        }
@@ -1153,7 +1153,6 @@ int main(int argc, char *argv[])
 #endif 
        gdk_rgb_init();
        gtk_widget_set_default_colormap(gdk_rgb_get_colormap());
-       gtk_widget_set_default_visual(gdk_rgb_get_visual());
 
        gui_manager = gtkut_create_ui_manager();
 
@@ -1365,7 +1364,7 @@ int main(int argc, char *argv[])
        manage_window_focus_in(mainwin->window, NULL, NULL);
        folderview = mainwin->folderview;
 
-       gtk_clist_freeze(GTK_CLIST(mainwin->folderview->ctree));
+       gtk_cmclist_freeze(GTK_CMCLIST(mainwin->folderview->ctree));
        folder_item_update_freeze();
 
        /* register the callback of unix domain socket input */
@@ -1579,7 +1578,7 @@ int main(int argc, char *argv[])
 #endif
 
        folder_item_update_thaw();
-       gtk_clist_thaw(GTK_CLIST(mainwin->folderview->ctree));
+       gtk_cmclist_thaw(GTK_CMCLIST(mainwin->folderview->ctree));
        main_window_cursor_normal(mainwin);
 
        if (!cmd.target && prefs_common.goto_last_folder_on_startup &&
@@ -1686,7 +1685,7 @@ static void exit_claws(MainWindow *mainwin)
        if(mainwin->folderview->opened) {
                FolderItem *item;
 
-               item = gtk_ctree_node_get_row_data(GTK_CTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
+               item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(mainwin->folderview->ctree), mainwin->folderview->opened);
                summary_save_prefs_to_folderitem(mainwin->folderview->summaryview, item);
                prefs_common.last_opened_folder = folder_item_get_identifier(item);
        }
index 841a40e..ca64ad9 100644 (file)
@@ -2653,9 +2653,9 @@ static void main_window_separation_change(MainWindow *mainwin, LayoutType layout
                    prefs_common.layout_mode, layout_mode);
 
        /* remove widgets from those containers */
-       gtk_widget_ref(folder_wid);
-       gtk_widget_ref(summary_wid);
-       gtk_widget_ref(message_wid);
+       g_object_ref(folder_wid);
+       g_object_ref(summary_wid);
+       g_object_ref(message_wid);
        gtkut_container_remove
                (GTK_CONTAINER(folder_wid->parent), folder_wid);
        gtkut_container_remove
@@ -2667,9 +2667,9 @@ static void main_window_separation_change(MainWindow *mainwin, LayoutType layout
        main_window_set_widgets(mainwin, layout_mode);
        gtk_widget_show(mainwin->window);
 
-       gtk_widget_unref(folder_wid);
-       gtk_widget_unref(summary_wid);
-       gtk_widget_unref(message_wid);
+       g_object_unref(folder_wid);
+       g_object_unref(summary_wid);
+       g_object_unref(message_wid);
 }
 #endif
 void mainwindow_reset_paned(GtkPaned *paned)
@@ -2735,14 +2735,14 @@ void main_window_toggle_message_view(MainWindow *mainwin)
                if (ppaned->parent != NULL) {
                        mainwin->messageview->visible = FALSE;
                        summaryview->displayed = NULL;
-                       gtk_widget_ref(ppaned);
+                       g_object_ref(ppaned);
                        gtkut_container_remove(GTK_CONTAINER(container), ppaned);
                        gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
                } else {
                        mainwin->messageview->visible = TRUE;
                        gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), ppaned);
                        gtk_container_add(GTK_CONTAINER(container), ppaned);
-                       gtk_widget_unref(ppaned);
+                       g_object_unref(ppaned);
                }
                break;
        case WIDE_LAYOUT:
@@ -2751,12 +2751,12 @@ void main_window_toggle_message_view(MainWindow *mainwin)
                if (mainwin->messageview->vbox->parent != NULL) {
                        mainwin->messageview->visible = FALSE;
                        summaryview->displayed = NULL;
-                       gtk_widget_ref(mainwin->messageview->vbox);
+                       g_object_ref(mainwin->messageview->vbox);
                        gtkut_container_remove(GTK_CONTAINER(container), mainwin->messageview->vbox);
                } else {
                        mainwin->messageview->visible = TRUE;
                        gtk_container_add(GTK_CONTAINER(container), mainwin->messageview->vbox);
-                       gtk_widget_unref(mainwin->messageview->vbox);
+                       g_object_unref(mainwin->messageview->vbox);
                }
                break;
        case WIDE_MSGLIST_LAYOUT:
@@ -3474,7 +3474,7 @@ void main_window_show(MainWindow *mainwin)
        gtk_widget_show(mainwin->window);
        gtk_widget_show(mainwin->vbox_body);
 #ifndef GENERIC_UMPC
-        gtk_widget_set_uposition(mainwin->window,
+        gtk_window_move(GTK_WINDOW(mainwin->window),
                                  prefs_common.mainwin_x,
                                  prefs_common.mainwin_y);
 
@@ -3565,7 +3565,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
                } else {
                        gtk_paned_add2(GTK_PANED(hpaned),
                                       GTK_WIDGET_PTR(mainwin->summaryview));
-                       gtk_widget_ref(vpaned);
+                       g_object_ref(vpaned);
                }
                gtk_paned_add2(GTK_PANED(vpaned),
                               GTK_WIDGET_PTR(mainwin->messageview));
@@ -3593,7 +3593,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
                        gtk_paned_add2(GTK_PANED(vpaned),
                               GTK_WIDGET_PTR(mainwin->messageview));   
                } else {
-                       gtk_widget_ref(GTK_WIDGET_PTR(mainwin->messageview));
+                       g_object_ref(GTK_WIDGET_PTR(mainwin->messageview));
                }
                gtk_widget_show(vpaned);
                gtk_widget_queue_resize(vpaned);
@@ -3615,7 +3615,7 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
                        gtk_paned_add2(GTK_PANED(hpaned),
                               GTK_WIDGET_PTR(mainwin->messageview));   
                } else {
-                       gtk_widget_ref(GTK_WIDGET_PTR(mainwin->messageview));
+                       g_object_ref(GTK_WIDGET_PTR(mainwin->messageview));
                }
                gtk_paned_add2(GTK_PANED(vpaned), hpaned);
 
@@ -3978,12 +3978,12 @@ static void toggle_col_headers_cb(GtkAction *gaction, gpointer data)
        SummaryView *summaryview = mainwin->summaryview;
 
        if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (gaction))) {
-               gtk_clist_column_titles_show(GTK_CLIST(folderview->ctree));
-               gtk_clist_column_titles_show(GTK_CLIST(summaryview->ctree));
+               gtk_cmclist_column_titles_show(GTK_CMCLIST(folderview->ctree));
+               gtk_cmclist_column_titles_show(GTK_CMCLIST(summaryview->ctree));
                prefs_common.show_col_headers = TRUE;
        } else {
-               gtk_clist_column_titles_hide(GTK_CLIST(folderview->ctree));
-               gtk_clist_column_titles_hide(GTK_CLIST(summaryview->ctree));
+               gtk_cmclist_column_titles_hide(GTK_CMCLIST(folderview->ctree));
+               gtk_cmclist_column_titles_hide(GTK_CMCLIST(summaryview->ctree));
                prefs_common.show_col_headers = FALSE;
        }
 }
@@ -4538,7 +4538,7 @@ static void update_summary_cb(GtkAction *action, gpointer data)
 
        folder_update_op_count();
 
-       fitem = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree),
+       fitem = gtk_cmctree_node_get_row_data(GTK_CMCTREE(folderview->ctree),
                                            folderview->opened);
        if (!fitem) return;
 
@@ -4846,8 +4846,8 @@ static gboolean mainwindow_focus_in_event(GtkWidget *widget, GdkEventFocus *focu
        summary = ((MainWindow *)data)->summaryview;
        g_return_val_if_fail(summary, FALSE);
 
-       if (GTK_CLIST(summary->ctree)->selection && 
-           g_list_length(GTK_CLIST(summary->ctree)->selection) > 1)
+       if (GTK_CMCLIST(summary->ctree)->selection && 
+           g_list_length(GTK_CMCLIST(summary->ctree)->selection) > 1)
                return FALSE;
 
        return FALSE;
index 0773b4b..94d50e4 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkctree.h>
+#include <gtk/gtk.h>
+#include "gtk/gtksctree.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
index fb4760d..5f7a76e 100644 (file)
@@ -126,7 +126,7 @@ static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item)
 static void new_folder_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder;
@@ -135,7 +135,7 @@ static void new_folder_cb(GtkAction *action, gpointer data)
 
        if (!folderview->selected) return;
 
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
@@ -179,7 +179,7 @@ static void new_folder_cb(GtkAction *action, gpointer data)
 static void delete_folder_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        gchar *message, *name;
        AlertValue avalue;
@@ -207,7 +207,7 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
        old_id = folder_item_get_identifier(item);
 
        if (folderview->opened == folderview->selected ||
-           gtk_ctree_is_ancestor(ctree,
+           gtk_cmctree_is_ancestor(ctree,
                                  folderview->selected,
                                  folderview->opened)) {
                summary_clear_all(folderview->summaryview);
index e66726c..dbafe11 100644 (file)
@@ -75,10 +75,10 @@ typedef enum
 
 static void mimeview_set_multipart_tree                (MimeView       *mimeview,
                                                 MimeInfo       *mimeinfo,
-                                                GtkCTreeNode   *parent);
-static GtkCTreeNode *mimeview_append_part      (MimeView       *mimeview,
+                                                GtkCMCTreeNode *parent);
+static GtkCMCTreeNode *mimeview_append_part    (MimeView       *mimeview,
                                                 MimeInfo       *partinfo,
-                                                GtkCTreeNode   *parent);
+                                                GtkCMCTreeNode *parent);
 static void mimeview_show_message_part         (MimeView       *mimeview,
                                                 MimeInfo       *partinfo);
 static void mimeview_change_view_type          (MimeView       *mimeview,
@@ -89,8 +89,8 @@ static gchar *mimeview_get_filename_for_part          (MimeInfo       *partinfo,
 static gboolean mimeview_write_part            (const gchar    *filename,
                                                 MimeInfo       *partinfo);
 
-static void mimeview_selected          (GtkCTree       *ctree,
-                                        GtkCTreeNode   *node,
+static void mimeview_selected          (GtkCMCTree     *ctree,
+                                        GtkCMCTreeNode *node,
                                         gint            column,
                                         MimeView       *mimeview);
 static void mimeview_start_drag        (GtkWidget      *widget,
@@ -275,14 +275,14 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        ctree = gtk_sctree_new_with_titles(N_MIMEVIEW_COLS, 0, titles);
        gtk_widget_show(ctree);
-       gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
-       gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_NONE);
-       gtk_clist_set_column_justification(GTK_CLIST(ctree), COL_SIZE,
+       gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_BROWSE);
+       gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
+       gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), COL_SIZE,
                                           GTK_JUSTIFY_RIGHT);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), COL_MIMETYPE, 240);
-       gtk_clist_set_column_width(GTK_CLIST(ctree), COL_SIZE, 90);
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), COL_MIMETYPE, 240);
+       gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), COL_SIZE, 90);
        for (i = 0; i < N_MIMEVIEW_COLS; i++)
-               GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
+               GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[i].button,
                                       GTK_CAN_FOCUS);
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
 
@@ -380,7 +380,6 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        paned = gtk_vpaned_new();
        gtk_widget_show(paned);
-       gtk_paned_set_gutter_size(GTK_PANED(paned), 0);
        gtk_paned_pack1(GTK_PANED(paned), ctree_mainbox, FALSE, TRUE);
        gtk_paned_pack2(GTK_PANED(paned), vbox, TRUE, TRUE);
        
@@ -442,8 +441,8 @@ static gboolean any_part_is_signed(MimeInfo *mimeinfo)
 void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
                           const gchar *file)
 {
-       GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
+       GtkCMCTreeNode *node;
 
        mimeview_clear(mimeview);
 
@@ -469,11 +468,11 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
        g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
                                          mimeview_selected, mimeview);
 
-       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
        if (node) {
-               gtk_ctree_select(ctree, node);
+               gtk_cmctree_select(ctree, node);
                icon_list_toggle_by_mime_info
-                       (mimeview, gtk_ctree_node_get_row_data(ctree, node));
+                       (mimeview, gtk_cmctree_node_get_row_data(ctree, node));
                gtkut_ctree_set_focus_row(ctree, node);
        }
 }
@@ -529,16 +528,16 @@ void mimeview_destroy(MimeView *mimeview)
 
 MimeInfo *mimeview_get_selected_part(MimeView *mimeview)
 {
-       return gtk_ctree_node_get_row_data
-               (GTK_CTREE(mimeview->ctree), mimeview->opened);
+       return gtk_cmctree_node_get_row_data
+               (GTK_CMCTREE(mimeview->ctree), mimeview->opened);
 }
 
 gint mimeview_get_selected_part_num(MimeView *mimeview)
 {
        gint i = 0;
-       GList *rows = GTK_CLIST(mimeview->ctree)->row_list;
+       GList *rows = GTK_CMCLIST(mimeview->ctree)->row_list;
        while (rows) {
-               if (mimeview->opened == GTK_CTREE_NODE(rows))
+               if (mimeview->opened == GTK_CMCTREE_NODE(rows))
                        return i;
                i++;
                rows = rows->next;
@@ -550,16 +549,16 @@ void mimeview_select_part_num(MimeView *mimeview, gint i)
 {
        if (i < 0)
                return;
-       gtk_clist_unselect_all(GTK_CLIST(mimeview->ctree));
-       gtk_clist_select_row(GTK_CLIST(mimeview->ctree), i, -1);
-       gtkut_clist_set_focus_row(GTK_CLIST(mimeview->ctree), i);
+       gtk_cmclist_unselect_all(GTK_CMCLIST(mimeview->ctree));
+       gtk_cmclist_select_row(GTK_CMCLIST(mimeview->ctree), i, -1);
+       gtkut_clist_set_focus_row(GTK_CMCLIST(mimeview->ctree), i);
 }
 
 static void mimeview_set_multipart_tree(MimeView *mimeview,
                                        MimeInfo *mimeinfo,
-                                       GtkCTreeNode *parent)
+                                       GtkCMCTreeNode *parent)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
 
        g_return_if_fail(mimeinfo != NULL);
 
@@ -602,12 +601,12 @@ static const gchar *get_part_description(MimeInfo *partinfo)
                return get_part_name(partinfo);
 }
 
-static GtkCTreeNode *mimeview_append_part(MimeView *mimeview,
+static GtkCMCTreeNode *mimeview_append_part(MimeView *mimeview,
                                          MimeInfo *partinfo,
-                                         GtkCTreeNode *parent)
+                                         GtkCMCTreeNode *parent)
 {
-       GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
+       GtkCMCTreeNode *node;
        static gchar content_type[64];
        gchar *str[N_MIMEVIEW_COLS];
 
@@ -627,7 +626,7 @@ static GtkCTreeNode *mimeview_append_part(MimeView *mimeview,
        node = gtk_sctree_insert_node(ctree, parent, NULL, str, 0,
                                     NULL, NULL, NULL, NULL,
                                     FALSE, TRUE);
-       gtk_ctree_node_set_row_data(ctree, node, partinfo);
+       gtk_cmctree_node_set_row_data(ctree, node, partinfo);
 
        return node;
 }
@@ -798,7 +797,7 @@ static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
 
 void mimeview_clear(MimeView *mimeview)
 {
-       GtkCList *clist = NULL;
+       GtkCMCList *clist = NULL;
        
        if (!mimeview)
                return;
@@ -806,11 +805,11 @@ void mimeview_clear(MimeView *mimeview)
        if (g_slist_find(mimeviews, mimeview) == NULL)
                return;
        
-       clist = GTK_CLIST(mimeview->ctree);
+       clist = GTK_CMCLIST(mimeview->ctree);
        
        noticeview_hide(mimeview->siginfoview);
 
-       gtk_clist_clear(clist);
+       gtk_cmclist_clear(clist);
        textview_clear(mimeview->textview);
        if (mimeview->mimeviewer != NULL)
                mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
@@ -1125,9 +1124,9 @@ static void mimeview_check_signature(MimeView *mimeview)
 static void redisplay_email(GtkWidget *widget, gpointer user_data)
 {
        MimeView *mimeview = (MimeView *) user_data;
-       GtkCTreeNode *node = mimeview->opened;
+       GtkCMCTreeNode *node = mimeview->opened;
        mimeview->opened = NULL;
-       mimeview_selected(GTK_CTREE(mimeview->ctree), node, 0, mimeview);
+       mimeview_selected(GTK_CMCTREE(mimeview->ctree), node, 0, mimeview);
 }
 
 static void display_full_info_cb(GtkWidget *widget, gpointer user_data)
@@ -1184,16 +1183,16 @@ static void update_signature_info(MimeView *mimeview, MimeInfo *selected)
        noticeview_show(mimeview->siginfoview);
 }
 
-static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
+static void mimeview_selected(GtkCMCTree *ctree, GtkCMCTreeNode *node, gint column,
                              MimeView *mimeview)
 {
        MimeInfo *partinfo;
        if (mimeview->opened == node) return;
        mimeview->opened = node;
        mimeview->spec_part = NULL;
-       gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
+       gtk_cmctree_node_moveto(ctree, node, -1, 0.5, 0);
 
-       partinfo = gtk_ctree_node_get_row_data(ctree, node);
+       partinfo = gtk_cmctree_node_get_row_data(ctree, node);
        if (!partinfo) return;
 
        /* ungrab the mouse event */
@@ -1244,17 +1243,17 @@ static void mimeview_start_drag(GtkWidget *widget, gint button,
 static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
                                    MimeView *mimeview)
 {
-       GtkCList *clist = GTK_CLIST(widget);
+       GtkCMCList *clist = GTK_CMCLIST(widget);
        gint row, column;
 
        if (!event) return FALSE;
 
        if (event->button == 2 || event->button == 3) {
-               if (!gtk_clist_get_selection_info(clist, event->x, event->y,
+               if (!gtk_cmclist_get_selection_info(clist, event->x, event->y,
                                                  &row, &column))
                        return FALSE;
-               gtk_clist_unselect_all(clist);
-               gtk_clist_select_row(clist, row, column);
+               gtk_cmclist_unselect_all(clist);
+               gtk_cmclist_select_row(clist, row, column);
                gtkut_clist_set_focus_row(clist, row);
        }
        part_button_pressed(mimeview, event, mimeview_get_selected_part(mimeview));
@@ -1325,17 +1324,17 @@ void mimeview_pass_key_press_event(MimeView *mimeview, GdkEventKey *event)
 
 static void mimeview_select_next_part(MimeView *mimeview)
 {
-       GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
-       GtkCTreeNode *node = mimeview->opened;
+       GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
+       GtkCMCTreeNode *node = mimeview->opened;
        MimeInfo *partinfo = NULL;
        
 skip:
-       node = GTK_CTREE_NODE_NEXT(node);
+       node = GTK_CMCTREE_NODE_NEXT(node);
        if (!node)
-               node = gtk_ctree_node_nth(GTK_CTREE(ctree), 0);
+               node = gtk_cmctree_node_nth(GTK_CMCTREE(ctree), 0);
 
        if (node) {
-               partinfo = gtk_ctree_node_get_row_data(ctree, node);
+               partinfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (partinfo->type == MIMETYPE_MULTIPART)
                        goto skip;
                gtk_sctree_unselect_all(GTK_SCTREE(ctree));
@@ -1346,17 +1345,17 @@ skip:
 
 static void mimeview_select_prev_part(MimeView *mimeview)
 {
-       GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
-       GtkCTreeNode *node = mimeview->opened;
+       GtkCMCTree *ctree = GTK_CMCTREE(mimeview->ctree);
+       GtkCMCTreeNode *node = mimeview->opened;
        MimeInfo *partinfo = NULL;
        
 skip:
-       node = GTK_CTREE_NODE_PREV(node);
+       node = GTK_CMCTREE_NODE_PREV(node);
        if (!node)
-               node = gtk_ctree_node_nth(GTK_CTREE(ctree), GTK_CLIST(ctree)->rows - 1);
+               node = gtk_cmctree_node_nth(GTK_CMCTREE(ctree), GTK_CMCLIST(ctree)->rows - 1);
 
        if (node) {
-               partinfo = gtk_ctree_node_get_row_data(ctree, node);
+               partinfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (partinfo->type == MIMETYPE_MULTIPART)
                        goto skip;
                gtk_sctree_unselect_all(GTK_SCTREE(ctree));
@@ -1376,7 +1375,7 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                 MimeView *mimeview)
 {
        SummaryView *summaryview;
-       GtkCTree *ctree = GTK_CTREE(widget);
+       GtkCMCTree *ctree = GTK_CMCTREE(widget);
 
        if (!event) return FALSE;
        if (!mimeview->opened) return FALSE;
@@ -2041,11 +2040,11 @@ static gboolean icon_clicked_cb (GtkWidget *button, GdkEventButton *event, MimeV
 
 static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
 {
-       GtkCTreeNode *node;
-       node = gtk_ctree_find_by_row_data(GTK_CTREE(mimeview->ctree), NULL, partinfo);
+       GtkCMCTreeNode *node;
+       node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(mimeview->ctree), NULL, partinfo);
 
        if (node)
-               gtk_ctree_select(GTK_CTREE(mimeview->ctree), node);
+               gtk_cmctree_select(GTK_CMCTREE(mimeview->ctree), node);
 }              
 
 void mimeview_select_mimepart_icon(MimeView *mimeview, MimeInfo *partinfo)
@@ -2330,7 +2329,7 @@ static void icon_list_clear (MimeView *mimeview)
        GList     *child;
        GtkAdjustment *adj;
                
-       child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
+       child = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
        for (; child != NULL; child = g_list_next(child)) {
                gtkut_container_remove(GTK_CONTAINER(mimeview->icon_vbox), 
                                       GTK_WIDGET(child->data));
@@ -2395,7 +2394,7 @@ static void icon_list_toggle_by_mime_info (MimeView       *mimeview,
 {
        GList *child;
        
-       child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
+       child = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
        for (; child != NULL; child = g_list_next(child)) {
                if (!GTK_IS_EVENT_BOX(child->data))
                        continue;
@@ -2419,7 +2418,7 @@ static void icon_list_toggle_by_mime_info (MimeView       *mimeview,
 static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
                                    MimeView *mimeview)
 {
-       gtk_widget_ref(button); 
+       g_object_ref(button); 
 
        mimeview_leave_notify(button, NULL, NULL);
 
@@ -2435,7 +2434,6 @@ static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
                                        button);
                gtk_box_pack_end(GTK_BOX(mimeview->ctree_mainbox), 
                                   button, FALSE, FALSE, 0);
-               gtk_paned_set_gutter_size(GTK_PANED(mimeview->paned), 6);
        } else {
                gtk_arrow_set(GTK_ARROW(GTK_BIN(button)->child), GTK_ARROW_LEFT, 
                              GTK_SHADOW_NONE);
@@ -2451,12 +2449,11 @@ static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
                gtk_box_reorder_child(GTK_BOX(button->parent), button, 0);
                if (mimeview->opened)
                        icon_list_toggle_by_mime_info
-                               (mimeview, gtk_ctree_node_get_row_data(GTK_CTREE(mimeview->ctree), 
+                               (mimeview, gtk_cmctree_node_get_row_data(GTK_CMCTREE(mimeview->ctree), 
                                                                       mimeview->opened));
 
-               gtk_paned_set_gutter_size(GTK_PANED(mimeview->paned), 0);
        }
-       gtk_widget_unref(button);
+       g_object_unref(button);
        return TRUE;
 }
 
index 9deba16..9b9d91f 100644 (file)
@@ -26,9 +26,8 @@ typedef struct _MimeViewer            MimeViewer;
 
 #include <glib.h>
 #include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkctree.h>
-#include <gtk/gtktooltips.h>
+#include <gtk/gtk.h>
+#include "gtk/gtksctree.h"
 #ifdef USE_PTHREAD
 #include <pthread.h>
 #endif
@@ -74,7 +73,7 @@ struct _MimeView
 
        GtkWidget *popupmenu;
 
-       GtkCTreeNode *opened;
+       GtkCMCTreeNode *opened;
 
        TextView *textview;
        MimeViewer *mimeviewer;
@@ -91,7 +90,9 @@ struct _MimeView
 
        gint icon_count;
        MainWindow *mainwin;
+#if !GTK_CHECK_VERSION(2,12,0)
        GtkTooltips *tooltips;
+#endif
        gint oldsize;
 
        NoticeView *siginfoview;
index a0cb098..0174323 100644 (file)
@@ -133,8 +133,8 @@ static void set_sensitivity(GtkUIManager *ui_manager, FolderItem *item)
 static void subscribe_newsgroup_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
-       GtkCTreeNode *servernode, *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+       GtkCMCTreeNode *servernode, *node;
        Folder *folder;
        FolderItem *item;
        FolderItem *rootitem;
@@ -146,7 +146,7 @@ static void subscribe_newsgroup_cb(GtkAction *action, gpointer data)
        
        if (!folderview->selected) return;
 
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
 
        if (mainwin->lock_count || news_folder_locked(item->folder))
@@ -157,12 +157,12 @@ static void subscribe_newsgroup_cb(GtkAction *action, gpointer data)
        g_return_if_fail(FOLDER_TYPE(folder) == F_NEWS);
        g_return_if_fail(folder->account != NULL);
 
-       if (GTK_CTREE_ROW(folderview->selected)->parent != NULL)
-               servernode = GTK_CTREE_ROW(folderview->selected)->parent;
+       if (GTK_CMCTREE_ROW(folderview->selected)->parent != NULL)
+               servernode = GTK_CMCTREE_ROW(folderview->selected)->parent;
        else
                servernode = folderview->selected;
 
-       rootitem = gtk_ctree_node_get_row_data(ctree, servernode);
+       rootitem = gtk_cmctree_node_get_row_data(ctree, servernode);
 
        new_subscr = grouplist_dialog(folder);
 
@@ -177,7 +177,7 @@ static void subscribe_newsgroup_cb(GtkAction *action, gpointer data)
                        continue;
                }
 
-               node = gtk_ctree_find_by_row_data(ctree, servernode, item);
+               node = gtk_cmctree_find_by_row_data(ctree, servernode, item);
                if (!node) {
                        gnode = next;
                        continue;
@@ -188,13 +188,13 @@ static void subscribe_newsgroup_cb(GtkAction *action, gpointer data)
                        folderview->opened = NULL;
                }
 
-               gtk_ctree_remove_node(ctree, node);
+               gtk_cmctree_remove_node(ctree, node);
                folder_item_remove(item);
 
                gnode = next;
        }
 
-       gtk_clist_freeze(GTK_CLIST(ctree));
+       gtk_cmclist_freeze(GTK_CMCLIST(ctree));
 
        /* add subscribed newsgroups */
        for (cur = new_subscr; cur != NULL; cur = cur->next) {
@@ -213,7 +213,7 @@ static void subscribe_newsgroup_cb(GtkAction *action, gpointer data)
                hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
        }
 
-       gtk_clist_thaw(GTK_CLIST(ctree));
+       gtk_cmclist_thaw(GTK_CMCLIST(ctree));
 
        slist_free_strings(new_subscr);
        g_slist_free(new_subscr);
@@ -224,7 +224,7 @@ static void subscribe_newsgroup_cb(GtkAction *action, gpointer data)
 static void unsubscribe_newsgroup_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        gchar *name;
        gchar *message;
@@ -234,7 +234,7 @@ static void unsubscribe_newsgroup_cb(GtkAction *action, gpointer data)
        
        if (!folderview->selected) return;
 
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        g_return_if_fail(item != NULL);
 
        if (mainwin->lock_count || news_folder_locked(item->folder))
@@ -410,11 +410,11 @@ void news_gtk_synchronise(FolderItem *item, gint days)
 static void download_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
 
        if (!folderview->selected) return;
 
-       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
        news_gtk_synchronise(item, 0);
 }
index 755da5d..1bec584 100644 (file)
@@ -41,7 +41,9 @@ struct _NoticeView
        void            (*press2) (NoticeView *, gpointer user_data);
        gboolean         icon_clickable;
        GtkWidget       *evtbox;
-       GtkTooltips     *tooltips;
+#if !GTK_CHECK_VERSION(2,12,0)
+       GtkTooltips *tooltips;
+#endif
 };
 
 NoticeView     *noticeview_create      (MainWindow     *mainwin);
index 1277b6b..1189f63 100644 (file)
@@ -17,6 +17,7 @@
  * 
  */
 
+#undef GTK_DISABLE_DEPRECATED /* Fixme GtkOptionMenu */
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
index 0d67298..1cb26fe 100644 (file)
@@ -17,6 +17,7 @@
  * 
  */
 
+#undef GTK_DISABLE_DEPRECATED /* Fixme GtkOptionMenu */
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
index 82be8a6..1ee23c1 100644 (file)
@@ -16,6 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
  */
+#undef GTK_DISABLE_DEPRECATED /* Fixme GtkOptionMenu */
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
index 00f913f..2b1077d 100644 (file)
@@ -17,6 +17,7 @@
  * 
  */
 
+#undef GTK_DISABLE_DEPRECATED /*gtk_color_selection_set_color*/
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
index 7924c14..7d62afb 100644 (file)
@@ -221,7 +221,7 @@ static GtkWidget *date_format_create(GtkButton *button, void *data)
                         NULL);
        gtk_tree_view_append_column(GTK_TREE_VIEW(datefmt_list_view), column);
        
-       /* gtk_clist_set_column_width(GTK_CLIST(datefmt_clist), 0, 80); */
+       /* gtk_cmclist_set_column_width(GTK_CMCLIST(datefmt_clist), 0, 80); */
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(datefmt_list_view));
        gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
 
index d902019..5014a0e 100644 (file)
@@ -59,13 +59,13 @@ GtkWidget *statusbar_create(void)
                                          FALSE);
        gtk_container_set_border_width(GTK_CONTAINER(statusbar), 1);
 
-       gtk_widget_ref(GTK_STATUSBAR(statusbar)->label);
+       g_object_ref(GTK_STATUSBAR(statusbar)->label);
        gtk_container_remove(GTK_CONTAINER(GTK_STATUSBAR(statusbar)->frame),
                GTK_STATUSBAR(statusbar)->label);
        gtk_widget_hide(GTK_STATUSBAR(statusbar)->frame);
        gtk_box_pack_start (GTK_BOX(statusbar), GTK_STATUSBAR(statusbar)->label, 
                TRUE, TRUE, 0);
-       gtk_widget_unref(GTK_STATUSBAR(statusbar)->label);
+       g_object_unref(GTK_STATUSBAR(statusbar)->label);
        gtk_container_remove(GTK_CONTAINER(statusbar),
                GTK_STATUSBAR(statusbar)->frame);
        GTK_STATUSBAR(statusbar)->frame = gtk_frame_new(NULL);
index a684019..b99da95 100644 (file)
@@ -878,7 +878,7 @@ GtkWidget *stock_pixmap_widget_with_overlay(GtkWidget *window, StockPixmap icon,
        data->highlight = FALSE;
 
        widget = gtk_drawing_area_new();
-       gtk_drawing_area_size(GTK_DRAWING_AREA(widget), data->base_width + border_x * 2, 
+       gtk_widget_set_size_request(widget, data->base_width + border_x * 2, 
                              data->base_height + border_y * 2);
        g_signal_connect(G_OBJECT(widget), "expose_event", 
                         G_CALLBACK(pixmap_with_overlay_expose_event_cb), data);
index 637ffc9..8fae6ca 100644 (file)
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkctree.h>
+#include <gtk/gtk.h>
+#include "gtk/gtksctree.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -493,8 +483,8 @@ static void summary_search_create(void)
 static void summary_search_execute(gboolean backward, gboolean search_all)
 {
        SummaryView *summaryview = search_window.summaryview;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        MsgInfo *msginfo;
        gboolean adv_search;
        gboolean bool_and = FALSE;
@@ -627,13 +617,13 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
        if (search_all) {
                summary_freeze(summaryview);
                summary_unselect_all(summaryview);
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
                backward = FALSE;
        } else if (!summaryview->selected) {
                if (backward) {
-                       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list_end);
+                       node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list_end);
                } else {
-                       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+                       node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
                }
 
                if (!node) {
@@ -679,11 +669,11 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                                         GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL);
                        if (G_ALERTALTERNATE == val) {
                                if (backward) {
-                                       node = GTK_CTREE_NODE
-                                               (GTK_CLIST(ctree)->row_list_end);
+                                       node = GTK_CMCTREE_NODE
+                                               (GTK_CMCLIST(ctree)->row_list_end);
                                } else {
-                                       node = GTK_CTREE_NODE
-                                               (GTK_CLIST(ctree)->row_list);
+                                       node = GTK_CMCTREE_NODE
+                                               (GTK_CMCLIST(ctree)->row_list);
                                }
 
                                all_searched = TRUE;
@@ -694,7 +684,7 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                        }
                }
 
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                body_matched = FALSE;
 
                if (adv_search) {
@@ -761,7 +751,7 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
 
                if (matched) {
                        if (search_all) {
-                               gtk_ctree_select(ctree, node);
+                               gtk_cmctree_select(ctree, node);
                        } else {
                                if (messageview_is_visible
                                        (summaryview->messageview)) {
index 2a7b5f7..9bccf58 100644 (file)
@@ -127,40 +127,40 @@ static GdkBitmap *gpgsignedxpmmask;
 static GdkPixmap *clipgpgsignedxpm;
 static GdkBitmap *clipgpgsignedxpmmask;
 
-static void summary_free_msginfo_func  (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_free_msginfo_func  (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         gpointer                data);
-static void summary_set_marks_func     (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_set_marks_func     (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         gpointer                data);
 
 void  summary_set_menu_sensitive       (SummaryView            *summaryview);
 guint summary_get_msgnum               (SummaryView            *summaryview,
-                                        GtkCTreeNode           *node);
+                                        GtkCMCTreeNode         *node);
 
 
 static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
                                             guint action);
 
-static GtkCTreeNode *summary_find_prev_msg
+static GtkCMCTreeNode *summary_find_prev_msg
                                        (SummaryView            *summaryview,
-                                        GtkCTreeNode           *current_node);
-static GtkCTreeNode *summary_find_next_msg
+                                        GtkCMCTreeNode         *current_node);
+static GtkCMCTreeNode *summary_find_next_msg
                                        (SummaryView            *summaryview,
-                                        GtkCTreeNode           *current_node);
+                                        GtkCMCTreeNode         *current_node);
 
-static GtkCTreeNode *summary_find_prev_flagged_msg
+static GtkCMCTreeNode *summary_find_prev_flagged_msg
                                        (SummaryView    *summaryview,
-                                        GtkCTreeNode   *current_node,
+                                        GtkCMCTreeNode *current_node,
                                         MsgPermFlags    flags,
                                         gboolean        start_from_prev);
-static GtkCTreeNode *summary_find_next_flagged_msg
+static GtkCMCTreeNode *summary_find_next_flagged_msg
                                        (SummaryView    *summaryview,
-                                        GtkCTreeNode   *current_node,
+                                        GtkCMCTreeNode *current_node,
                                         MsgPermFlags    flags,
                                         gboolean        start_from_next);
 
-static GtkCTreeNode *summary_find_msg_by_msgnum
+static GtkCMCTreeNode *summary_find_msg_by_msgnum
                                        (SummaryView            *summaryview,
                                         guint                   msgnum);
 
@@ -175,59 +175,59 @@ static inline void summary_set_header     (SummaryView            *summaryview,
                                         gchar                  *text[],
                                         MsgInfo                *msginfo);
 static void summary_display_msg                (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_display_msg_full   (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row,
+                                        GtkCMCTreeNode         *row,
                                         gboolean                new_window,
                                         gboolean                all_headers);
 static void summary_set_row_marks      (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 
 static gboolean summary_set_row_tag    (SummaryView            *summaryview, 
-                                        GtkCTreeNode           *row, 
+                                        GtkCMCTreeNode                 *row, 
                                         gboolean                refresh,
                                         gboolean                set, 
                                         gint                    id);
 /* message handling */
 static void summary_mark_row           (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_lock_row           (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_unlock_row         (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_mark_row_as_read   (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_mark_row_as_unread (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_delete_row         (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_unmark_row         (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row);
+                                        GtkCMCTreeNode         *row);
 static void summary_move_row_to                (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row,
+                                        GtkCMCTreeNode         *row,
                                         FolderItem             *to_folder);
 static void summary_copy_row_to                (SummaryView            *summaryview,
-                                        GtkCTreeNode           *row,
+                                        GtkCMCTreeNode         *row,
                                         FolderItem             *to_folder);
 
 static gint summary_execute_move       (SummaryView            *summaryview);
-static void summary_execute_move_func  (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_execute_move_func  (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         gpointer                data);
 static void summary_execute_copy       (SummaryView            *summaryview);
-static void summary_execute_copy_func  (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_execute_copy_func  (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         gpointer                data);
 static void summary_execute_delete     (SummaryView            *summaryview);
-static void summary_execute_delete_func        (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_execute_delete_func        (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         gpointer                data);
 
 static void summary_thread_init                (SummaryView            *summaryview);
 
 static void summary_unthread_for_exec          (SummaryView    *summaryview);
-static void summary_unthread_for_exec_func     (GtkCTree       *ctree,
-                                                GtkCTreeNode   *node,
+static void summary_unthread_for_exec_func     (GtkCMCTree     *ctree,
+                                                GtkCMCTreeNode *node,
                                                 gpointer        data);
 
 void summary_simplify_subject(SummaryView *summaryview, gchar * rexp,
@@ -276,21 +276,21 @@ static gboolean summary_button_released   (GtkWidget              *ctree,
 static gboolean summary_key_pressed    (GtkWidget              *ctree,
                                         GdkEventKey            *event,
                                         SummaryView            *summaryview);
-static void summary_tree_expanded      (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_tree_expanded      (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         SummaryView            *summaryview);
-static void summary_tree_collapsed     (GtkCTree               *ctree,
-                                        GtkCTreeNode           *node,
+static void summary_tree_collapsed     (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *node,
                                         SummaryView            *summaryview);
-static void summary_selected           (GtkCTree               *ctree,
-                                        GtkCTreeNode           *row,
+static void summary_selected           (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *row,
                                         gint                    column,
                                         SummaryView            *summaryview);
-static void summary_unselected         (GtkCTree               *ctree,
-                                        GtkCTreeNode           *row,
+static void summary_unselected         (GtkCMCTree             *ctree,
+                                        GtkCMCTreeNode         *row,
                                         gint                    column,
                                         SummaryView            *summaryview);
-static void summary_col_resized                (GtkCList               *clist,
+static void summary_col_resized                (GtkCMCList             *clist,
                                         gint                    column,
                                         gint                    width,
                                         SummaryView            *summaryview);
@@ -370,50 +370,50 @@ static void summary_drag_end(GtkWidget *widget,
                                          SummaryView    *summaryview);
 /* custom compare functions for sorting */
 
-static gint summary_cmp_by_mark                (GtkCList               *clist,
+static gint summary_cmp_by_mark                (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_status      (GtkCList               *clist,
+static gint summary_cmp_by_status      (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_mime                (GtkCList               *clist,
+static gint summary_cmp_by_mime                (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_num         (GtkCList               *clist,
+static gint summary_cmp_by_num         (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_size                (GtkCList               *clist,
+static gint summary_cmp_by_size                (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_date                (GtkCList               *clist,
+static gint summary_cmp_by_date                (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_thread_date (GtkCList               *clist,
+static gint summary_cmp_by_thread_date (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_from                (GtkCList               *clist,
+static gint summary_cmp_by_from                (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
 static gint summary_cmp_by_simplified_subject
-                                       (GtkCList               *clist, 
+                                       (GtkCMCList             *clist, 
                                         gconstpointer           ptr1, 
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_score       (GtkCList               *clist,
+static gint summary_cmp_by_score       (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_label       (GtkCList               *clist,
+static gint summary_cmp_by_label       (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_to          (GtkCList               *clist,
+static gint summary_cmp_by_to          (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_subject     (GtkCList               *clist,
+static gint summary_cmp_by_subject     (GtkCMCList             *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_locked      (GtkCList               *clist,
+static gint summary_cmp_by_locked      (GtkCMCList             *clist,
                                         gconstpointer           ptr1, 
                                         gconstpointer           ptr2);
-static gint summary_cmp_by_tags                (GtkCList               *clist,
+static gint summary_cmp_by_tags                (GtkCMCList             *clist,
                                         gconstpointer           ptr1, 
                                         gconstpointer           ptr2);
 
@@ -428,8 +428,8 @@ static void summary_find_answers    (SummaryView    *summaryview,
 static gboolean summary_update_msg     (gpointer source, gpointer data);
 static gboolean summary_update_folder_item_hook(gpointer source, gpointer data);
 static gboolean summary_update_folder_hook(gpointer source, gpointer data);
-static void summary_set_colorlabel_color (GtkCTree             *ctree,
-                                  GtkCTreeNode         *node,
+static void summary_set_colorlabel_color (GtkCMCTree           *ctree,
+                                  GtkCMCTreeNode               *node,
                                   guint                 labelcolor);
 static void summary_thread_build(SummaryView *summaryview);
 
@@ -607,13 +607,13 @@ static const gchar *const col_label[N_SUMMARY_COLS] = {
 void summary_freeze(SummaryView *summaryview)
 {
        if (summaryview)
-               gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
+               gtk_cmclist_freeze(GTK_CMCLIST(summaryview->ctree));
 }
 
 void summary_thaw(SummaryView *summaryview)
 {
        if (summaryview)
-               gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+               gtk_cmclist_thaw(GTK_CMCLIST(summaryview->ctree));
 }
 
 void summary_grab_focus(SummaryView *summaryview)
@@ -633,7 +633,7 @@ GtkWidget *summary_get_main_widget(SummaryView *summaryview)
 #define START_LONG_OPERATION(summaryview,force_freeze) {       \
        summary_lock(summaryview);                              \
        main_window_cursor_wait(summaryview->mainwin);          \
-       if (force_freeze || sc_g_list_bigger(GTK_CLIST(summaryview->ctree)->selection, 1)) {\
+       if (force_freeze || sc_g_list_bigger(GTK_CMCLIST(summaryview->ctree)->selection, 1)) {\
                froze = TRUE;                                           \
                summary_freeze(summaryview);    \
        }                                                       \
@@ -777,9 +777,9 @@ SummaryView *summary_create(void)
        gtk_widget_show(ctree);
 
        gtk_scrolled_window_set_hadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
-                                           GTK_CLIST(ctree)->hadjustment);
+                                           GTK_CMCLIST(ctree)->hadjustment);
        gtk_scrolled_window_set_vadjustment(GTK_SCROLLED_WINDOW(scrolledwin),
-                                           GTK_CLIST(ctree)->vadjustment);
+                                           GTK_CMCLIST(ctree)->vadjustment);
        gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
 
        /* status label */
@@ -951,8 +951,8 @@ void summary_relayout(SummaryView *summaryview)
 {
        gtk_widget_realize(summaryview->stat_box);
 
-       gtk_widget_ref(summaryview->hbox_l);
-       gtk_widget_ref(summaryview->statlabel_msgs);
+       g_object_ref(summaryview->hbox_l);
+       g_object_ref(summaryview->statlabel_msgs);
        
        gtkut_container_remove(GTK_CONTAINER(summaryview->hbox_l->parent), summaryview->hbox_l);
        gtkut_container_remove(GTK_CONTAINER(summaryview->statlabel_msgs->parent), summaryview->statlabel_msgs);
@@ -989,8 +989,8 @@ void summary_relayout(SummaryView *summaryview)
        }
        summary_set_column_order(summaryview);
 
-       gtk_widget_unref(summaryview->hbox_l);
-       gtk_widget_unref(summaryview->statlabel_msgs);
+       g_object_unref(summaryview->hbox_l);
+       g_object_unref(summaryview->statlabel_msgs);
        quicksearch_relayout(summaryview->quicksearch);
        if (prefs_common.show_searchbar)
                quicksearch_show(summaryview->quicksearch);
@@ -1161,7 +1161,7 @@ static void summary_switch_from_to(SummaryView *summaryview, FolderItem *item)
        gboolean showing_from = FALSE, showing_to = FALSE;
        gint from_pos = 0, to_pos = 0;
        SummaryColumnState *col_state = summaryview->col_state;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        
        if (!item || (prefs_common.layout_mode == VERTICAL_LAYOUT && prefs_common.two_line_vert) )
                return;
@@ -1205,10 +1205,10 @@ static void summary_switch_from_to(SummaryView *summaryview, FolderItem *item)
        summaryview->col_pos[S_COL_TO] = from_pos;
        summaryview->col_pos[S_COL_FROM] = to_pos;
 
-       gtk_clist_set_column_visibility
-               (GTK_CLIST(ctree), from_pos, col_state[from_pos].visible);
-       gtk_clist_set_column_visibility
-               (GTK_CLIST(ctree), to_pos, col_state[to_pos].visible);
+       gtk_cmclist_set_column_visibility
+               (GTK_CMCLIST(ctree), from_pos, col_state[from_pos].visible);
+       gtk_cmclist_set_column_visibility
+               (GTK_CMCLIST(ctree), to_pos, col_state[to_pos].visible);
 
        summary_set_column_titles(summaryview);
 }
@@ -1272,8 +1272,8 @@ static gboolean summary_check_consistency(FolderItem *item, GSList *mlist)
 
 gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node = NULL;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node = NULL;
        GSList *mlist = NULL;
        gchar *buf;
        gboolean is_refresh;
@@ -1533,25 +1533,25 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                   message, but do not display it */
                                node = summary_find_next_flagged_msg(summaryview, NULL,
                                                                     MSG_UNREAD, FALSE);
-                               if (node == NULL && GTK_CLIST(ctree)->row_list != NULL)
-                                       node = gtk_ctree_node_nth
+                               if (node == NULL && GTK_CMCLIST(ctree)->row_list != NULL)
+                                       node = gtk_cmctree_node_nth
                                                (ctree,
                                                 item->sort_type == SORT_DESCENDING
-                                                ? 0 : GTK_CLIST(ctree)->rows - 1);
+                                                ? 0 : GTK_CMCLIST(ctree)->rows - 1);
                                summary_unlock(summaryview);
                                summary_select_node(summaryview, node, FALSE, TRUE);
                                summary_lock(summaryview);
                        }
                } else {
                        /* just select first/last */
-                       if (GTK_CLIST(ctree)->row_list != NULL)
-                               node = gtk_ctree_node_nth
+                       if (GTK_CMCLIST(ctree)->row_list != NULL)
+                               node = gtk_cmctree_node_nth
                                        (ctree,
                                         item->sort_type == SORT_DESCENDING
-                                        ? 0 : GTK_CLIST(ctree)->rows - 1);
+                                        ? 0 : GTK_CMCLIST(ctree)->rows - 1);
                        gtk_sctree_select(GTK_SCTREE(ctree), node);
                        summaryview->selected = node;
-                       gtk_ctree_node_moveto(ctree, node, 0, 0.5, 0);
+                       gtk_cmctree_node_moveto(ctree, node, 0, 0.5, 0);
                }
        } else {
                /* backward compat */
@@ -1591,19 +1591,19 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                }
                                break;
                        case ACTION_LAST_LIST:
-                               if (GTK_CLIST(ctree)->row_list != NULL) {
-                                       node = gtk_ctree_node_nth
+                               if (GTK_CMCLIST(ctree)->row_list != NULL) {
+                                       node = gtk_cmctree_node_nth
                                                (ctree,
                                                 item->sort_type == SORT_DESCENDING
-                                                ? 0 : GTK_CLIST(ctree)->rows - 1);
+                                                ? 0 : GTK_CMCLIST(ctree)->rows - 1);
                                }
                                break;
                        case ACTION_FIRST_LIST:
-                               if (GTK_CLIST(ctree)->row_list != NULL) {
-                                       node = gtk_ctree_node_nth
+                               if (GTK_CMCLIST(ctree)->row_list != NULL) {
+                                       node = gtk_cmctree_node_nth
                                                (ctree,
                                                 item->sort_type == SORT_ASCENDING
-                                                ? 0 : GTK_CLIST(ctree)->rows - 1);
+                                                ? 0 : GTK_CMCLIST(ctree)->rows - 1);
                                }
                                break;
                        case ACTION_NOTHING:
@@ -1647,12 +1647,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
 void summary_clear_list(SummaryView *summaryview)
 {
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
        gint optimal_width;
 
        summary_freeze(summaryview);
 
-       gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree),
+       gtk_cmctree_pre_recursive(GTK_CMCTREE(summaryview->ctree),
                                NULL, summary_free_msginfo_func, NULL);
 
        if (summaryview->folder_item) {
@@ -1677,11 +1677,11 @@ void summary_clear_list(SummaryView *summaryview)
        }
        summaryview->mlist = NULL;
 
-       gtk_clist_clear(clist);
+       gtk_cmclist_clear(clist);
        if (summaryview->col_pos[S_COL_SUBJECT] == N_SUMMARY_COLS - 1) {
-               optimal_width = gtk_clist_optimal_column_width
+               optimal_width = gtk_cmclist_optimal_column_width
                        (clist, summaryview->col_pos[S_COL_SUBJECT]);
-               gtk_clist_set_column_width
+               gtk_cmclist_set_column_width
                        (clist, summaryview->col_pos[S_COL_SUBJECT],
                         optimal_width);
        }
@@ -1716,7 +1716,7 @@ gboolean summary_is_locked(SummaryView *summaryview)
 
 SummarySelection summary_get_selection_type(SummaryView *summaryview)
 {
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
        SummarySelection selection;
 
        if (!clist->row_list)
@@ -1739,7 +1739,7 @@ MsgInfo *summary_get_selected_msg(SummaryView *summaryview)
 {
        /* summaryview->selected may be valid when multiple 
         * messages were selected */
-       GList *sellist = GTK_CLIST(summaryview->ctree)->selection;
+       GList *sellist = GTK_CMCLIST(summaryview->ctree)->selection;
 
        if (sellist == NULL || sellist->next) 
                return NULL;
@@ -1753,7 +1753,7 @@ GSList *summary_get_selected_msg_list(SummaryView *summaryview)
        GList *cur;
        MsgInfo *msginfo;
 
-       for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL && cur->data != NULL;
+       for (cur = GTK_CMCLIST(summaryview->ctree)->selection; cur != NULL && cur->data != NULL;
             cur = cur->next) {
                msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(cur->data);
                mlist = g_slist_prepend(mlist, msginfo);
@@ -1855,7 +1855,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
 
 void summary_select_prev_unread(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
        gboolean skip_cur = FALSE;
 
        if (summaryview->displayed 
@@ -1900,7 +1900,7 @@ void summary_select_prev_unread(SummaryView *summaryview)
 
 void summary_select_next_unread(SummaryView *summaryview)
 {
-       GtkCTreeNode *node = summaryview->selected;
+       GtkCMCTreeNode *node = summaryview->selected;
        gboolean skip_cur = FALSE;
        
        if (summaryview->displayed 
@@ -1954,7 +1954,7 @@ void summary_select_next_unread(SummaryView *summaryview)
 
 void summary_select_prev_new(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
        gboolean skip_cur = FALSE;
 
        if (summaryview->displayed 
@@ -1999,7 +1999,7 @@ void summary_select_prev_new(SummaryView *summaryview)
 
 void summary_select_next_new(SummaryView *summaryview)
 {
-       GtkCTreeNode *node = summaryview->selected;
+       GtkCMCTreeNode *node = summaryview->selected;
        gboolean skip_cur = FALSE;
        
        if (summaryview->displayed 
@@ -2053,7 +2053,7 @@ void summary_select_next_new(SummaryView *summaryview)
 
 void summary_select_prev_marked(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
 
        node = summary_find_prev_flagged_msg
                (summaryview, summaryview->selected, MSG_MARKED, TRUE);
@@ -2078,7 +2078,7 @@ void summary_select_prev_marked(SummaryView *summaryview)
 
 void summary_select_next_marked(SummaryView *summaryview)
 {
-       GtkCTreeNode *node = summaryview->selected;
+       GtkCMCTreeNode *node = summaryview->selected;
        gboolean skip_cur = FALSE;
        
        if (summaryview->displayed 
@@ -2132,7 +2132,7 @@ void summary_select_next_marked(SummaryView *summaryview)
 
 void summary_select_prev_labeled(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
 
        node = summary_find_prev_flagged_msg
                (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
@@ -2157,7 +2157,7 @@ void summary_select_prev_labeled(SummaryView *summaryview)
 
 void summary_select_next_labeled(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
 
        node = summary_find_next_flagged_msg
                (summaryview, summaryview->selected, MSG_CLABEL_FLAG_MASK, TRUE);
@@ -2188,17 +2188,17 @@ void summary_select_last_read(SummaryView *summaryview)
 
 void summary_select_parent(SummaryView *summaryview)
 {
-       GtkCTreeNode *node = NULL;
+       GtkCMCTreeNode *node = NULL;
 
        if (summaryview->selected)
-               node = GTK_CTREE_ROW(summaryview->selected)->parent;
+               node = GTK_CMCTREE_ROW(summaryview->selected)->parent;
        if (node)
                summary_select_node(summaryview, node, TRUE, FALSE);
 }
 
 void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
 
        node = summary_find_msg_by_msgnum(summaryview, msgnum);
        summary_select_node(summaryview, node, FALSE, TRUE);
@@ -2206,9 +2206,9 @@ void summary_select_by_msgnum(SummaryView *summaryview, guint msgnum)
 
 typedef struct _PostponedSelectData
 {
-       GtkCTree *ctree;
-       GtkCTreeNode *row;
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree;
+       GtkCMCTreeNode *row;
+       GtkCMCTreeNode *node;
        GtkScrollType type;
        gint column;
        SummaryView *summaryview;
@@ -2244,10 +2244,10 @@ static gboolean summary_select_retry(void *data)
  * TRUE, display the corresponding message in the message view.
  * If @do_refresh is TRUE, the widget is refreshed.
  **/
-void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
+void summary_select_node(SummaryView *summaryview, GtkCMCTreeNode *node,
                         gboolean display_msg, gboolean do_refresh)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        
        if (summary_is_locked(summaryview)
        && !GTK_SCTREE(ctree)->selecting_range
@@ -2279,7 +2279,7 @@ void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
                        GTK_EVENTS_FLUSH();
                        summary_unlock(summaryview);
                        gtk_widget_grab_focus(GTK_WIDGET(ctree));
-                       gtk_ctree_node_moveto(ctree, node, 0, 0.5, 0);
+                       gtk_cmctree_node_moveto(ctree, node, 0, 0.5, 0);
                }
                if (display_msg && summaryview->displayed == node)
                        summaryview->displayed = NULL;
@@ -2290,57 +2290,57 @@ void summary_select_node(SummaryView *summaryview, GtkCTreeNode *node,
        }
 }
 
-guint summary_get_msgnum(SummaryView *summaryview, GtkCTreeNode *node)
+guint summary_get_msgnum(SummaryView *summaryview, GtkCMCTreeNode *node)
 {
-       GtkCTree *ctree =NULL;
+       GtkCMCTree *ctree =NULL;
        MsgInfo *msginfo;
 
        if (!summaryview)
                return 0;
-       ctree = GTK_CTREE(summaryview->ctree);
+       ctree = GTK_CMCTREE(summaryview->ctree);
        if (!node)
                return 0;
-       msginfo = gtk_ctree_node_get_row_data(ctree, node);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, node);
        if (msginfo)
                return msginfo->msgnum;
        else 
                return -1;
 }
 
-static GtkCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
-                                          GtkCTreeNode *current_node)
+static GtkCMCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
+                                          GtkCMCTreeNode *current_node)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
        if (current_node)
                node = current_node;
        else
-               node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
+               node = gtk_cmctree_node_nth(ctree, GTK_CMCLIST(ctree)->rows - 1);
 
-       for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+       for (; node != NULL; node = GTK_CMCTREE_NODE_PREV(node)) {
+               msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
        }
 
        return node;
 }
 
-static GtkCTreeNode *summary_find_next_msg(SummaryView *summaryview,
-                                          GtkCTreeNode *current_node)
+static GtkCMCTreeNode *summary_find_next_msg(SummaryView *summaryview,
+                                          GtkCMCTreeNode *current_node)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
        if (current_node)
                node = current_node;
        else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && !MSG_IS_DELETED(msginfo->flags) 
                && !MSG_IS_MOVE(msginfo->flags)) break;
        }
@@ -2348,38 +2348,38 @@ static GtkCTreeNode *summary_find_next_msg(SummaryView *summaryview,
        return node;
 }
 
-static GtkCTreeNode *summary_find_prev_flagged_msg(SummaryView *summaryview,
-                                                  GtkCTreeNode *current_node,
+static GtkCMCTreeNode *summary_find_prev_flagged_msg(SummaryView *summaryview,
+                                                  GtkCMCTreeNode *current_node,
                                                   MsgPermFlags flags,
                                                   gboolean start_from_prev)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
        if (current_node) {
                if (start_from_prev)
-                       node = GTK_CTREE_NODE_PREV(current_node);
+                       node = GTK_CMCTREE_NODE_PREV(current_node);
                else
                        node = current_node;
        } else
-               node = gtk_ctree_node_nth(ctree, GTK_CLIST(ctree)->rows - 1);
+               node = gtk_cmctree_node_nth(ctree, GTK_CMCLIST(ctree)->rows - 1);
 
-       for (; node != NULL; node = GTK_CTREE_NODE_PREV(node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+       for (; node != NULL; node = GTK_CMCTREE_NODE_PREV(node)) {
+               msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && (msginfo->flags.perm_flags & flags) != 0) break;
        }
 
        return node;
 }
 
-static GtkCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
-                                                  GtkCTreeNode *current_node,
+static GtkCMCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
+                                                  GtkCMCTreeNode *current_node,
                                                   MsgPermFlags flags,
                                                   gboolean start_from_next)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
        if (current_node) {
@@ -2388,10 +2388,10 @@ static GtkCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
                else
                        node = current_node;
        } else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                /* Find msg with matching flags but ignore messages with
                   ignore flags, if searching for new or unread messages */
                if ((msginfo && (msginfo->flags.perm_flags & flags) != 0) &&
@@ -2403,17 +2403,17 @@ static GtkCTreeNode *summary_find_next_flagged_msg(SummaryView *summaryview,
        return node;
 }
 
-static GtkCTreeNode *summary_find_msg_by_msgnum(SummaryView *summaryview,
+static GtkCMCTreeNode *summary_find_msg_by_msgnum(SummaryView *summaryview,
                                                guint msgnum)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
-       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && msginfo->msgnum == msgnum) break;
        }
 
@@ -2447,11 +2447,11 @@ static gint attract_compare_func(gconstpointer a, gconstpointer b)
 
 void summary_attract_by_subject(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCList *clist = GTK_CLIST(ctree);
-       GtkCTreeNode *src_node;
-       GtkCTreeNode *dst_node, *sibling;
-       GtkCTreeNode *tmp;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(ctree);
+       GtkCMCTreeNode *src_node;
+       GtkCMCTreeNode *dst_node, *sibling;
+       GtkCMCTreeNode *tmp;
        MsgInfo *src_msginfo, *dst_msginfo;
        GHashTable *subject_table;
 
@@ -2465,10 +2465,10 @@ void summary_attract_by_subject(SummaryView *summaryview)
        subject_table = g_hash_table_new(attract_hash_func,
                                         attract_compare_func);
 
-       for (src_node = GTK_CTREE_NODE(clist->row_list);
+       for (src_node = GTK_CMCTREE_NODE(clist->row_list);
             src_node != NULL;
             src_node = tmp) {
-               tmp = GTK_CTREE_ROW(src_node)->sibling;
+               tmp = GTK_CMCTREE_ROW(src_node)->sibling;
                src_msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(src_node);
                if (!src_msginfo) continue;
                if (!src_msginfo->subject) continue;
@@ -2486,9 +2486,9 @@ void summary_attract_by_subject(SummaryView *summaryview)
                            > 60 * 60 * 24 * 20)
                                continue;
 
-                       sibling = GTK_CTREE_ROW(dst_node)->sibling;
+                       sibling = GTK_CMCTREE_ROW(dst_node)->sibling;
                        if (src_node != sibling)
-                               gtk_ctree_move(ctree, src_node, NULL, sibling);
+                               gtk_cmctree_move(ctree, src_node, NULL, sibling);
                }
 
                g_hash_table_insert(subject_table,
@@ -2497,7 +2497,7 @@ void summary_attract_by_subject(SummaryView *summaryview)
 
        g_hash_table_destroy(subject_table);
 
-       gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
+       gtk_cmctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
 
        summary_thaw(summaryview);
 
@@ -2507,22 +2507,22 @@ void summary_attract_by_subject(SummaryView *summaryview)
        main_window_cursor_normal(summaryview->mainwin);
 }
 
-static void summary_free_msginfo_func(GtkCTree *ctree, GtkCTreeNode *node,
+static void summary_free_msginfo_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                      gpointer data)
 {
-       MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, node);
+       MsgInfo *msginfo = gtk_cmctree_node_get_row_data(ctree, node);
 
        if (msginfo)
                procmsg_msginfo_free(msginfo);
 }
 
-static void summary_set_marks_func(GtkCTree *ctree, GtkCTreeNode *node,
+static void summary_set_marks_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
                                   gpointer data)
 {
        SummaryView *summaryview = data;
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, node);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, node);
 
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted++;
@@ -2534,14 +2534,14 @@ static void summary_set_marks_func(GtkCTree *ctree, GtkCTreeNode *node,
 
 static void summary_update_status(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
        summaryview->total_size =
        summaryview->deleted = summaryview->moved = summaryview->copied = 0;
 
-       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
             node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
                
@@ -2583,11 +2583,11 @@ static void summary_status_show(SummaryView *summaryview)
                return;
        }
 
-       rowlist = GTK_CLIST(summaryview->ctree)->selection;
+       rowlist = GTK_CMCLIST(summaryview->ctree)->selection;
        for (cur = rowlist; cur != NULL && cur->data != NULL; cur = cur->next) {
-               msginfo = gtk_ctree_node_get_row_data
-                       (GTK_CTREE(summaryview->ctree),
-                        GTK_CTREE_NODE(cur->data));
+               msginfo = gtk_cmctree_node_get_row_data
+                       (GTK_CMCTREE(summaryview->ctree),
+                        GTK_CMCTREE_NODE(cur->data));
                if (msginfo) {
                        sel_size += msginfo->size;
                        n_selected++;
@@ -2596,11 +2596,11 @@ static void summary_status_show(SummaryView *summaryview)
        
        if (summaryview->folder_item->hide_read_msgs 
        || quicksearch_is_active(summaryview->quicksearch)) {
-               rowlist = GTK_CLIST(summaryview->ctree)->row_list;
+               rowlist = GTK_CMCLIST(summaryview->ctree)->row_list;
                for (cur = rowlist; cur != NULL && cur->data != NULL; cur = cur->next) {
-                       msginfo = gtk_ctree_node_get_row_data
-                               (GTK_CTREE(summaryview->ctree),
-                                GTK_CTREE_NODE(cur));
+                       msginfo = gtk_cmctree_node_get_row_data
+                               (GTK_CMCTREE(summaryview->ctree),
+                                GTK_CMCTREE_NODE(cur));
                        if (msginfo) {
                                n_size += msginfo->size;
                                n_total++;
@@ -2741,7 +2741,7 @@ static void summary_status_show(SummaryView *summaryview)
 
 static void summary_set_column_titles(SummaryView *summaryview)
 {
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
        FolderItem *item = summaryview->folder_item;
        GtkWidget *hbox;
        GtkWidget *label;
@@ -2795,23 +2795,23 @@ static void summary_set_column_titles(SummaryView *summaryview)
                if (type == S_COL_MIME) {
                        label = gtk_image_new_from_pixmap(clipxpm, clipxpmmask);
                        gtk_widget_show(label);
-                       gtk_clist_set_column_widget(clist, pos, label);
+                       gtk_cmclist_set_column_widget(clist, pos, label);
                        gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Attachment"));
                        continue;
                } else if (type == S_COL_MARK) {
                        label = gtk_image_new_from_pixmap(markxpm, markxpmmask);
                        gtk_widget_show(label);
-                       gtk_clist_set_column_widget(clist, pos, label);
+                       gtk_cmclist_set_column_widget(clist, pos, label);
                        gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Mark"));
                        continue;
                } else if (type == S_COL_LOCKED) {
                        label = gtk_image_new_from_pixmap(lockedxpm, lockedxpmmask);
                        gtk_widget_show(label);
-                       gtk_clist_set_column_widget(clist, pos, label);
+                       gtk_cmclist_set_column_widget(clist, pos, label);
                        gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Locked"));
                        continue;
                } else if (type == S_COL_STATUS) {
-                       gtk_clist_set_column_title(clist, pos, title);
+                       gtk_cmclist_set_column_title(clist, pos, title);
                        gtk_sctree_set_column_tooltip(GTK_SCTREE(clist), pos, _("Status"));
                        continue;
                }
@@ -2834,6 +2834,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
                                (summaryview->sort_type == SORT_ASCENDING
                                 ? GTK_ARROW_DOWN : GTK_ARROW_UP,
                                 GTK_SHADOW_IN);
+                       gtk_widget_set_size_request(GTK_WIDGET(arrow), 10, 10);
                        if (justify == GTK_JUSTIFY_RIGHT)
                                gtk_box_pack_start(GTK_BOX(hbox), arrow,
                                                   FALSE, FALSE, 0);
@@ -2843,7 +2844,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
                }
 
                gtk_widget_show_all(hbox);
-               gtk_clist_set_column_widget(clist, pos, hbox);
+               gtk_cmclist_set_column_widget(clist, pos, hbox);
        }
 }
 
@@ -2851,8 +2852,8 @@ void summary_reflect_tags_changes(SummaryView *summaryview)
 {
        GtkMenuShell *menu;
        GList *cur;
-       GtkCTreeNode *node;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        gboolean froze = FALSE;
        gboolean redisplay = FALSE;
 
@@ -2867,7 +2868,7 @@ void summary_reflect_tags_changes(SummaryView *summaryview)
        summary_tags_menu_create(summaryview, TRUE);
 
        START_LONG_OPERATION(summaryview, TRUE);
-       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
+       for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node)) {
                redisplay |= summary_set_row_tag(summaryview,
                                           node, TRUE, FALSE, 0);
@@ -2918,9 +2919,9 @@ void summary_reflect_prefs(void)
 void summary_sort(SummaryView *summaryview,
                  FolderSortKey sort_key, FolderSortType sort_type)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
-       GtkCListCompareFunc cmp_func = NULL;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
+       GtkCMCListCompareFunc cmp_func = NULL;
        START_TIMING("");
        g_signal_handlers_block_by_func(G_OBJECT(summaryview->ctree),
                                       G_CALLBACK(summary_tree_expanded), summaryview);
@@ -2928,49 +2929,49 @@ void summary_sort(SummaryView *summaryview,
 
        switch (sort_key) {
        case SORT_BY_MARK:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_mark;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_mark;
                break;
        case SORT_BY_STATUS:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_status;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_status;
                break;
        case SORT_BY_MIME:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_mime;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_mime;
                break;
        case SORT_BY_NUMBER:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_num;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_num;
                break;
        case SORT_BY_SIZE:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_size;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_size;
                break;
        case SORT_BY_DATE:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_date;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_date;
                break;
        case SORT_BY_THREAD_DATE:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_thread_date;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_thread_date;
                break;
        case SORT_BY_FROM:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_from;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_from;
                break;
        case SORT_BY_SUBJECT:
                if (summaryview->simplify_subject_preg)
-                       cmp_func = (GtkCListCompareFunc)summary_cmp_by_simplified_subject;
+                       cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_simplified_subject;
                else
-                       cmp_func = (GtkCListCompareFunc)summary_cmp_by_subject;
+                       cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_subject;
                break;
        case SORT_BY_SCORE:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_score;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_score;
                break;
        case SORT_BY_LABEL:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_label;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_label;
                break;
        case SORT_BY_TO:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_to;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_to;
                break;
        case SORT_BY_LOCKED:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_locked;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_locked;
                break;
        case SORT_BY_TAGS:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_tags;
+               cmp_func = (GtkCMCListCompareFunc)summary_cmp_by_tags;
                break;
        case SORT_BY_NONE:
                break;
@@ -2994,12 +2995,12 @@ void summary_sort(SummaryView *summaryview,
 
                main_window_cursor_wait(summaryview->mainwin);
 
-               gtk_clist_set_compare_func(clist, cmp_func);
+               gtk_cmclist_set_compare_func(clist, cmp_func);
 
-               gtk_clist_set_sort_type(clist, (GtkSortType)sort_type);
+               gtk_cmclist_set_sort_type(clist, (GtkSortType)sort_type);
                gtk_sctree_sort_recursive(ctree, NULL);
 
-               gtk_ctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
+               gtk_cmctree_node_moveto(ctree, summaryview->selected, 0, 0.5, 0);
 
                main_window_cursor_normal(summaryview->mainwin);
 
@@ -3038,8 +3039,8 @@ static void summary_find_thread_age(GNode *gnode)
        msginfo->thread_date = most_recent;
 }
 
-static gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *gnode,
-                                  GtkCTreeNode *cnode, gpointer data)
+static gboolean summary_insert_gnode_func(GtkCMCTree *ctree, guint depth, GNode *gnode,
+                                  GtkCMCTreeNode *cnode, gpointer data)
 {
        SummaryView *summaryview = (SummaryView *)data;
        MsgInfo *msginfo = (MsgInfo *)gnode->data;
@@ -3054,7 +3055,7 @@ static gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *g
        gtk_sctree_set_node_info(ctree, cnode, text[col_pos[S_COL_SUBJECT]], 2,
                                NULL, NULL, NULL, NULL, FALSE, summaryview->threaded && !summaryview->thread_collapsed);
 #define SET_TEXT(col) {                                                \
-       gtk_ctree_node_set_text(ctree, cnode, col_pos[col],     \
+       gtk_cmctree_node_set_text(ctree, cnode, col_pos[col],   \
                                text[col_pos[col]]);            \
 }
 
@@ -3090,9 +3091,9 @@ static gboolean summary_insert_gnode_func(GtkCTree *ctree, guint depth, GNode *g
 static void summary_set_ctree_from_list(SummaryView *summaryview,
                                        GSList *mlist)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
-       GtkCTreeNode *node = NULL;
+       GtkCMCTreeNode *node = NULL;
        GHashTable *msgid_table;
        GHashTable *subject_table = NULL;
        GSList * cur;
@@ -3176,9 +3177,9 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
            summaryview->col_pos[S_COL_SUBJECT] == N_SUMMARY_COLS - 1) {
                gint optimal_width;
 
-               optimal_width = gtk_clist_optimal_column_width
-                       (GTK_CLIST(ctree), summaryview->col_pos[S_COL_SUBJECT]);
-               gtk_clist_set_column_width(GTK_CLIST(ctree),
+               optimal_width = gtk_cmclist_optimal_column_width
+                       (GTK_CMCLIST(ctree), summaryview->col_pos[S_COL_SUBJECT]);
+               gtk_cmclist_set_column_width(GTK_CMCLIST(ctree),
                                           summaryview->col_pos[S_COL_SUBJECT],
                                           optimal_width);
        }
@@ -3198,13 +3199,13 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
 
        summary_sort(summaryview, summaryview->sort_key, summaryview->sort_type);
 
-       node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+       node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        if (prefs_common.bold_unread) {
                START_TIMING("bold_unread");
                while (node) {
-                       GtkCTreeNode *next = GTK_CTREE_NODE_NEXT(node);
-                       if (GTK_CTREE_ROW(node)->children)
+                       GtkCMCTreeNode *next = GTK_CMCTREE_NODE_NEXT(node);
+                       if (GTK_CMCTREE_ROW(node)->children)
                                summary_set_row_marks(summaryview, node);
                        node = next;
                }
@@ -3385,7 +3386,7 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
        }
 }
 
-static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_display_msg(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
        summary_display_msg_full(summaryview, row, FALSE, FALSE);
 }
@@ -3481,7 +3482,7 @@ gboolean defer_change(gpointer data)
 }
 
 static void msginfo_mark_as_read (SummaryView *summaryview, MsgInfo *msginfo,
-                                     GtkCTreeNode *row)
+                                     GtkCMCTreeNode *row)
 {
        g_return_if_fail(summaryview != NULL);
        g_return_if_fail(msginfo != NULL);
@@ -3516,10 +3517,10 @@ static int msginfo_mark_as_read_timeout(void *data)
 }
 
 static void summary_display_msg_full(SummaryView *summaryview,
-                                    GtkCTreeNode *row,
+                                    GtkCMCTreeNode *row,
                                     gboolean new_window, gboolean all_headers)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
        gint val;
        START_TIMING("");
@@ -3537,7 +3538,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
        STATUSBAR_POP(summaryview->mainwin);
        GTK_EVENTS_FLUSH();
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        
        g_return_if_fail(msginfo);
 
@@ -3558,10 +3559,10 @@ static void summary_display_msg_full(SummaryView *summaryview,
                        summaryview->last_displayed = summaryview->displayed;
                        summaryview->displayed = row;
                        val = messageview_show(msgview, msginfo, all_headers);
-                       if (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL)
+                       if (GTK_CMCLIST(msgview->mimeview->ctree)->row_list == NULL)
                                gtk_widget_grab_focus(summaryview->ctree);
                        gtkut_ctree_node_move_if_on_the_edge(ctree, row,
-                               GTK_CLIST(summaryview->ctree)->focus_row);
+                               GTK_CMCLIST(summaryview->ctree)->focus_row);
                } else {
                        msgview = summaryview->messageview;
                        summaryview->last_displayed = summaryview->displayed;
@@ -3571,10 +3572,10 @@ static void summary_display_msg_full(SummaryView *summaryview,
                                GTK_EVENTS_FLUSH();
                        }
                        val = messageview_show(msgview, msginfo, all_headers);
-                       if (GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL)
+                       if (GTK_CMCLIST(msgview->mimeview->ctree)->row_list == NULL)
                                gtk_widget_grab_focus(summaryview->ctree);
                        gtkut_ctree_node_move_if_on_the_edge(ctree, row,
-                               GTK_CLIST(summaryview->ctree)->focus_row);
+                               GTK_CMCLIST(summaryview->ctree)->focus_row);
                }
        }
 
@@ -3610,7 +3611,7 @@ void summary_display_msg_selected(SummaryView *summaryview,
 
 void summary_redisplay_msg(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *node;
 
        if (summaryview->displayed) {
                node = summaryview->displayed;
@@ -3631,14 +3632,14 @@ void summary_open_msg(SummaryView *summaryview)
 
 void summary_view_source(SummaryView * summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
        SourceWindow *srcwin;
 
        if (!summaryview->selected) return;
 
        srcwin = source_window_create();
-       msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, summaryview->selected);
        source_window_show_msg(srcwin, msginfo);
        source_window_show(srcwin);
 #ifdef MAEMO
@@ -3656,7 +3657,7 @@ void summary_reedit(SummaryView *summaryview)
        if (!FOLDER_SHOWS_TO_HDR(summaryview->folder_item))
                return;
 
-       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+       msginfo = gtk_cmctree_node_get_row_data(GTK_CMCTREE(summaryview->ctree),
                                              summaryview->selected);
        if (!msginfo) return;
 
@@ -3665,8 +3666,8 @@ void summary_reedit(SummaryView *summaryview)
 
 gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
 
        if (summary_is_locked(summaryview)
        && !GTK_SCTREE(ctree)->selecting_range
@@ -3695,7 +3696,7 @@ gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
                        return FALSE;
        } else {
                if (summaryview->selected) {
-                       node = GTK_CTREE_NODE_PREV(summaryview->selected);
+                       node = GTK_CMCTREE_NODE_PREV(summaryview->selected);
                        if (!node) return FALSE;
                }
        }
@@ -3705,10 +3706,10 @@ gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
 
        g_signal_emit_by_name(G_OBJECT(ctree), "scroll_vertical", type, 0.0);
 
-       if (GTK_CLIST(ctree)->selection)
+       if (GTK_CMCLIST(ctree)->selection)
                gtk_sctree_set_anchor_row
                        (GTK_SCTREE(ctree),
-                        GTK_CTREE_NODE(GTK_CLIST(ctree)->selection->data));
+                        GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->selection->data));
 
        return TRUE;
 }
@@ -3731,173 +3732,173 @@ void summary_toggle_view(SummaryView *summaryview)
                main_window_toggle_message_view(summaryview->mainwin);
 }
 
-static gboolean summary_search_unread_recursive(GtkCTree *ctree,
-                                               GtkCTreeNode *node)
+static gboolean summary_search_unread_recursive(GtkCMCTree *ctree,
+                                               GtkCMCTreeNode *node)
 {
        MsgInfo *msginfo;
 
        if (node) {
-               msginfo = gtk_ctree_node_get_row_data(ctree, node);
+               msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
                        return TRUE;
-               node = GTK_CTREE_ROW(node)->children;
+               node = GTK_CMCTREE_ROW(node)->children;
        } else
-               node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
+               node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        while (node) {
                if (summary_search_unread_recursive(ctree, node) == TRUE)
                        return TRUE;
-               node = GTK_CTREE_ROW(node)->sibling;
+               node = GTK_CMCTREE_ROW(node)->sibling;
        }
 
        return FALSE;
 }
 
 static gboolean summary_have_unread_children(SummaryView *summaryview,
-                                            GtkCTreeNode *node)
+                                            GtkCMCTreeNode *node)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
 
        if (!node) return FALSE;
 
-       node = GTK_CTREE_ROW(node)->children;
+       node = GTK_CMCTREE_ROW(node)->children;
 
        while (node) {
                if (summary_search_unread_recursive(ctree, node) == TRUE)
                        return TRUE;
-               node = GTK_CTREE_ROW(node)->sibling;
+               node = GTK_CMCTREE_ROW(node)->sibling;
        }
        return FALSE;
 }
 
-static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_set_row_marks(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GtkStyle *style = NULL;
        MsgInfo *msginfo;
        MsgFlags flags;
        gint *col_pos = summaryview->col_pos;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        if (!msginfo) return;
 
        flags = msginfo->flags;
 
-       gtk_ctree_node_set_foreground(ctree, row, NULL);
+       gtk_cmctree_node_set_foreground(ctree, row, NULL);
 
        /* set new/unread column */
        if (MSG_IS_IGNORE_THREAD(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          ignorethreadxpm, ignorethreadxpmmask);
        } else if (MSG_IS_WATCH_THREAD(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          watchthreadxpm, watchthreadxpmmask);
        } else if (MSG_IS_SPAM(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          spamxpm, spamxpmmask);
        } else if (MSG_IS_NEW(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          newxpm, newxpmmask);
        } else if (MSG_IS_UNREAD(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          unreadxpm, unreadxpmmask);
        } else if (MSG_IS_REPLIED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          repliedxpm, repliedxpmmask);
        } else if (MSG_IS_FORWARDED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_STATUS],
                                          forwardedxpm, forwardedxpmmask);
        } else {
-               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
+               gtk_cmctree_node_set_text(ctree, row, col_pos[S_COL_STATUS],
                                        "");
        }
 
        if (prefs_common.bold_unread &&
            ((MSG_IS_UNREAD(flags) && !MSG_IS_IGNORE_THREAD(flags)) ||
-            (!GTK_CTREE_ROW(row)->expanded &&
-             GTK_CTREE_ROW(row)->children &&
+            (!GTK_CMCTREE_ROW(row)->expanded &&
+             GTK_CMCTREE_ROW(row)->children &&
              summary_have_unread_children(summaryview, row))))
                style = bold_style;
 
        /* set mark column */
        if (MSG_IS_DELETED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
                                          deletedxpm, deletedxpmmask);
                if (style)
                        style = bold_deleted_style;
                else {
                        style = small_deleted_style;
                }
-                       gtk_ctree_node_set_foreground
+                       gtk_cmctree_node_set_foreground
                                (ctree, row, &summaryview->color_dim);
        } else if (MSG_IS_MARKED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
                                          markxpm, markxpmmask);
        } else if (MSG_IS_MOVE(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
                                          movedxpm, movedxpmmask);
                if (style)
                        style = bold_marked_style;
                else {
                        style = small_marked_style;
                }
-                       gtk_ctree_node_set_foreground
+                       gtk_cmctree_node_set_foreground
                                (ctree, row, &summaryview->color_marked);
        } else if (MSG_IS_COPY(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
                                          copiedxpm, copiedxpmmask);
                if (style)
                        style = bold_marked_style;
                else {
                        style = small_marked_style;
                }
-                       gtk_ctree_node_set_foreground
+                       gtk_cmctree_node_set_foreground
                                (ctree, row, &summaryview->color_marked);
        } else {
-               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "");
+               gtk_cmctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "");
        }
 
        if (MSG_IS_LOCKED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_LOCKED],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_LOCKED],
                                          lockedxpm, lockedxpmmask);
        }
        else {
-               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], "");
+               gtk_cmctree_node_set_text(ctree, row, col_pos[S_COL_LOCKED], "");
        }
 
        if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_SIGNED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          clipgpgsignedxpm, clipgpgsignedxpmmask);
        } else if (MSG_IS_SIGNED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          gpgsignedxpm, gpgsignedxpmmask);
        } else if (MSG_IS_WITH_ATTACHMENT(flags) && MSG_IS_ENCRYPTED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          clipkeyxpm, clipkeyxpmmask);
        } else if (MSG_IS_ENCRYPTED(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          keyxpm, keyxpmmask);
        } else if (MSG_IS_WITH_ATTACHMENT(flags)) {
-               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
+               gtk_cmctree_node_set_pixmap(ctree, row, col_pos[S_COL_MIME],
                                          clipxpm, clipxpmmask);
        } else {
-               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MIME], "");
+               gtk_cmctree_node_set_text(ctree, row, col_pos[S_COL_MIME], "");
        }
        if (!style)
                style = small_style;
 
-       gtk_ctree_node_set_row_style(ctree, row, style);
+       gtk_cmctree_node_set_row_style(ctree, row, style);
 
        if (MSG_GET_COLORLABEL(flags))
                summary_set_colorlabel_color(ctree, row, MSG_GET_COLORLABEL_VALUE(flags));
 }
 
-static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_mark_row(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
@@ -3913,13 +3914,13 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
        debug_print("Message %s/%d is marked\n", msginfo->folder->path, msginfo->msgnum);
 }
 
-static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_lock_row(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
        gboolean changed = FALSE;
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
@@ -3939,12 +3940,12 @@ static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
        debug_print("Message %d is locked\n", msginfo->msgnum);
 }
 
-static void summary_unlock_row(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_unlock_row(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        if (!MSG_IS_LOCKED(msginfo->flags))
                return;
@@ -3956,7 +3957,7 @@ static void summary_unlock_row(SummaryView *summaryview, GtkCTreeNode *row)
 
 void summary_mark(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
@@ -3964,8 +3965,8 @@ void summary_mark(SummaryView *summaryview)
                return;
        START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
-               summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+               summary_mark_row(summaryview, GTK_CMCTREE_NODE(cur->data));
        folder_item_set_batch(summaryview->folder_item, FALSE);
        END_LONG_OPERATION(summaryview);
 
@@ -3973,12 +3974,12 @@ void summary_mark(SummaryView *summaryview)
 }
 
 static void summary_mark_row_as_read(SummaryView *summaryview,
-                                    GtkCTreeNode *row)
+                                    GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
 
        if(!(MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
@@ -3992,7 +3993,7 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
 
 void summary_mark_as_read(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
@@ -4000,9 +4001,9 @@ void summary_mark_as_read(SummaryView *summaryview)
                return;
        START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_mark_row_as_read(summaryview,
-                                        GTK_CTREE_NODE(cur->data));
+                                        GTK_CMCTREE_NODE(cur->data));
        folder_item_set_batch(summaryview->folder_item, FALSE);
        END_LONG_OPERATION(summaryview);
        
@@ -4011,16 +4012,16 @@ void summary_mark_as_read(SummaryView *summaryview)
 
 void summary_msgs_lock(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
        if (summary_is_locked(summaryview))
                return;
        START_LONG_OPERATION(summaryview, FALSE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_lock_row(summaryview,
-                                        GTK_CTREE_NODE(cur->data));
+                                        GTK_CMCTREE_NODE(cur->data));
        END_LONG_OPERATION(summaryview);
        
        summary_status_show(summaryview);
@@ -4028,16 +4029,16 @@ void summary_msgs_lock(SummaryView *summaryview)
 
 void summary_msgs_unlock(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
        if (summary_is_locked(summaryview))
                return;
        START_LONG_OPERATION(summaryview, FALSE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_unlock_row(summaryview,
-                                  GTK_CTREE_NODE(cur->data));
+                                  GTK_CMCTREE_NODE(cur->data));
        END_LONG_OPERATION(summaryview);
        
        summary_status_show(summaryview);
@@ -4045,8 +4046,8 @@ void summary_msgs_unlock(SummaryView *summaryview)
 
 void summary_mark_all_read(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node;
        AlertValue val;
        gboolean froze = FALSE;
 
@@ -4066,13 +4067,13 @@ void summary_mark_all_read(SummaryView *summaryview)
                return;
        START_LONG_OPERATION(summaryview, TRUE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
-       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
+       for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node))
                summary_mark_row_as_read(summaryview, node);
        folder_item_set_batch(summaryview->folder_item, FALSE);
-       for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
+       for (node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node)) {
-               if (!GTK_CTREE_ROW(node)->expanded)
+               if (!GTK_CMCTREE_ROW(node)->expanded)
                        summary_set_row_marks(summaryview, node);
        }
        END_LONG_OPERATION(summaryview);
@@ -4082,7 +4083,7 @@ void summary_mark_all_read(SummaryView *summaryview)
 
 void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *widget)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean is_spam = action;
        GSList *msgs = NULL;
@@ -4096,17 +4097,17 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
 
        prefs_common.immediate_exec = FALSE;
        START_LONG_OPERATION(summaryview, FALSE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
-               GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
-               MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
+               GtkCMCTreeNode *row = GTK_CMCTREE_NODE(cur->data);
+               MsgInfo *msginfo = gtk_cmctree_node_get_row_data(ctree, row);
                if (msginfo)
                        msgs = g_slist_prepend(msgs, msginfo);
        }
        
        if (procmsg_spam_learner_learn(NULL, msgs, is_spam) == 0) {
-               for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
-                       GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
-                       MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, row);
+               for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
+                       GtkCMCTreeNode *row = GTK_CMCTREE_NODE(cur->data);
+                       MsgInfo *msginfo = gtk_cmctree_node_get_row_data(ctree, row);
                        if (!msginfo)
                                continue;
                        if (is_spam) {
@@ -4148,12 +4149,12 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
 
 
 static void summary_mark_row_as_unread(SummaryView *summaryview,
-                                      GtkCTreeNode *row)
+                                      GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        if (MSG_IS_DELETED(msginfo->flags)) {
                procmsg_msginfo_set_to_folder(msginfo, NULL);
@@ -4170,7 +4171,7 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
 
 void summary_mark_as_unread(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
@@ -4178,10 +4179,10 @@ void summary_mark_as_unread(SummaryView *summaryview)
                return;
        START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
                cur = cur->next)
                summary_mark_row_as_unread(summaryview,
-                                          GTK_CTREE_NODE(cur->data));
+                                          GTK_CMCTREE_NODE(cur->data));
        folder_item_set_batch(summaryview->folder_item, FALSE);
        END_LONG_OPERATION(summaryview);
        
@@ -4237,12 +4238,12 @@ static gboolean check_permission(SummaryView *summaryview, MsgInfo * msginfo)
        }
 }
 
-static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_delete_row(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
 
        if (MSG_IS_LOCKED(msginfo->flags)) return;
@@ -4271,7 +4272,7 @@ void summary_cancel(SummaryView *summaryview)
 {
        MsgInfo * msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+       msginfo = gtk_cmctree_node_get_row_data(GTK_CMCTREE(summaryview->ctree),
                                              summaryview->selected);
        if (!msginfo) return;
 
@@ -4296,11 +4297,11 @@ void summary_cancel(SummaryView *summaryview)
 
 void summary_delete(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        FolderItem *item = summaryview->folder_item;
        GList *cur;
-       GtkCTreeNode *sel_last = NULL;
-       GtkCTreeNode *node;
+       GtkCMCTreeNode *sel_last = NULL;
+       GtkCMCTreeNode *node;
        AlertValue aval;
        MsgInfo *msginfo;
        gboolean froze = FALSE;
@@ -4313,7 +4314,7 @@ void summary_delete(SummaryView *summaryview)
 
        if (!prefs_common.live_dangerously) {
                gchar *buf = NULL;
-               int num = g_list_length(GTK_CLIST(summaryview->ctree)->selection);
+               int num = g_list_length(GTK_CMCLIST(summaryview->ctree)->selection);
                buf = g_strdup_printf(ngettext(
                        "Do you really want to delete the selected message?",
                        "Do you really want to delete the %d selected messages?", num), 
@@ -4325,10 +4326,10 @@ void summary_delete(SummaryView *summaryview)
                if (aval != G_ALERTALTERNATE) return;
        }
 
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
             cur = cur->next) {
-               GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
-               msginfo = gtk_ctree_node_get_row_data(ctree, row);
+               GtkCMCTreeNode *row = GTK_CMCTREE_NODE(cur->data);
+               msginfo = gtk_cmctree_node_get_row_data(ctree, row);
                if (msginfo && msginfo->total_size != 0 && 
                    msginfo->size != (goffset)msginfo->total_size)
                        partial_mark_for_delete(msginfo);
@@ -4340,8 +4341,8 @@ void summary_delete(SummaryView *summaryview)
         * that is not deleted. */
        START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
-               sel_last = GTK_CTREE_NODE(cur->data);
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
+               sel_last = GTK_CMCTREE_NODE(cur->data);
                summary_delete_row(summaryview, sel_last);
        }
        folder_item_set_batch(summaryview->folder_item, FALSE);
@@ -4386,12 +4387,12 @@ void summary_delete_trash(SummaryView *summaryview)
 }
 
 
-static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
+static void summary_unmark_row(SummaryView *summaryview, GtkCMCTreeNode *row)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted--;
@@ -4411,7 +4412,7 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
 
 void summary_unmark(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GList *cur;
        gboolean froze = FALSE;
 
@@ -4419,23 +4420,23 @@ void summary_unmark(SummaryView *summaryview)
                return;
        START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
-               summary_unmark_row(summaryview, GTK_CTREE_NODE(cur->data));
+       for (cur = GTK_CMCLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
+               summary_unmark_row(summaryview, GTK_CMCTREE_NODE(cur->data));
        folder_item_set_batch(summaryview->folder_item, FALSE);
        END_LONG_OPERATION(summaryview);
        
        summary_status_show(summaryview);
 }
 
-static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
+static void summary_move_row_to(SummaryView *summaryview, GtkCMCTreeNode *row,
                                FolderItem *to_folder)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
        g_return_if_fail(to_folder != NULL);
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        if (MSG_IS_LOCKED(msginfo->flags))
                return;
@@ -4465,7 +4466,7 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
 void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 {
        GList *cur;
-       GtkCTreeNode *sel_last = NULL;
+       GtkCMCTreeNode *sel_last = NULL;
        gboolean froze = FALSE;
 
        if (!to_folder) return;
@@ -4487,11 +4488,11 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 
        START_LONG_OPERATION(summaryview, FALSE); 
 
-       for (cur = GTK_CLIST(summaryview->ctree)->selection;
+       for (cur = GTK_CMCLIST(summaryview->ctree)->selection;
             cur != NULL && cur->data != NULL; cur = cur->next) {
-               sel_last = GTK_CTREE_NODE(cur->data);
+               sel_last = GTK_CMCTREE_NODE(cur->data);
                summary_move_row_to
-                       (summaryview, GTK_CTREE_NODE(cur->data), to_folder);
+                       (summaryview, GTK_CMCTREE_NODE(cur->data), to_folder);
        }
        END_LONG_OPERATION(summaryview);
 
@@ -4502,7 +4503,7 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
        if (prefs_common.immediate_exec) {
                summary_execute(summaryview);
        } else {
-               GtkCTreeNode *node = summary_find_next_msg(summaryview, sel_last);
+               GtkCMCTreeNode *node = summary_find_next_msg(summaryview, sel_last);
                if (!node)
                        node = summary_find_prev_msg(summaryview, sel_last);
                summary_select_node(summaryview, node, summaryview->display_msg, TRUE);
@@ -4510,8 +4511,8 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
        }
        
        if (!summaryview->selected) { /* this was the last message */
-               GtkCTreeNode *node = gtk_ctree_node_nth (GTK_CTREE(summaryview->ctree), 
-                                                        GTK_CLIST(summaryview->ctree)->rows - 1);
+               GtkCMCTreeNode *node = gtk_cmctree_node_nth (GTK_CMCTREE(summaryview->ctree), 
+                                                        GTK_CMCLIST(summaryview->ctree)->rows - 1);
                if (node)
                        summary_select_node(summaryview, node, summaryview->display_msg, TRUE);
        }
@@ -4530,15 +4531,15 @@ void summary_move_to(SummaryView *summaryview)
        summary_move_selected_to(summaryview, to_folder);
 }
 
-static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
+static void summary_copy_row_to(SummaryView *summaryview, GtkCMCTreeNode *row,
                                FolderItem *to_folder)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
 
        g_return_if_fail(to_folder != NULL);
 
-       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, row);
        g_return_if_fail(msginfo);
        procmsg_msginfo_set_to_folder(msginfo, to_folder);
        if (MSG_IS_DELETED(msginfo->flags))
@@ -4586,10 +4587,10 @@ void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 
        START_LONG_OPERATION(summaryview, FALSE);
 
-       for (cur = GTK_CLIST(summaryview->ctree)->selection;
+       for (cur = GTK_CMCLIST(summaryview->ctree)->selection;
             cur != NULL && cur->data != NULL; cur = cur->next)
                summary_copy_row_to
-                       (summaryview, GTK_CTREE_NODE(cur->data), to_folder);
+                       (summaryview, GTK_CMCTREE_NODE(cur->data), to_folder);
 
        END_LONG_OPERATION(summaryview);
 
@@ -4618,7 +4619,7 @@ void summary_add_address(SummaryView *summaryview)
        GtkWidget *image = NULL;
        GdkPixbuf *picture = NULL;
 
-       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+       msginfo = gtk_cmctree_node_get_row_data(GTK_CMCTREE(summaryview->ctree),
                                              summaryview->selected);
        if (!msginfo || !msginfo->from) 
                return;
@@ -4657,7 +4658,7 @@ void summary_select_all(SummaryView *summaryview)
        if (!summaryview->folder_item) return;
 
        summary_lock(summaryview);
-       gtk_clist_select_all(GTK_CLIST(summaryview->ctree));
+       gtk_cmclist_select_all(GTK_CMCLIST(summaryview->ctree));
        summary_unlock(summaryview);
        summary_status_show(summaryview);
 }
@@ -4672,26 +4673,26 @@ void summary_unselect_all(SummaryView *summaryview)
 
 void summary_select_thread(SummaryView *summaryview, gboolean delete_thread)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCTreeNode *node = NULL;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCTreeNode *node = NULL;
        gboolean froze = FALSE;
        GList *cur = NULL;
        GList *copy = NULL;
-       if (!GTK_CLIST(summaryview->ctree)->selection) 
+       if (!GTK_CMCLIST(summaryview->ctree)->selection) 
                return;
 
 
        START_LONG_OPERATION(summaryview, FALSE);
-       copy = g_list_copy(GTK_CLIST(summaryview->ctree)->selection);
+       copy = g_list_copy(GTK_CMCLIST(summaryview->ctree)->selection);
        for (cur = copy; cur != NULL && cur->data != NULL;
             cur = cur->next) {
-               node = GTK_CTREE_NODE(cur->data);
+               node = GTK_CMCTREE_NODE(cur->data);
                if (!node)
                        continue;
-               while (GTK_CTREE_ROW(node)->parent != NULL)
-                       node = GTK_CTREE_ROW(node)->parent;
+               while (GTK_CMCTREE_ROW(node)->parent != NULL)
+                       node = GTK_CMCTREE_ROW(node)->parent;
 
-               gtk_ctree_select_recursive(ctree, node);
+               gtk_cmctree_select_recursive(ctree, node);
        }
        g_list_free(copy);
        END_LONG_OPERATION(summaryview);
@@ -4707,7 +4708,7 @@ void summary_select_thread(SummaryView *summaryview, gboolean delete_thread)
 
 void summary_save_as(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
        gchar *filename = NULL;
        gchar *src, *dest;
@@ -4716,7 +4717,7 @@ void summary_save_as(SummaryView *summaryview)
        AlertValue aval = 0;
 
        if (!summaryview->selected) return;
-       msginfo = gtk_ctree_node_get_row_data(ctree, summaryview->selected);
+       msginfo = gtk_cmctree_node_get_row_data(ctree, summaryview->selected);
        if (!msginfo) return;
 
        if (msginfo->subject) {
@@ -4763,10 +4764,10 @@ void summary_save_as(SummaryView *summaryview)
         * If two or more msgs are selected,
         * append them to the output file.
         */
-       if (GTK_CLIST(ctree)->selection->next) {
+       if (GTK_CMCLIST(ctree)->selection->next) {
                GList *item;
-               for (item = GTK_CLIST(ctree)->selection->next; item != NULL; item=item->next) {
-                       msginfo = gtk_ctree_node_get_row_data(ctree, GTK_CTREE_NODE(item->data));
+               for (item = GTK_CMCLIST(ctree)->selection->next; item != NULL; item=item->next) {
+                       msginfo = gtk_cmctree_node_get_row_data(ctree, GTK_CMCTREE_NODE(item->data));
                        if (!msginfo) break;
                        src = procmsg_get_message_file(msginfo);
                        if (append_file(src, dest, TRUE) < 0)
@@ -4780,9 +4781,9 @@ void summary_save_as(SummaryView *summaryview)
 
 void summary_print(SummaryView *summaryview)
 {
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
 #if !defined(USE_GNOMEPRINT) && !GTK_CHECK_VERSION(2,10,0)
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        MsgInfo *msginfo;
        gchar *cmdline = NULL;
        gchar *p;
@@ -4817,8 +4818,8 @@ void summary_print(SummaryView *summaryview)
        for (cur = clist->selection; 
             cur != NULL && cur->data != NULL; 
             cur = cur->next) {
-               msginfo = gtk_ctree_node_get_row_data
-                       (ctree, GTK_CTREE_NODE(cur->data));
+               msginfo = gtk_cmctree_node_get_row_data
+                       (ctree, GTK_CMCTREE_NODE(cur->data));
                if (msginfo) 
                        procmsg_print_message(msginfo, cmdline);
        }
@@ -4828,9 +4829,9 @@ void summary_print(SummaryView *summaryview)
        for (cur = clist->selection; 
             cur != NULL && cur->data != NULL; 
             cur = cur->next) {
-               GtkCTreeNode *node = GTK_CTREE_NODE(cur->data);
-               MsgInfo *msginfo = gtk_ctree_node_get_row_data(
-                                       GTK_CTREE(summaryview->ctree),
+               GtkCMCTreeNode *node = GTK_CMCTREE_NODE(cur->data);
+               MsgInfo *msginfo = gtk_cmctree_node_get_row_data(
+                                       GTK_CMCTREE(summaryview->ctree),
                                        node);
                gint sel_start = -1, sel_end = -1, partnum = 0;
                
@@ -4847,10 +4848,10 @@ void summary_print(SummaryView *summaryview)
 
 gboolean summary_execute(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
-       GtkCTreeNode *node, *next;
-       GtkCTreeNode *new_selected = NULL;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+       GtkCMCList *clist = GTK_CMCLIST(summaryview->ctree);
+       GtkCMCTreeNode *node, *next;
+       GtkCMCTreeNode *new_selected = NULL;
        gint move_val = -1;
 
        if (!summaryview->folder_item) return FALSE;
@@ -4870,25 +4871,25 @@ gboolean summary_execute(SummaryView *summaryview)
        summary_execute_copy(summaryview);
        summary_execute_delete(summaryview);
        
-       node = GTK_CTREE_NODE(clist->row_list);
+       node = GTK_CMCTREE_NODE(clist->row_list);
        for (; node != NULL; node = next) {
                next = gtkut_ctree_node_next(ctree, node);
-               if (gtk_ctree_node_get_row_data(ctree, node) != NULL) continue;
+               if (gtk_cmctree_node_get_row_data(ctree, node) != NULL) continue;
 
                if (node == summaryview->displayed) {
                        messageview_clear(summaryview->messageview);
                        summaryview->displayed = NULL;
                }
-               if (GTK_CTREE_ROW(node)->children != NULL) {
+        &n