reverted previous patch because of potential errors
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Sat, 12 May 2001 14:26:43 +0000 (14:26 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Sat, 12 May 2001 14:26:43 +0000 (14:26 +0000)
ChangeLog.claws
src/inc.c
src/prefs_common.c
src/prefs_common.h

index f0439a3..918f71c 100644 (file)
@@ -1,5 +1,7 @@
 2001-05-12 [alfons]
 
+       * reverted previous patch because of potential errors 
+
        0.4.67claws2
        
        * src/inc.c, src/prefs_common.c, src/prefs_common.h: 
index 1e86092..6f3764e 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -263,20 +263,16 @@ static IncProgressDialog *inc_progress_dialog_create(void)
                           GTK_SIGNAL_FUNC(gtk_true), NULL);
        manage_window_set_transient(GTK_WINDOW(progress->window));
 
-
        progress_dialog_set_value(progress, 0.0);
 
-       if (prefs_common.show_retrieve_dialog)
-        {
-         gtk_widget_show(progress->window);
+       gtk_widget_show(progress->window);
 
-         PIXMAP_CREATE(progress->clist, okxpm, okxpmmask, complete_xpm);
-         PIXMAP_CREATE(progress->clist,
+       PIXMAP_CREATE(progress->clist, okxpm, okxpmmask, complete_xpm);
+       PIXMAP_CREATE(progress->clist,
                      currentxpm, currentxpmmask, continue_xpm);
-         PIXMAP_CREATE(progress->clist, errorxpm, errorxpmmask, error_xpm);
+       PIXMAP_CREATE(progress->clist, errorxpm, errorxpmmask, error_xpm);
 
-         gtk_widget_show_now(progress->window);
-       }
+       gtk_widget_show_now(progress->window);
 
        dialog->dialog = progress;
        dialog->queue_list = NULL;
index ec15af2..d5873e8 100644 (file)
@@ -149,7 +149,6 @@ static struct Interface {
        GtkWidget *checkbtn_warnqueued;
        GtkWidget *checkbtn_returnreceipt;
        GtkWidget *checkbtn_addaddrbyclick;
-       GtkWidget *checkbtn_retrievedialog;
 } interface;
 
 static struct Other {
@@ -483,9 +482,6 @@ static PrefParam param[] = {
        {"open_unread_on_enter", "FALSE", &prefs_common.open_unread_on_enter,
         P_BOOL, &interface.checkbtn_openunread,
         prefs_set_data_from_toggle, prefs_set_toggle},
-       {"show_retrieve_dialog", "FALSE", &prefs_common.show_retrieve_dialog,
-        P_BOOL, &interface.checkbtn_retrievedialog,
-        prefs_set_data_from_toggle, prefs_set_toggle},
        {"open_inbox_on_inc", "TRUE", &prefs_common.open_inbox_on_inc,
         P_BOOL, &interface.checkbtn_openinbox,
         prefs_set_data_from_toggle, prefs_set_toggle},
@@ -1797,7 +1793,6 @@ static void prefs_interface_create(void)
        GtkWidget *checkbtn_cleanonexit;
        GtkWidget *checkbtn_askonclean;
        GtkWidget *checkbtn_warnqueued;
-       GtkWidget *checkbtn_retrievedialog;
        GtkWidget *checkbtn_returnreceipt;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
@@ -1819,10 +1814,6 @@ static void prefs_interface_create(void)
                (vbox2, checkbtn_openunread,
                 _("Open first unread message when entering a folder"));
 
-       PACK_CHECK_BUTTON
-               (vbox2, checkbtn_retrievedialog,
-                _("Display dialog when retrieving mail"));
-
        PACK_CHECK_BUTTON
                (vbox2, checkbtn_openinbox,
                 _("Go to inbox after receiving new mail"));
@@ -1885,7 +1876,6 @@ static void prefs_interface_create(void)
        interface.checkbtn_askonclean     = checkbtn_askonclean;
        interface.checkbtn_warnqueued     = checkbtn_warnqueued;
        interface.checkbtn_returnreceipt  = checkbtn_returnreceipt;
-       interface.checkbtn_retrievedialog = checkbtn_retrievedialog;
 }
 
 static void prefs_other_create(void)
index 1c98157..3f341a4 100644 (file)
@@ -81,7 +81,6 @@ struct _PrefsCommon
 
        gboolean show_mark;
        gboolean show_unread;
-       gboolean show_retrieve_dialog;
        gboolean show_mime;
        gboolean show_number;
        gboolean show_score;