2006-02-01 [paul] 2.0.0cvs5

	* src/jpilot.c
		fix crash on creating jpilot address book
		Thanks to Colin
	* src/prefs_summaries.c
	* src/prefs_wrapping.c
	* src/gtk/icon_legend.c
	* src/gtk/quicksearch.c
		string fixes and additions

diff --git a/ChangeLog b/ChangeLog
index 8ff0808702b18844b466979fef578bc58567fb66..6aa5fea29670805b7eda9f06bffee77a181639f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-01 [paul]      2.0.0cvs5
+
+       * src/jpilot.c
+               fix crash on creating jpilot address book
+               Thanks to Colin
+       * src/prefs_summaries.c
+       * src/prefs_wrapping.c
+       * src/gtk/icon_legend.c
+       * src/gtk/quicksearch.c
+               string fixes and additions
+

 2006-02-01 [paul]      2.0.0cvs4
 
        * src/compose.c
 2006-02-01 [paul]      2.0.0cvs4
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 9354105e75068bcc4623848437fe732943e1c90d..5a35b997f8a10da337297b60530e1a760bf81848 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1188,3 +1188,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/icon_legend.c;  ) > 2.0.0cvs2.patchset
 ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.382.2.230 -r 1.382.2.231 src/compose.c;  ) > 2.0.0cvs3.patchset
 ( cvs diff -u -r 1.382.2.231 -r 1.382.2.232 src/compose.c;  cvs diff -u -r 1.274.2.93 -r 1.274.2.94 src/mainwindow.c;  cvs diff -u -r 1.94.2.75 -r 1.94.2.76 src/messageview.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_send.c;  ) > 2.0.0cvs4.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/icon_legend.c;  ) > 2.0.0cvs2.patchset
 ( cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.382.2.230 -r 1.382.2.231 src/compose.c;  ) > 2.0.0cvs3.patchset
 ( cvs diff -u -r 1.382.2.231 -r 1.382.2.232 src/compose.c;  cvs diff -u -r 1.274.2.93 -r 1.274.2.94 src/mainwindow.c;  cvs diff -u -r 1.94.2.75 -r 1.94.2.76 src/messageview.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_send.c;  ) > 2.0.0cvs4.patchset

+( cvs diff -u -r 1.18.2.15 -r 1.18.2.16 src/jpilot.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_summaries.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/prefs_wrapping.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/icon_legend.c;  cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/gtk/quicksearch.c;  ) > 2.0.0cvs5.patchset

diff --git a/configure.ac b/configure.ac
index 321b7e36923ca8787f5e1304ed2e154f27f2640e..90ac8f111b9e4d2919732fa0b10ec053f227e53a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=4
+EXTRA_VERSION=5

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c
index a8870853015ff03daf73429f0c84d951079625e0..0e792938fa62e1c2d005e2393225f6fc39bbca2c 100644 (file)
--- a/src/gtk/icon_legend.c
+++ b/src/gtk/icon_legend.c
@@ -123,7 +123,7 @@ static void legend_create(void)
        gtk_widget_show(hbox);
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
        gtk_widget_show(hbox);
        gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 

-       label = gtk_label_new(_("<span weight=\"bold\">The following icons are used to show the status of a message:</span>"));
+       label = gtk_label_new(_("<span weight=\"bold\">The following icons are used to show the status of messages and folders:</span>"));

        gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_widget_show(label);
        gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_widget_show(label);

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 5ea7f58cc767ece7f15b68e023be6f20d8b402e9..246a7a84335b6036c7899196a90260576d19797a 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -444,7 +444,7 @@ QuickSearch *quicksearch_new()
        search_cond_expr_tip = gtk_tooltips_new();
        gtk_tooltips_set_tip(GTK_TOOLTIPS(search_cond_expr_tip),
                             search_condition_expression,
        search_cond_expr_tip = gtk_tooltips_new();
        gtk_tooltips_set_tip(GTK_TOOLTIPS(search_cond_expr_tip),
                             search_condition_expression,

-                            _("Quick search: edit filtering condition"), NULL);
+                            _("Edit search criteria"), NULL);

        gtk_widget_show(search_condition_expression);
 
        search_description = gtk_button_new_with_label(_(" Extended Symbols... "));
        gtk_widget_show(search_condition_expression);
 
        search_description = gtk_button_new_with_label(_(" Extended Symbols... "));

diff --git a/src/jpilot.c b/src/jpilot.c
index 367c4e133bec39a53fd5ff3552b0abb4b9b47aaa..1762045acd4a7a6591157ad30e90515e4e1e2dac 100644 (file)
--- a/src/jpilot.c
+++ b/src/jpilot.c
@@ -1257,10 +1257,9 @@ static void jpilot_load_address(
                        addritem_free_item_person( person );
                        person = NULL;
                }
                        addritem_free_item_person( person );
                        person = NULL;
                }

+               /* Free up pointer allocated inside address */
+               free_Address( & addr );

        }
        }

-
-       /* Free up pointer allocated inside address */
-       free_Address( & addr );

 }
 
 /**
 }
 
 /**

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index 6203cb3e5d6ff1afe0c06ca72122e85be14c0530..89497320d8bfeaa603dbc748455d2697c12f7bbb 100644 (file)
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -730,6 +730,7 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *label_datefmt;
        GtkWidget *button_datefmt;
        GtkWidget *entry_datefmt;
        GtkWidget *label_datefmt;
        GtkWidget *button_datefmt;
        GtkWidget *entry_datefmt;

+       GtkTooltips *tip_datefmt;

        GtkWidget *hbox_dispitem;
        GtkWidget *frame_dispitem;
        GtkWidget *button_dispitem;
        GtkWidget *hbox_dispitem;
        GtkWidget *frame_dispitem;
        GtkWidget *button_dispitem;


@@ -820,6 +821,10 @@ void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_box_pack_start (GTK_BOX (hbox1), button_datefmt, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (button_datefmt), "clicked",
                          G_CALLBACK (date_format_create), NULL);
        gtk_box_pack_start (GTK_BOX (hbox1), button_datefmt, FALSE, FALSE, 0);
        g_signal_connect (G_OBJECT (button_datefmt), "clicked",
                          G_CALLBACK (date_format_create), NULL);

+       tip_datefmt = gtk_tooltips_new();
+       gtk_tooltips_set_tip(GTK_TOOLTIPS(tip_datefmt),
+                            button_datefmt,
+                            _("Date format help"), NULL);

 
        PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW);
 
 
        PACK_VSPACER(vbox2, vbox3, VSPACING_NARROW);
 

diff --git a/src/prefs_wrapping.c b/src/prefs_wrapping.c
index 31a61555c7a215e87c118abf5c280445875fbfc7..efbc1df2bd5eb1cc893346e1faf09da54220d144 100644 (file)
--- a/src/prefs_wrapping.c
+++ b/src/prefs_wrapping.c
@@ -74,7 +74,7 @@ void prefs_wrapping_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 
        gtk_widget_show (vbox2);
        gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0);
 

-       PACK_CHECK_BUTTON (vbox2, checkbtn_autowrap, _("Wrap on input"));
+       PACK_CHECK_BUTTON (vbox2, checkbtn_autowrap, _("Auto wrapping"));

        PACK_CHECK_BUTTON (vbox2, checkbtn_wrapquote, _("Wrap quotation"));
        PACK_CHECK_BUTTON (vbox2, checkbtn_wrappastes, _("Wrap pasted text"));
 
        PACK_CHECK_BUTTON (vbox2, checkbtn_wrapquote, _("Wrap quotation"));
        PACK_CHECK_BUTTON (vbox2, checkbtn_wrappastes, _("Wrap pasted text"));