remove superfluous undo/redo debug_prints; clear statusbar on LOCAL incorporation
authorPaul Mangan <paul@claws-mail.org>
Tue, 20 Jan 2004 08:34:01 +0000 (08:34 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 20 Jan 2004 08:34:01 +0000 (08:34 +0000)
ChangeLog.claws
configure.ac
src/compose.c
src/inc.c
src/undo.c

index ff879ac..22a80e5 100644 (file)
@@ -1,4 +1,13 @@
-2004-01-20 [paul]      0.9.8clawws35
+2004-01-20 [paul]      0.9.8claws36
+
+       * src/compose.c
+         src/undo.c
+               remove superfluous debug_print's
+               
+       * src/inc.c
+               clear the statusbar after LOCAL incorporation
+
+2004-01-20 [paul]      0.9.8claws35
 
        * sync with 0.9.8cvs3
                see ChangeLog 2004-01-20
index 8dadb46..40e3a9b 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=35
+EXTRA_VERSION=36
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
index 2c33865..0d37d83 100644 (file)
@@ -6181,14 +6181,11 @@ static void compose_undo_state_changed(UndoMain *undostruct, gint undo_state,
 
        g_return_if_fail(widget != NULL);
 
-       debug_print("Set_undo.  UNDO:%i  REDO:%i\n", undo_state, redo_state);
-
        ifactory = gtk_item_factory_from_widget(widget);
 
        switch (undo_state) {
        case UNDO_STATE_TRUE:
                if (!undostruct->undo_state) {
-                       debug_print ("Set_undo - Testpoint\n");
                        undostruct->undo_state = TRUE;
                        menu_set_sensitive(ifactory, "/Edit/Undo", TRUE);
                }
@@ -6568,7 +6565,7 @@ static void compose_close_cb(gpointer data, guint action, GtkWidget *widget)
 {
        Compose *compose = (Compose *)data;
        AlertValue val;
-    
+
        if (compose->exteditor_tag != -1) {
                if (!compose_ext_editor_kill(compose))
                        return;
index eee6079..d299130 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -1125,8 +1125,12 @@ static gint inc_spool_account(PrefsAccount *account)
        else 
                mbox = g_strconcat(account->local_mbox,
                                   G_DIR_SEPARATOR_S, logname, NULL);
+       
        result = get_spool(inbox, mbox);
        g_free(mbox);
+       
+       statusbar_pop_all();
+       
        return result;
 }
 
index f14c9e4..4d7f40f 100644 (file)
@@ -182,7 +182,6 @@ static void undo_check_size(UndoMain *undostruct)
                undostruct->undo = g_list_remove(undostruct->undo, last_undo);
                undo_object_free(last_undo);
        }
-       debug_print("g_list_length(undostruct->undo): %d\n", length);
 }
 
 /**
@@ -280,7 +279,6 @@ static gint undo_merge(GList *list, guint start_pos, guint end_pos,
        } else
                debug_print("Unknown action [%i] inside undo merge encountered", action);
 
-       debug_print("Merged: %s\n", text);
        return TRUE;
 }
 
@@ -303,8 +301,6 @@ static void undo_add(const gchar *text,
 {
        UndoInfo *undoinfo;
 
-       debug_print("undo_add(%i)*%s*\n", strlen (text), text);
-
        g_return_if_fail(text != NULL);
        g_return_if_fail(end_pos >= start_pos);
 
@@ -330,8 +326,6 @@ static void undo_add(const gchar *text,
 
        undo_check_size(undostruct);
 
-       debug_print("New: %s Action: %d Paste: %d\n", text, action, undostruct->paste);
-
        undoinfo = undo_object_new(g_strdup(text), start_pos, end_pos, action,
                                   GTK_ADJUSTMENT(GTK_STEXT(undostruct->text)->vadj)->value);
 
@@ -387,17 +381,14 @@ void undo_undo(UndoMain *undostruct)
        case UNDO_ACTION_DELETE:
                gtk_stext_set_point(GTK_STEXT(undostruct->text), undoinfo->start_pos);
                gtk_stext_insert(GTK_STEXT(undostruct->text), NULL, NULL, NULL, undoinfo->text, -1);
-               debug_print("UNDO_ACTION_DELETE %s\n", undoinfo->text);
                break;
        case UNDO_ACTION_INSERT:
                gtk_stext_set_point(GTK_STEXT(undostruct->text), undoinfo->end_pos);
                gtk_stext_backward_delete(GTK_STEXT(undostruct->text), undoinfo->end_pos-undoinfo->start_pos);
-               debug_print("UNDO_ACTION_INSERT %d\n", undoinfo->end_pos-undoinfo->start_pos);
                break;
        case UNDO_ACTION_REPLACE_INSERT:
                gtk_stext_set_point(GTK_STEXT(undostruct->text), undoinfo->end_pos);
                gtk_stext_backward_delete(GTK_STEXT(undostruct->text), undoinfo->end_pos-undoinfo->start_pos);
-               debug_print("UNDO_ACTION_REPLACE %s\n", undoinfo->text);
                /* "pull" another data structure from the list */
                undoinfo = (UndoInfo *)undostruct->undo->data;
                g_return_if_fail(undoinfo != NULL);
@@ -406,7 +397,6 @@ void undo_undo(UndoMain *undostruct)
                g_return_if_fail(undoinfo->action == UNDO_ACTION_REPLACE_DELETE);
                gtk_stext_set_point(GTK_STEXT(undostruct->text), undoinfo->start_pos);
                gtk_stext_insert(GTK_STEXT(undostruct->text), NULL, NULL, NULL, undoinfo->text, -1);
-               debug_print("UNDO_ACTION_REPLACE %s\n", undoinfo->text);
                break;
        case UNDO_ACTION_REPLACE_DELETE:
                g_warning("This should not happen. UNDO_REPLACE_DELETE");
@@ -464,7 +454,6 @@ void undo_redo(UndoMain *undostruct)
                                   redoinfo->start_pos);
                gtk_stext_insert(GTK_STEXT(undostruct->text), NULL, NULL, 
                                NULL, redoinfo->text, -1);
-               debug_print("UNDO_ACTION_DELETE %s\n",redoinfo->text);
                break;
        case UNDO_ACTION_DELETE:
                gtk_stext_set_point(GTK_STEXT(undostruct->text),
@@ -472,8 +461,6 @@ void undo_redo(UndoMain *undostruct)
                gtk_stext_backward_delete
                        (GTK_STEXT(undostruct->text), 
                         redoinfo->end_pos - redoinfo->start_pos);
-               debug_print("UNDO_ACTION_INSERT %d\n", 
-                           redoinfo->end_pos-redoinfo->start_pos);
                break;
        case UNDO_ACTION_REPLACE_DELETE:
                gtk_stext_set_point(GTK_STEXT(undostruct->text),
@@ -554,11 +541,9 @@ void undo_paste_clipboard_cb(GtkEditable *editable, UndoMain *undostruct)
 {
        if (editable->clipboard_text == NULL) return;
 
-       debug_print("before Paste: %d\n", undostruct->paste);
        if (prefs_common.undolevels > 0)
                if (undo_get_selection(editable, NULL, NULL))
                        undostruct->paste = TRUE;
-       debug_print("after Paste: %d\n", undostruct->paste);
 }
 
 /**