2006-12-01 [wwp] 2.6.0cvs78
authorTristan Chabredier <wwp@claws-mail.org>
Fri, 1 Dec 2006 14:41:50 +0000 (14:41 +0000)
committerTristan Chabredier <wwp@claws-mail.org>
Fri, 1 Dec 2006 14:41:50 +0000 (14:41 +0000)
* src/addressbook.c
* src/editaddress.c
remove forgotten debug statements.

ChangeLog
PATCHSETS
configure.ac
src/addressbook.c
src/editaddress.c

index 5e95049..af21900 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-01 [wwp]       2.6.0cvs78
+
+       * src/addressbook.c
+       * src/editaddress.c
+               remove forgotten debug statements.
+
 2006-12-01 [wwp]       2.6.0cvs77
 
        * manual/advanced.xml
index 2e44bda..3512f73 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/gtk/quicksearch.c;  ) > 2.6.0cvs75.patchset
 ( cvs diff -u -r 1.3.12.19 -r 1.3.12.20 src/message_search.c;  cvs diff -u -r 1.15.2.37 -r 1.15.2.38 src/summary_search.c;  ) > 2.6.0cvs76.patchset
 ( cvs diff -u -r 1.1.2.34 -r 1.1.2.35 manual/advanced.xml;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 manual/fr/advanced.xml;  cvs diff -u -r 1.60.2.70 -r 1.60.2.71 src/addressbook.c;  cvs diff -u -r 1.18.2.4 -r 1.18.2.5 src/addressbook.h;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/addressitem.h;  cvs diff -u -r 1.14.2.17 -r 1.14.2.18 src/editaddress.c;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/editaddress.h;  cvs diff -u -r 1.204.2.110 -r 1.204.2.111 src/prefs_common.c;  cvs diff -u -r 1.103.2.68 -r 1.103.2.69 src/prefs_common.h;  cvs diff -u -r 1.5.2.44 -r 1.5.2.45 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.26 -r 1.4.2.27 src/gtk/gtkutils.h;  ) > 2.6.0cvs77.patchset
+( cvs diff -u -r 1.60.2.71 -r 1.60.2.72 src/addressbook.c;  cvs diff -u -r 1.14.2.18 -r 1.14.2.19 src/editaddress.c;  ) > 2.6.0cvs78.patchset
index c2d95fb..c1189f0 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=77
+EXTRA_VERSION=78
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 415a642..9b8c705 100644 (file)
@@ -605,7 +605,6 @@ void addressbook_show_buttons(gboolean add_and_delete, gboolean lookup, gboolean
 
 void addressbook_open(Compose *target)
 {
-fprintf(stderr, "addressbook_open: %p\n", target);
        /* Initialize all static members */
        if( _clipBoard_ == NULL ) {
                _clipBoard_ = addrclip_create();
@@ -689,7 +688,6 @@ void addressbook_refresh( void )
 
 static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-fprintf(stderr, "key_pressed\n");
        if (event && event->keyval == GDK_Escape)
                addressbook_close();
        else if (event && event->keyval == GDK_Delete) {
@@ -885,7 +883,6 @@ static void addressbook_create(void)
 
        static GdkGeometry geometry;
 
-fprintf(stderr, "addressbook_create\n");
        debug_print("Creating addressbook window...\n");
 
        index_titles[COL_SOURCES] = _("Sources");
@@ -1220,7 +1217,6 @@ fprintf(stderr, "addressbook_create\n");
  * Close address book window and save to file(s).
  */
 static gint addressbook_close( void ) {
-fprintf(stderr, "addressbook_close\n");
        address_completion_end(addrbook.window);
        if (!prefs_common.addressbook_use_editaddress_dialog)
                addressbook_edit_person_invalidate(NULL, NULL, NULL);
@@ -1330,7 +1326,6 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
        GList *list, *node;
        gboolean refreshList = FALSE;
        
-fprintf(stderr, "addressbook_del_clicked: %p %p\n", button, data);
        pobj = gtk_ctree_node_get_row_data(ctree, addrbook.opened );
        g_return_if_fail(pobj != NULL);
 
@@ -1731,7 +1726,6 @@ static void addressbook_tree_selected(GtkCTree *ctree, GtkCTreeNode *node,
        ItemFolder *rootFolder = NULL;
        AddressObjectType aot;
 
-fprintf(stderr, "addressbook_tree_selected\n");
        addrbook.treeSelected = node;
        addrbook.listSelected = NULL;
        addressbook_status_show( "" );
@@ -1959,7 +1953,6 @@ static void addressbook_treenode_add_list(
 }
 
 static void addressbook_select_all_cb( void ) {
-fprintf(stderr, "addressbook_select_all_cb\n");
        gtk_clist_select_all(GTK_CLIST(addrbook.clist));
 }
 
@@ -2190,7 +2183,6 @@ static void addressbook_list_row_selected( GtkCTree *clist,
        AdapterDSource *ads = NULL;
        AddressDataSource *ds = NULL;
 
-fprintf(stderr, "addressbook_list_row_selected\n");
        gtk_entry_set_text( entry, "" );
        addrbook.listSelected = node;
 
@@ -2224,7 +2216,6 @@ static void addressbook_list_row_unselected( GtkCTree *ctree,
 {
        AddrItemObject *aio;
 
-fprintf(stderr, "addressbook_list_row_unselected\n");
        aio = gtk_ctree_node_get_row_data( ctree, node );
        if( aio != NULL ) {
                /* printf( "list unselect: %d : '%s'\n", aio->type, aio->name ); */
@@ -2813,7 +2804,6 @@ static void addressbook_treenode_delete_cb(
 
 void addressbook_new_address_from_book_post_cb( ItemPerson *person )
 {
-fprintf(stderr, "addressbook_new_address_from_book_post_cb\n");
        if( person && addrbook.treeSelected == addrbook.opened ) {
                gtk_clist_unselect_all( GTK_CLIST(addrbook.clist) );
                addressbook_folder_refresh_one_person(
@@ -2824,7 +2814,6 @@ fprintf(stderr, "addressbook_new_address_from_book_post_cb\n");
 
 void addressbook_new_address_from_folder_post_cb( ItemPerson *person )
 {
-fprintf(stderr, "addressbook_new_address_from_folder_post_cb\n");
        if( person && addrbook.treeSelected == addrbook.opened) {
                gtk_sctree_select( GTK_SCTREE(addrbook.ctree), addrbook.opened );
                addressbook_set_clist(
@@ -2950,7 +2939,6 @@ static void addressbook_move_nodes_up( GtkCTree *ctree, GtkCTreeNode *node ) {
 
 void addressbook_edit_address_post_cb( ItemPerson *person )
 {
-fprintf(stderr, "addressbook_edit_address_post_cb\n");
        if( person ) {
                addressbook_folder_refresh_one_person( GTK_CTREE(addrbook.clist), person );
                invalidate_address_completion();
@@ -3862,7 +3850,6 @@ void addressbook_export_to_file( void ) {
 
 static gboolean addressbook_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-fprintf(stderr, "addressbook_entry_key_pressed\n");
        if (event && event->keyval == GDK_Return)
                addressbook_lup_clicked(NULL, NULL);
        return FALSE;
index e18f072..6263638 100644 (file)
@@ -128,27 +128,24 @@ static void edit_person_status_show( gchar *msg ) {
 
 static void edit_person_ok(GtkWidget *widget, gboolean *cancelled) {
        *cancelled = FALSE;
-fprintf(stderr, "edit_person_ok\n");
        if (prefs_common.addressbook_use_editaddress_dialog)
-       gtk_main_quit();
+               gtk_main_quit();
        else
                addressbook_edit_person_close( *cancelled );
 }
 
 static void edit_person_cancel(GtkWidget *widget, gboolean *cancelled) {
        *cancelled = TRUE;
-fprintf(stderr, "edit_person_cancel\n");
        if (prefs_common.addressbook_use_editaddress_dialog)
-       gtk_main_quit();
+               gtk_main_quit();
        else
                addressbook_edit_person_close( *cancelled );
 }
 
 static gint edit_person_delete_event(GtkWidget *widget, GdkEventAny *event, gboolean *cancelled) {
        *cancelled = TRUE;
-fprintf(stderr, "edit_person_delete_event\n");
        if (prefs_common.addressbook_use_editaddress_dialog)
-       gtk_main_quit();
+               gtk_main_quit();
        else
                addressbook_edit_person_close( *cancelled );
        return TRUE;
@@ -1223,7 +1220,6 @@ static void addressbook_edit_person_flush_transient( void )
        ItemPerson *person = current_person;
        EditAddressPostUpdateCallback callback = edit_person_close_post_update_cb;
 
-fprintf(stderr, "addressbook_edit_person_flush_transient\n");
        /* reset transient data */
        current_abf = NULL;
        current_person = NULL;
@@ -1231,17 +1227,13 @@ fprintf(stderr, "addressbook_edit_person_flush_transient\n");
        edit_person_close_post_update_cb = NULL;
 
        /* post action to perform on addressbook side */
-       if (callback) {
-fprintf(stderr, "-> callback %p\n", callback);
+       if (callback)
                callback( person );
-       }
 }
 
 void addressbook_edit_person_invalidate( AddressBookFile *abf, ItemFolder *parent_folder,
                                                                                 ItemPerson *person )
 {
-fprintf(stderr, "addressbook_edit_person_invalidate (arg: %p %p %p) (cur: %p %p %p)\n",
-abf, parent_folder, person, current_abf, current_parent_folder, current_person);
        if (current_abf == NULL &&
                current_person == NULL &&
                current_parent_folder == NULL)
@@ -1262,7 +1254,6 @@ gboolean addressbook_edit_person_close( gboolean cancelled )
        GList *listAttrib = NULL;
        gchar *cn = NULL;
 
-fprintf(stderr, "addressbook_edit_person_close\n");
        listEMail = edit_person_build_email_list();
        listAttrib = edit_person_build_attrib_list();
        if( cancelled ) {
@@ -1345,7 +1336,6 @@ ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent_fo
                                                                         gboolean get_focus) {
        static gboolean cancelled;
 
-fprintf(stderr, "addressbook_edit_person: start\n");
        /* set transient data */
        current_abf = abf;
        current_person = person;
@@ -1417,11 +1407,9 @@ fprintf(stderr, "addressbook_edit_person: start\n");
        gtk_main();
                gtk_widget_hide( personeditdlg.container );
 
-fprintf(stderr, "addressbook_edit_person: sync end\n");
                if (!addressbook_edit_person_close( cancelled ))
-               return NULL;
+                       return NULL;
        }
-fprintf(stderr, "addressbook_edit_person: async end\n");
 
        return person;
 }