2007-06-11 [paul] 2.9.2cvs54

	* src/prefs_logging.c
		rework log window length widgets
		and some sensitivity fixes

diff --git a/ChangeLog b/ChangeLog
index d0cea9b5eb02ea885c0ff98cc047e4b252b7d573..b4c52583cf93038c54441d6cc0a8c9c512f831b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-11 [paul]      2.9.2cvs54
+
+       * src/prefs_logging.c
+               rework log window length widgets
+               and some sensitivity fixes
+
 2007-06-11 [paul]      2.9.2cvs53
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index c1d1a557c95b65ba7bfa52ae23f6625cbaf6bdda..a2d85ced4045e92c380d8c59b02f81ba5a2fb6f8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2629,3 +2629,4 @@
 ( cvs diff -u -r 1.5.2.45 -r 1.5.2.46 src/gtk/pluginwindow.c;  ) > 2.9.2cvs51.patchset
 ( cvs diff -u -r 1.5.2.46 -r 1.5.2.47 src/gtk/pluginwindow.c;  ) > 2.9.2cvs52.patchset
 ( cvs diff -u -r 1.274.2.190 -r 1.274.2.191 src/mainwindow.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_logging.c;  ) > 2.9.2cvs53.patchset
+( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_logging.c;  ) > 2.9.2cvs54.patchset

diff --git a/configure.ac b/configure.ac
index ac8b131ae6f97dc949f26085520706d8fc47a4ac..064fce47d2ae69d190a15e830af44a7b4eb5444b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=53
+EXTRA_VERSION=54
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_logging.c b/src/prefs_logging.c
index 3f14b686b33fac63f5fe1cbf42de2fddf063b304..bc87501f27ec7124944d48c2dfbb81ee0b2e7194 100644 (file)
--- a/src/prefs_logging.c
+++ b/src/prefs_logging.c
@@ -72,7 +72,6 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *vbox_network_log;
        GtkWidget *hbox_clip_network_log;
        GtkWidget *checkbtn_clip_network_log;
-       GtkWidget *network_log_length_label;
        GtkWidget *spinbtn_network_log_length;
        GtkObject *spinbtn_network_log_length_adj;
        GtkTooltips *network_log_length_tooltip;
@@ -80,7 +79,6 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *vbox1_filtering_log;
        GtkWidget *hbox_clip_filtering_log;
        GtkWidget *checkbtn_clip_filtering_log;
-       GtkWidget *filtering_log_length_label;
        GtkWidget *spinbtn_filtering_log_length;
        GtkObject *spinbtn_filtering_log_length_adj;
        GtkTooltips *filtering_log_length_tooltip;
@@ -113,16 +111,12 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        /* Protocol log */
        vbox_network_log = gtkut_get_options_frame(vbox1, &frame_logging, _("Network log"));
 
-       PACK_CHECK_BUTTON (vbox_network_log, checkbtn_clip_network_log,
-                          _("Restrict the log size"));
        hbox_clip_network_log = gtk_hbox_new (FALSE, 8);
        gtk_container_add (GTK_CONTAINER (vbox_network_log), hbox_clip_network_log);
        gtk_widget_show (hbox_clip_network_log);
-       
-       network_log_length_label = gtk_label_new (_("Log window length"));
-       gtk_box_pack_start (GTK_BOX (hbox_clip_network_log), network_log_length_label,
-                           FALSE, TRUE, 0);
-       gtk_widget_show (GTK_WIDGET (network_log_length_label));
+
+       PACK_CHECK_BUTTON (hbox_clip_network_log, checkbtn_clip_network_log,
+                          _("Restrict the log window to"));
        
        network_log_length_tooltip = gtk_tooltips_new();
 
@@ -143,7 +137,6 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label);
        gtk_box_pack_start(GTK_BOX(hbox_clip_network_log), label, FALSE, FALSE, 0);
 
-       SET_TOGGLE_SENSITIVITY(checkbtn_clip_network_log, network_log_length_label);
        SET_TOGGLE_SENSITIVITY(checkbtn_clip_network_log, spinbtn_network_log_length);
        SET_TOGGLE_SENSITIVITY(checkbtn_clip_network_log, label);
 
@@ -200,11 +193,7 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_container_add (GTK_CONTAINER (vbox2_filtering_log), hbox_filtering_log_post_proc);
        gtk_widget_show (hbox_filtering_log_post_proc);
 
-       SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, checkbtn_filtering_log_inc);
-       SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, checkbtn_filtering_log_manual);
-       SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, checkbtn_filtering_log_folder_proc);
-       SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, checkbtn_filtering_log_pre_proc);
-       SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, checkbtn_filtering_log_post_proc);
+       SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, frame_filtering_log);
 
        hbox_filtering_log_level = gtk_hbox_new (FALSE, 8);
        gtk_widget_show (hbox_filtering_log_level);
@@ -241,16 +230,11 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
                                "impact on performance."),
                             NULL);
 
-       PACK_CHECK_BUTTON (vbox1_filtering_log, checkbtn_clip_filtering_log,
-                          _("Restrict the log size"));
        hbox_clip_filtering_log = gtk_hbox_new (FALSE, 8);
        gtk_container_add (GTK_CONTAINER (vbox1_filtering_log), hbox_clip_filtering_log);
        gtk_widget_show (hbox_clip_filtering_log);
-       
-       filtering_log_length_label = gtk_label_new (_("Log window length"));
-       gtk_box_pack_start (GTK_BOX (hbox_clip_filtering_log), filtering_log_length_label,
-                           FALSE, TRUE, 0);
-       gtk_widget_show (GTK_WIDGET (filtering_log_length_label));
+       PACK_CHECK_BUTTON (hbox_clip_filtering_log, checkbtn_clip_filtering_log,
+                          _("Restrict the log window to"));
        
        filtering_log_length_tooltip = gtk_tooltips_new();
 
@@ -271,10 +255,9 @@ static void prefs_logging_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label);
        gtk_box_pack_start(GTK_BOX(hbox_clip_filtering_log), label, FALSE, FALSE, 0);
 
-       SET_TOGGLE_SENSITIVITY(checkbtn_clip_filtering_log, filtering_log_length_label);
        SET_TOGGLE_SENSITIVITY(checkbtn_clip_filtering_log, spinbtn_filtering_log_length);
        SET_TOGGLE_SENSITIVITY(checkbtn_clip_filtering_log, label);
-
+       SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, hbox_clip_filtering_log);
        SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, optmenu_filtering_log_level);
        SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, checkbtn_clip_filtering_log);
        SET_TOGGLE_SENSITIVITY(checkbtn_filtering_log, label_filtering_log_level);