2005-11-04 [wwp] 1.9.99cvs11

	* src/gtk/about.c
		don't wrap or translate URIs, and a bit text format cleanup

diff --git a/ChangeLog b/ChangeLog
index 5cffe7b6306490adc29a83daffeebe2b63d255b6..2815778d4f2d8a5737d22163c7e18bf27c8289bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-04 [wwp]       1.9.99cvs11
+
+       * src/gtk/about.c
+               don't wrap or translate URIs, and a bit text format cleanup
+

 2005-11-04 [wwp]       1.9.99cvs10
 
        * src/gtk/about.c
 2005-11-04 [wwp]       1.9.99cvs10
 
        * src/gtk/about.c

diff --git a/PATCHSETS b/PATCHSETS
index 847af3fd27584a9b0afab85cf722a91c48255905..b8c940c8d53503e7075bbdf1f176a25dfafbb389 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -977,3 +977,4 @@
 ( cvs diff -u -r 1.654.2.1019 -r 1.654.2.1020 configure.ac;  cvs diff -u -r 1.9.2.8 -r 1.9.2.9 src/common/ssl.c;  ) > 1.9.99cvs8.patchset
 ( cvs diff -u -r 1.9.2.9 -r 1.9.2.10 src/common/ssl.c;  ) > 1.9.99cvs9.patchset
 ( cvs diff -u -r 1.4.2.22 -r 1.4.2.23 src/gtk/about.c;  ) > 1.9.99cvs10.patchset
 ( cvs diff -u -r 1.654.2.1019 -r 1.654.2.1020 configure.ac;  cvs diff -u -r 1.9.2.8 -r 1.9.2.9 src/common/ssl.c;  ) > 1.9.99cvs8.patchset
 ( cvs diff -u -r 1.9.2.9 -r 1.9.2.10 src/common/ssl.c;  ) > 1.9.99cvs9.patchset
 ( cvs diff -u -r 1.4.2.22 -r 1.4.2.23 src/gtk/about.c;  ) > 1.9.99cvs10.patchset

+( cvs diff -u -r 1.4.2.23 -r 1.4.2.24 src/gtk/about.c;  ) > 1.9.99cvs11.patchset

diff --git a/configure.ac b/configure.ac
index 5f1f7b7ab315c2328c041e5137002b506a510e73..064ef5ea16409609bf0ab42ef13c0f833271af43 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=99
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=99
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=10
+EXTRA_VERSION=11

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/about.c b/src/gtk/about.c
index 650121da1395b1e24128115cfe2106f4d69a7466..b59d91b4aaddb42c9da79f834d211777d576da9d 100644 (file)
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -258,23 +258,23 @@ static void about_create(void)
        gtk_text_buffer_create_tag(buffer, "link",
                                "foreground-gdk", &uri_color,
                                "wrap-mode", GTK_WRAP_NONE,
        gtk_text_buffer_create_tag(buffer, "link",
                                "foreground-gdk", &uri_color,
                                "wrap-mode", GTK_WRAP_NONE,

-                               "wrap-mode-set", TRUE,

                                NULL);
 
                                NULL);
 

-       gtk_text_buffer_insert(buffer, &iter, _("Sylpheed-Claws is a lightweight, fast and "
+       gtk_text_buffer_insert(buffer, &iter, _(
+                               "Sylpheed-Claws is a lightweight, fast and "

                                "highly-configurable e-mail client.\n\n"
                                "For further information visit the Sylpheed-"
                                "highly-configurable e-mail client.\n\n"
                                "For further information visit the Sylpheed-"

-                               "Claws website, "), -1);
+                               "Claws website:\n"), -1);

        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, HOMEPAGE_URI, -1,
                                "link", NULL);
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, HOMEPAGE_URI, -1,
                                "link", NULL);

-       gtk_text_buffer_insert(buffer, &iter, _(".\n\n"
+       gtk_text_buffer_insert(buffer, &iter, _("\n\n"

                                "Sylpheed-Claws is free software released "
                                "under the GPL license. If you wish to donate "
                                "to the Sylpheed-Claws project you can do "
                                "Sylpheed-Claws is free software released "
                                "under the GPL license. If you wish to donate "
                                "to the Sylpheed-Claws project you can do "

-                               "so at "), -1);
+                               "so at:\n"), -1);

        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, DONATE_URI, -1,
                                "link", NULL);
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, DONATE_URI, -1,
                                "link", NULL);

-       gtk_text_buffer_insert(buffer, &iter, _(".\n\n"), -1);
+       gtk_text_buffer_insert(buffer, &iter, _("\n"), -1);

 
        gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
                                scrolledwin,
 
        gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
                                scrolledwin,


@@ -470,9 +470,9 @@ static void about_create(void)
        gtk_text_buffer_insert(buffer, &iter,
                _("This product includes software developed by the OpenSSL Project "
                  "for use in the OpenSSL Toolkit ("), -1);
        gtk_text_buffer_insert(buffer, &iter,
                _("This product includes software developed by the OpenSSL Project "
                  "for use in the OpenSSL Toolkit ("), -1);

-       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, _("http://www.openssl.org/"), -1,
+       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, "http://www.openssl.org/", -1,

                        "link", NULL);
                        "link", NULL);

-       gtk_text_buffer_insert(buffer, &iter, _(").\n\n"), -1);
+       gtk_text_buffer_insert(buffer, &iter, _(").\n"), -1);

 #endif
 
        gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
 #endif
 
        gtk_notebook_append_page(GTK_NOTEBOOK(notebook),