2005-08-17 [paul] 1.9.13cvs34
authorPaul Mangan <paul@claws-mail.org>
Wed, 17 Aug 2005 09:29:17 +0000 (09:29 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 17 Aug 2005 09:29:17 +0000 (09:29 +0000)
patches by colin:
* src/addressbook.c
* src/addressitem.h
Add an edit button for contacts, fix selections
of gtksctree items
* src/editaddress.c
Change labels, let Save be always possible in the
email and user atributes tabs
* src/folderview.c
fix sort issues
* src/summaryview.c
select next item instead of the displayed one
after deletion

* src/gtk/progressdialog.c
use prefs_common.enable_rules_hint

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/addressbook.c
src/addressitem.h
src/editaddress.c
src/folderview.c
src/gtk/progressdialog.c
src/summaryview.c

index 43e62aee810c018d93585330551da6f5461cd2cb..8863e491dbdef6289583ce7148dda3919fee19a4 100644 (file)
@@ -1,3 +1,22 @@
+2005-08-17 [paul]      1.9.13cvs34
+
+       patches by colin:
+       * src/addressbook.c
+       * src/addressitem.h
+               Add an edit button for contacts, fix selections
+               of gtksctree items
+       * src/editaddress.c
+               Change labels, let Save be always possible in the
+               email and user atributes tabs
+       * src/folderview.c
+               fix sort issues
+       * src/summaryview.c
+               select next item instead of the displayed one
+               after deletion
+
+       * src/gtk/progressdialog.c
+               use prefs_common.enable_rules_hint
+
 2005-08-13 [hoa]       1.9.13cvs33
 
        * src/etpan/imap-thread.c
index 66cedf5b70e21de3dc0f539fce2d59abe6af3e29..fe0c6f4bc1956fc11525709d08224d603cebed34 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.150.2.35 -r 1.150.2.36 src/procmsg.c;  ) > 1.9.13cvs31.patchset
 ( cvs diff -u -r 1.150.2.36 -r 1.150.2.37 src/procmsg.c;  ) > 1.9.13cvs32.patchset
 ( cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/etpan/imap-thread.c;  ) > 1.9.13cvs33.patchset
+( cvs diff -u -r 1.60.2.24 -r 1.60.2.25 src/addressbook.c;  cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/addressitem.h;  cvs diff -u -r 1.14.2.7 -r 1.14.2.8 src/editaddress.c;  cvs diff -u -r 1.207.2.56 -r 1.207.2.57 src/folderview.c;  cvs diff -u -r 1.395.2.110 -r 1.395.2.111 src/summaryview.c;  cvs diff -u -r 1.1.4.13 -r 1.1.4.14 src/gtk/progressdialog.c;  ) > 1.9.13cvs34.patchset
index 54790260a15cec09e1bf5315b23b93d659507d5e..fbc2f24b28e2c259ac8a294eb12998d13200d265 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 3f2c8aefdcf26faf37b20983f338d96788b97d56..c710b6e833cb25a7d0dec5116f038407cc09cb15 100644 (file)
@@ -359,6 +359,7 @@ static void addressbook_mail_to_cb          ( void );
 #ifdef USE_LDAP
 static void addressbook_browse_entry_cb                ( void );
 #endif
+static void addressbook_edit_clicked(GtkButton *button, gpointer data);
 
 static void addressbook_start_drag(GtkWidget *widget, gint button, 
                                   GdkEvent *event,
@@ -547,9 +548,11 @@ static gboolean lastCanLookup = FALSE;
 void addressbook_show_buttons(gboolean add_and_delete, gboolean lookup, gboolean mail_ops)
 {
        if (add_and_delete) {
+               gtk_widget_show(addrbook.edit_btn);
                gtk_widget_show(addrbook.del_btn);
                gtk_widget_show(addrbook.reg_btn);
        } else {
+               gtk_widget_hide(addrbook.edit_btn);
                gtk_widget_hide(addrbook.del_btn);
                gtk_widget_hide(addrbook.reg_btn);
        }
@@ -593,7 +596,7 @@ void addressbook_open(Compose *target)
                addressbook_read_file();
                addressbook_create();
                addressbook_load_tree();
-               gtk_ctree_select(GTK_CTREE(addrbook.ctree),
+               gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
                                 GTK_CTREE_NODE(GTK_CLIST(addrbook.ctree)->row_list));
        }
        else {
@@ -643,7 +646,7 @@ void addressbook_refresh( void )
 {
        if (addrbook.window) {
                if (addrbook.treeSelected) {
-                       gtk_ctree_select(GTK_CTREE(addrbook.ctree),
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
                                         addrbook.treeSelected);
                }
        }
@@ -684,6 +687,7 @@ static void addressbook_create(void)
        GtkWidget *hbbox;
        GtkWidget *hsbox;
        GtkWidget *del_btn;
+       GtkWidget *edit_btn;
        GtkWidget *reg_btn;
        GtkWidget *lup_btn;
        GtkWidget *to_btn;
@@ -858,6 +862,9 @@ static void addressbook_create(void)
        gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbbox), 2);
        gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
 
+       edit_btn = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+       GTK_WIDGET_SET_FLAGS(edit_btn, GTK_CAN_DEFAULT);
+       gtk_box_pack_start(GTK_BOX(hbbox), edit_btn, TRUE, TRUE, 0);
        del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
        GTK_WIDGET_SET_FLAGS(del_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbbox), del_btn, TRUE, TRUE, 0);
@@ -870,6 +877,8 @@ static void addressbook_create(void)
        GTK_WIDGET_SET_FLAGS(lup_btn, GTK_CAN_DEFAULT);
        gtk_box_pack_start(GTK_BOX(hbox), lup_btn, TRUE, TRUE, 0);
 
+       g_signal_connect(G_OBJECT(edit_btn), "clicked",
+                        G_CALLBACK(addressbook_edit_clicked), NULL);
        g_signal_connect(G_OBJECT(del_btn), "clicked",
                         G_CALLBACK(addressbook_del_clicked), NULL);
        g_signal_connect(G_OBJECT(reg_btn), "clicked",
@@ -966,6 +975,7 @@ static void addressbook_create(void)
        addrbook.status_cid = gtk_statusbar_get_context_id(
                        GTK_STATUSBAR(statusbar), "Addressbook Window" );
 
+       addrbook.edit_btn = edit_btn;
        addrbook.del_btn = del_btn;
        addrbook.reg_btn = reg_btn;
        addrbook.lup_btn = lup_btn;
@@ -1069,6 +1079,11 @@ static void addressbook_button_set_sensitive(void)
        gtk_widget_set_sensitive(addrbook.bcc_btn, bcc_sens);
 }
 
+static void addressbook_edit_clicked(GtkButton *button, gpointer data)
+{
+       addressbook_edit_address_cb(NULL, 0, NULL);
+}
+
 /*
 * Delete one or more objects from address list.
 */
@@ -1175,7 +1190,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                g_list_free( list );
                addressbook_list_select_clear();
                if( refreshList ) 
-                       gtk_ctree_select( ctree, addrbook.opened);
+                       gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened);
                addrbook_set_dirty(abf, TRUE);
                addressbook_export_to_file();
                return;
@@ -1199,7 +1214,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                }
                g_list_free( list );
                addressbook_list_select_clear();
-               gtk_ctree_select( ctree, addrbook.opened);
+               gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened);
                addrbook_set_dirty(abf, TRUE);
                addressbook_export_to_file();
                return;
@@ -1330,6 +1345,7 @@ static void addressbook_menubar_set_sensitive( gboolean sensitive ) {
        menu_set_sensitive( addrbook.menu_factory, "/Address/New Group",   sensitive );
        menu_set_sensitive( addrbook.menu_factory, "/Address/Mail To",     sensitive );
        gtk_widget_set_sensitive( addrbook.reg_btn, sensitive );
+       gtk_widget_set_sensitive( addrbook.edit_btn, sensitive );
        gtk_widget_set_sensitive( addrbook.del_btn, sensitive );
 }
 
@@ -1400,6 +1416,7 @@ static void addressbook_menuitem_set_sensitive( AddressObject *obj, GtkCTreeNode
        /* Enable edit */
        menu_set_sensitive( addrbook.menu_factory, "/Address/Edit",   canEdit );
        menu_set_sensitive( addrbook.menu_factory, "/Address/Delete", canEdit );
+       gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
        gtk_widget_set_sensitive( addrbook.del_btn, canEdit );
 
        menu_set_sensitive( addrbook.menu_factory, "/Book/Edit book name",      canEditTr );
@@ -1593,6 +1610,7 @@ static void addressbook_list_menu_setup( void ) {
        menu_set_sensitive( addrbook.menu_factory, "/Address/Delete",  canDelete );
        menu_set_sensitive( addrbook.menu_factory, "/Address/Mail To", canCopy );
 
+       gtk_widget_set_sensitive( addrbook.edit_btn, canEdit );
        gtk_widget_set_sensitive( addrbook.del_btn, canDelete );
 
 #ifdef USE_LDAP
@@ -1725,7 +1743,7 @@ static void addressbook_clip_paste_cb( void ) {
        }
 
        /* Display items pasted */
-       gtk_ctree_select( ctree, addrbook.opened );
+       gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened );
 
 }
 
@@ -1791,7 +1809,7 @@ static void addressbook_clip_paste_address_cb( void ) {
 
        /* Display items pasted */
        if( cnt > 0 ) {
-               gtk_ctree_select( ctree, addrbook.opened );
+               gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened );
        }
 }
 #endif
@@ -2130,7 +2148,7 @@ static gboolean addressbook_tree_button_released(GtkWidget *ctree,
                                                 GdkEventButton *event,
                                                 gpointer data)
 {
-       gtk_ctree_select(GTK_CTREE(addrbook.ctree), addrbook.opened);
+       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened);
        gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree), addrbook.opened);
        return FALSE;
 }
@@ -2139,7 +2157,7 @@ static void addressbook_popup_close(GtkMenuShell *menu_shell, gpointer data)
 {
        if (!addrbook.opened) return;
 
-       gtk_ctree_select(GTK_CTREE(addrbook.ctree), addrbook.opened);
+       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened);
        gtkut_ctree_set_focus_row(GTK_CTREE(addrbook.ctree),
                                  addrbook.opened);
 }
@@ -2343,7 +2361,7 @@ static void addressbook_treenode_edit_cb(gpointer data, guint action,
                addressbook_change_node_name( node, name );
                gtk_sctree_sort_node(ctree, parentNode);
                gtk_ctree_expand( ctree, node );
-               gtk_ctree_select( ctree, node );
+               gtk_sctree_select( GTK_SCTREE( ctree), node );
        }
 }
 
@@ -2546,7 +2564,7 @@ static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *
                ItemPerson *person = addressbook_edit_person( abf, folder, NULL, FALSE );
                if( person ) {
                        if (addrbook.treeSelected == addrbook.opened) {
-                               gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened );
+                               gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
                        }
                }
        }
@@ -2557,7 +2575,7 @@ static void addressbook_new_address_cb( gpointer data, guint action, GtkWidget *
                if (addrbook.treeSelected == addrbook.opened) {
                        /* Change node name in tree. */
                        addressbook_change_node_name( addrbook.treeSelected, ADDRITEM_NAME(group) );
-                       gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened );
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
                }
        }
 }
@@ -2702,7 +2720,7 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
        if( node == NULL ) return;
        addressbook_change_node_name( node, name );
        gtk_sctree_sort_node( ctree, parentNode );
-       gtk_ctree_select( ctree, addrbook.opened ); 
+       gtk_sctree_select( GTK_SCTREE(ctree), addrbook.opened ); 
 }
 
 static void addressbook_delete_address_cb(gpointer data, guint action,
@@ -2896,9 +2914,10 @@ static void addressbook_folder_refresh_one_person( GtkCTree *clist, ItemPerson *
        if( node )
                addressbook_folder_remove_node( clist, node );
        addressbook_folder_load_one_person( clist, person, atci, atciMail );
+       gtk_sctree_sort_node( clist, NULL );
        node = gtk_ctree_find_by_row_data( clist, NULL, person );
        if( node ) {
-               gtk_ctree_select( clist, node );
+               gtk_sctree_select( GTK_SCTREE(clist), node );
                if (!gtk_ctree_node_is_visible( clist, node ) ) 
                        gtk_ctree_node_moveto( clist, node, 0, 0, 0 );
        }
@@ -3574,7 +3593,7 @@ static void addressbook_new_book_cb( gpointer data, guint action, GtkWidget *wid
        if( ads ) {
                newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
                if( newNode ) {
-                       gtk_ctree_select( GTK_CTREE(addrbook.ctree), newNode );
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), newNode );
                        addrbook.treeSelected = newNode;
                }
        }
@@ -3591,7 +3610,7 @@ static void addressbook_new_vcard_cb( gpointer data, guint action, GtkWidget *wi
        if( ads ) {
                newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
                if( newNode ) {
-                       gtk_ctree_select( GTK_CTREE(addrbook.ctree), newNode );
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), newNode );
                        addrbook.treeSelected = newNode;
                }
        }
@@ -3612,7 +3631,7 @@ static void addressbook_new_jpilot_cb( gpointer data, guint action, GtkWidget *w
        if( ads ) {
                newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
                if( newNode ) {
-                       gtk_ctree_select( GTK_CTREE(addrbook.ctree), newNode );
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), newNode );
                        addrbook.treeSelected = newNode;
                }
        }
@@ -3634,7 +3653,7 @@ static void addressbook_new_ldap_cb( gpointer data, guint action, GtkWidget *wid
        if( ads ) {
                newNode = addressbook_add_object( adapter->treeNode, ADDRESS_OBJECT(ads) );
                if( newNode ) {
-                       gtk_ctree_select( GTK_CTREE(addrbook.ctree), newNode );
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), newNode );
                        addrbook.treeSelected = newNode;
                }
        }
@@ -3807,7 +3826,7 @@ static void addressbook_perform_search(
        nNode = addressbook_node_add_folder( pNode, ds, folder, aoType );
        gtk_ctree_expand( ctree, pNode );
        if( nNode ) {
-               gtk_ctree_select( ctree, nNode );
+               gtk_sctree_select( GTK_SCTREE(ctree), nNode );
                addrbook.treeSelected = nNode;
        }
 
@@ -4369,8 +4388,7 @@ static void addressbook_import_ldif_cb( void ) {
                                        adapter->treeNode,
                                        ADDRESS_OBJECT(ads) );
                                if( newNode ) {
-                                       gtk_ctree_select(
-                                               GTK_CTREE(addrbook.ctree),
+                                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
                                                newNode );
                                        addrbook.treeSelected = newNode;
                                }
@@ -4407,8 +4425,7 @@ static void addressbook_import_mutt_cb( void ) {
                                        adapter->treeNode,
                                        ADDRESS_OBJECT(ads) );
                                if( newNode ) {
-                                       gtk_ctree_select(
-                                               GTK_CTREE(addrbook.ctree),
+                                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
                                                newNode );
                                        addrbook.treeSelected = newNode;
                                }
@@ -4445,8 +4462,7 @@ static void addressbook_import_pine_cb( void ) {
                                        adapter->treeNode,
                                        ADDRESS_OBJECT(ads) );
                                if( newNode ) {
-                                       gtk_ctree_select(
-                                               GTK_CTREE(addrbook.ctree),
+                                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree),
                                                newNode );
                                        addrbook.treeSelected = newNode;
                                }
@@ -4683,7 +4699,7 @@ static gboolean addressbook_drag_motion_cb(GtkWidget      *widget,
                g_signal_handlers_block_by_func
                        (G_OBJECT(widget),
                         G_CALLBACK(addressbook_tree_selected), NULL);
-               gtk_ctree_select(GTK_CTREE(widget), node);
+               gtk_sctree_select( GTK_SCTREE(widget), node);
                g_signal_handlers_unblock_by_func
                        (G_OBJECT(widget),
                         G_CALLBACK(addressbook_tree_selected), NULL);
@@ -4706,7 +4722,7 @@ static void addressbook_drag_leave_cb(GtkWidget      *widget,
                g_signal_handlers_block_by_func
                        (G_OBJECT(widget),
                         G_CALLBACK(addressbook_tree_selected), NULL);
-               gtk_ctree_select(GTK_CTREE(widget), addrbook.treeSelected);
+               gtk_sctree_select( GTK_SCTREE(widget), addrbook.treeSelected);
                g_signal_handlers_unblock_by_func
                        (G_OBJECT(widget),
                         G_CALLBACK(addressbook_tree_selected), NULL);
@@ -4781,7 +4797,7 @@ static void addressbook_drag_received_cb(GtkWidget        *widget,
                                }
                        }
                        addressbook_list_select_clear();
-                       gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened);
+                       gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened);
                                                        
                        if (abook) {
                                addrbook_set_dirty(abook, TRUE);
index 3361df64e081eff371f55bf6819f7e1c1768887c..cd4a9efaceca2ce27d11c8170f68318f46d6c690 100644 (file)
@@ -68,6 +68,7 @@ struct _AddressBook_win
        GtkWidget *label;
        GtkWidget *statusbar;
 
+       GtkWidget *edit_btn;
        GtkWidget *del_btn;
        GtkWidget *reg_btn;
        GtkWidget *lup_btn;
index 3fa3c47f3491d62ab9ed2d9fc43d96f00e9b6c3d..b530504d9ada43c780bd546152a39aa6cd847f91 100644 (file)
@@ -52,7 +52,7 @@ static struct _PersonEdit_dlg {
        GtkWidget *statusbar;
        gint status_cid;
 
-       /* Basic data tab */
+       /* User data tab */
        GtkWidget *entry_name;
        GtkWidget *entry_first;
        GtkWidget *entry_last;
@@ -663,6 +663,8 @@ 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(personeditdlg.clist_email, 0) != NULL;
+
        if (gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_email)) == NULL
        ||  strlen(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_email))) == 0) {
                gtk_widget_set_sensitive(personeditdlg.email_add,FALSE);
@@ -671,24 +673,24 @@ static void edit_person_entry_email_changed (GtkWidget *entry, gpointer data)
                email_saving = FALSE;
        } else if (list_find_email(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_email)))) {
                gtk_widget_set_sensitive(personeditdlg.email_add,FALSE);
-               gtk_widget_set_sensitive(personeditdlg.email_mod,TRUE);
+               gtk_widget_set_sensitive(personeditdlg.email_mod,non_empty);
                email_adding = FALSE;
-               email_saving = TRUE;
+               email_saving = non_empty;
        } else {
                gtk_widget_set_sensitive(personeditdlg.email_add,TRUE);
-               gtk_widget_set_sensitive(personeditdlg.email_mod,FALSE);
+               gtk_widget_set_sensitive(personeditdlg.email_mod,non_empty);
                email_adding = TRUE;
-               email_saving = FALSE;
+               email_saving = non_empty;
        }
 }
 
 static gboolean edit_person_entry_email_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        if (event && event->keyval == GDK_Return) {
-               if (email_adding)
+               if (email_saving)
+                       edit_person_email_modify(NULL);         
+               else if (email_adding)
                        edit_person_email_add(NULL);
-               else if (email_saving)
-                       edit_person_email_modify(NULL);
        }
        return FALSE;
 }
@@ -856,6 +858,8 @@ 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(personeditdlg.clist_attrib, 0) != NULL;
+
        if (gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_atname)) == NULL
        ||  strlen(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_atname))) == 0) {
                gtk_widget_set_sensitive(personeditdlg.attrib_add,FALSE);
@@ -864,24 +868,24 @@ static void edit_person_entry_att_changed (GtkWidget *entry, gpointer data)
                attrib_saving = FALSE;
        } else if (list_find_attribute(gtk_entry_get_text(GTK_ENTRY(personeditdlg.entry_atname)))) {
                gtk_widget_set_sensitive(personeditdlg.attrib_add,FALSE);
-               gtk_widget_set_sensitive(personeditdlg.attrib_mod,TRUE);
+               gtk_widget_set_sensitive(personeditdlg.attrib_mod,non_empty);
                attrib_adding = FALSE;
-               attrib_saving = TRUE;
+               attrib_saving = non_empty;
        } else {
                gtk_widget_set_sensitive(personeditdlg.attrib_add,TRUE);
-               gtk_widget_set_sensitive(personeditdlg.attrib_mod,FALSE);
+               gtk_widget_set_sensitive(personeditdlg.attrib_mod,non_empty);
                attrib_adding = TRUE;
-               attrib_saving = FALSE;
+               attrib_saving = non_empty;
        }
 }
 
 static gboolean edit_person_entry_att_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        if (event && event->keyval == GDK_Return) {
-               if (attrib_adding)
-                       edit_person_attrib_add(NULL);
-               else if (attrib_saving)
+               if (attrib_saving)
                        edit_person_attrib_modify(NULL);
+               else if (attrib_adding)
+                       edit_person_attrib_add(NULL);
        }
        return FALSE;
 }
@@ -1024,9 +1028,9 @@ static void addressbook_edit_person_page_attrib( gint pageNum, gchar *pageLbl )
 
 static void addressbook_edit_person_create( gboolean *cancelled ) {
        addressbook_edit_person_dialog_create( cancelled );
-       addressbook_edit_person_page_basic( PAGE_BASIC, _( "Basic Data" ) );
-       addressbook_edit_person_page_email( PAGE_EMAIL, _( "E-Mail Address" ) );
-       addressbook_edit_person_page_attrib( PAGE_ATTRIBUTES, _( "User Attributes" ) );
+       addressbook_edit_person_page_basic( PAGE_BASIC, _( "User Data" ) );
+       addressbook_edit_person_page_email( PAGE_EMAIL, _( "E-Mail Addresses" ) );
+       addressbook_edit_person_page_attrib( PAGE_ATTRIBUTES, _( "Other Attributes" ) );
        gtk_widget_show_all( personeditdlg.window );
 }
 
index 7d62f10ef80b048973286a700fa5e834c8597a48..88f0b32ce4b8720847a1822e5dfbbcab4e530fea 100644 (file)
@@ -1914,7 +1914,7 @@ void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
        gtk_ctree_node_set_row_data(ctree, node, item);
        if (normal_style)
                gtk_ctree_node_set_row_style(ctree, node, normal_style);
-       folderview_sort_folders(folderview, folderview->selected, item->folder);
+       folderview_sort_folders(folderview, parent_node, item->folder);
 
        gtk_clist_thaw(GTK_CLIST(ctree));
 }
@@ -2058,7 +2058,7 @@ void folderview_move_folder(FolderView *folderview, FolderItem *from_folder,
 
                folderview_sort_folders(folderview, 
                        gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), 
-                               NULL, folder_item_parent(new_folder)), new_folder->folder);
+                               NULL, to_folder), new_folder->folder);
                folderview_select(folderview, new_folder);
        } else {
                statusbar_verbosity_set(FALSE);         
index 7ad66fc6a6b70219c8e062e2812980a4b00093a5..c5ef283463fca093859e88da940dd76e0bf7393a 100644 (file)
@@ -118,7 +118,8 @@ ProgressDialog *progress_dialog_create(void)
        treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
        g_object_unref(G_OBJECT(store));
        gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), TRUE);
-       gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), TRUE);
+       gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview),
+                                    prefs_common.enable_rules_hint);
        gtk_widget_show(treeview);
        gtk_container_add(GTK_CONTAINER(scrolledwin), treeview);
        gtk_widget_set_size_request(treeview, -1, 120);
@@ -281,7 +282,7 @@ static gint progress_dialog_insert_account(ProgressDialog *progress,
                gtk_list_store_set(store, &iter,
                                   PROGRESS_STATE, status,
                                   -1);
-       if (image)
+       if (image) 
                gtk_list_store_set(store, &iter,
                                   PROGRESS_IMAGE, image,
                                   -1);
index 225726617435899ccdf7304e574ba6b1c45e3c3c..d80b85a135404e962a5cc024853e029efc3306f3 100644 (file)
@@ -3581,8 +3581,7 @@ gboolean summary_execute(SummaryView *summaryview)
                summary_unlock(summaryview);
                gtk_sctree_select
                        (GTK_SCTREE(ctree),
-                        summaryview->displayed ? summaryview->displayed
-                        : new_selected);
+                        new_selected);
                summary_lock(summaryview);
        }