2007-12-18 [paul] 3.2.0cvs6

	* src/prefs_logging.c
		use 'disk' instead of 'disc'

diff --git a/ChangeLog b/ChangeLog
index 3920c62639da8e3c3418a1e7a1b127ca54bc2d8b..562b7d94baf8ed4a4b06dfb610d3d30c9e1cc25a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-18 [paul]      3.2.0cvs6
+
+       * src/prefs_logging.c
+               use 'disk' instead of 'disc'
+
 2007-12-18 [paul]      3.2.0cvs5
 
        * po/en_GB.po

diff --git a/PATCHSETS b/PATCHSETS
index 3b294d91c42e98e2d48dce5ef91a0dae413139a0..0265c28a83ec3872ed92a0d6e834084489fb38fa 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3142,3 +3142,4 @@
 ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/prefs_logging.c;  ) > 3.2.0cvs3.patchset
 ( cvs diff -u -r 1.207.2.193 -r 1.207.2.194 src/folderview.c;  cvs diff -u -r 1.8.2.26 -r 1.8.2.27 src/headerview.c;  cvs diff -u -r 1.204.2.158 -r 1.204.2.159 src/prefs_common.c;  cvs diff -u -r 1.103.2.102 -r 1.103.2.103 src/prefs_common.h;  cvs diff -u -r 1.4.2.21 -r 1.4.2.22 src/prefs_fonts.c;  cvs diff -u -r 1.395.2.345 -r 1.395.2.346 src/summaryview.c;  cvs diff -u -r 1.96.2.193 -r 1.96.2.194 src/textview.c;  cvs diff -u -r 1.1.2.64 -r 1.1.2.65 src/wizard.c;  cvs diff -u -r 1.9.2.44 -r 1.9.2.45 src/common/defs.h;  cvs diff -u -r 1.5.2.74 -r 1.5.2.75 src/gtk/gtkutils.c;  ) > 3.2.0cvs4.patchset
 ( cvs diff -u -r 1.12.2.15 -r 1.12.2.16 po/en_GB.po;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/addrcustomattr.c;  cvs diff -u -r 1.14.2.47 -r 1.14.2.48 src/editaddress.c;  cvs diff -u -r 1.1.4.46 -r 1.1.4.47 src/prefs_filtering_action.c;  cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/prefs_filtering_action.h;  ) > 3.2.0cvs5.patchset
+( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/prefs_logging.c;  ) > 3.2.0cvs6.patchset

diff --git a/configure.ac b/configure.ac
index 4e2b9ab0a3be9ca5c8f09ded638265c60f32ce85..c7e16baf4052ea7c430f3886ebcfc49a9aec2619 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_logging.c b/src/prefs_logging.c
index f37fe1933d9a38b5f5521fb7ae109c951c7a4eb8..3dd8655a0c00698f05f6acbba9ba1560dc45d0db 100644 (file)
--- a/src/prefs_logging.c
+++ b/src/prefs_logging.c
@@ -120,8 +120,8 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkListStore *menu;
        GtkTreeIter iter;
        GtkTooltips *filtering_log_level_tooltip;
-       GtkWidget *frame_disc_log;
-       GtkWidget *vbox_disc_log;
+       GtkWidget *frame_disk_log;
+       GtkWidget *vbox_disk_log;
        GtkWidget *label;
        GtkWidget *hbox;
        GtkWidget *checkbtn_log_standard;
@@ -287,24 +287,24 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, label_filtering_log_level);
 
        /* disk log */
-       vbox_disc_log = gtkut_get_options_frame(vbox1, &frame_disc_log, _("Disc log"));
+       vbox_disk_log = gtkut_get_options_frame(vbox1, &frame_disk_log, _("Disk log"));
 
-       label = gtk_label_new(_("Write the following information to disc..."));
+       label = gtk_label_new(_("Write the following information to disk..."));
        gtk_widget_show(label);
        hbox = gtk_hbox_new (FALSE, 8);
-       gtk_container_add (GTK_CONTAINER (vbox_disc_log), hbox);
+       gtk_container_add (GTK_CONTAINER (vbox_disk_log), hbox);
        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
        gtk_widget_show (hbox);
 
        hbox_checkbtn = prefs_logging_create_check_buttons(&checkbtn_log_warning,
                                _("Warning messages"), &checkbtn_log_standard,
                                _("Network protocol messages"));
-       gtk_box_pack_start(GTK_BOX(vbox_disc_log), hbox_checkbtn, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox_disk_log), hbox_checkbtn, FALSE, FALSE, 0);
 
        hbox_checkbtn = prefs_logging_create_check_buttons(&checkbtn_log_error, 
                                _("Error messages"), &checkbtn_log_status,
                                _("Status messages for filtering/processing log"));
-       gtk_box_pack_start(GTK_BOX(vbox_disc_log), hbox_checkbtn, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox_disk_log), hbox_checkbtn, FALSE, FALSE, 0);
        
        log_size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
        gtk_size_group_add_widget(log_size_group, checkbtn_log_warning);