commit fa543cd9cc1102910b08a5b2b4046c89932aa7a1
parent 68f928c0313464b663ca684e1455911a25de075c
Author: Paul Mangan <paul@claws-mail.org>
Date: Sat, 21 Jun 2008 07:05:09 +0000
2008-06-21 [paul] 3.4.0cvs101
* manual/advanced.xml
* manual/es/advanced.xml
fix build warning: <emphasis> cannot be contained
within <filename>
* src/gtk/about.c
fix non-clickable link on License page and drop
the containing < > symbols to match other links
Diffstat:
6 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-21 [paul] 3.4.0cvs101
+
+ * manual/advanced.xml
+ * manual/es/advanced.xml
+ fix build warning: <emphasis> cannot be contained
+ within <filename>
+ * src/gtk/about.c
+ fix non-clickable link on License page and drop
+ the containing < > symbols to match other links
+
2008-06-20 [mones] 3.4.0cvs100
* manual/advanced.xml
diff --git a/PATCHSETS b/PATCHSETS
@@ -3396,3 +3396,4 @@
( cvs diff -u -r 1.1.2.57 -r 1.1.2.58 src/imap_gtk.c; cvs diff -u -r 1.2.2.31 -r 1.2.2.32 src/mh_gtk.c; cvs diff -u -r 1.2.2.28 -r 1.2.2.29 src/gtk/inputdialog.c; ) > 3.4.0cvs98.patchset
( cvs diff -u -r 1.382.2.453 -r 1.382.2.454 src/compose.c; ) > 3.4.0cvs99.patchset
( cvs diff -u -r 1.1.2.49 -r 1.1.2.50 manual/advanced.xml; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 manual/es/advanced.xml; ) > 3.4.0cvs100.patchset
+( cvs diff -u -r 1.1.2.50 -r 1.1.2.51 manual/advanced.xml; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 manual/es/advanced.xml; cvs diff -u -r 1.4.2.62 -r 1.4.2.63 src/gtk/about.c; ) > 3.4.0cvs101.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=100
+EXTRA_VERSION=101
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/manual/advanced.xml b/manual/advanced.xml
@@ -809,8 +809,8 @@
accounts are taken from the <filename>face</filename> and/or
<filename>xface</filename> files respectively. In a similar
manner, Face and/or X-Face headers for a specific account can
- be provided by <filename>face.<emphasis>accountname</emphasis></filename>
- and/or <filename>xface.<emphasis>accountname</emphasis></filename>,
+ be provided by <filename>face.</filename><emphasis>accountname</emphasis>
+ and/or <filename>xface.</filename><emphasis>accountname</emphasis>,
where <emphasis>accountname</emphasis> is the name of the account you
want this header to be associated with.
</para>
diff --git a/manual/es/advanced.xml b/manual/es/advanced.xml
@@ -833,8 +833,8 @@
de los ficheros <filename>face</filename> y/o <filename>xface</filename>
respectivamente. De manera similar, si existen, las Face y/o X-Face
para una cuenta concreta se obtienen de
- <filename>face.<emphasis>nombredecuenta</emphasis></filename> y/o
- <filename>xface.<emphasis>nombredecuenta</emphasis></filename>, donde
+ <filename>face.</filename><emphasis>nombredecuenta</emphasis> y/o
+ <filename>xface.</filename><emphasis>nombredecuenta</emphasis>, donde
<emphasis>nombredecuenta</emphasis> es el nombre de la cuenta con la
que desea asociar esta cabecera.
</para>
diff --git a/src/gtk/about.c b/src/gtk/about.c
@@ -598,11 +598,11 @@ static GtkWidget *about_create_child_page_license(void)
gtk_text_buffer_insert(buffer, &iter,
_("You should have received a copy of the GNU General Public License "
- "along with this program. If not, see <"), -1);
+ "along with this program. If not, see "), -1);
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
"http://www.gnu.org/licenses/", -1,
"link", NULL);
- gtk_text_buffer_insert(buffer, &iter, _(">. \n\n"), -1);
+ gtk_text_buffer_insert(buffer, &iter, ".\n\n", -1);
#ifdef USE_OPENSSL
gtk_text_buffer_insert(buffer, &iter,
_("This product includes software developed by the OpenSSL Project "
@@ -610,6 +610,7 @@ static GtkWidget *about_create_child_page_license(void)
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, OPENSSL_URI, -1,
"link", NULL);
gtk_text_buffer_insert(buffer, &iter, _(").\n"), -1);
+#endif
g_signal_connect(G_OBJECT(tag), "event",
G_CALLBACK(about_textview_uri_clicked), text);
@@ -617,7 +618,6 @@ static GtkWidget *about_create_child_page_license(void)
G_CALLBACK(about_textview_motion_notify), text);
g_signal_connect(G_OBJECT(text), "leave-notify-event",
G_CALLBACK(about_textview_leave_notify), text);
-#endif
return scrolledwin;
}
