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

diff --git a/ChangeLog b/ChangeLog
index 679e619455e6684ffe3bff3c5660c4e39c569337..9be83dae09bb745ddefd8086a1e295660ab54cf6 100644 (file)
--- 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
 2008-06-20 [mones]     3.4.0cvs100
 
        * manual/advanced.xml

diff --git a/PATCHSETS b/PATCHSETS
index d92575441f3d218e8d089ba602c7954c776e1e25..b64a55a04d3f4b124c8e4defd22a17e371ab8953 100644 (file)
--- 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.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
index be1b376fde7d8d9585d91332ea1d7764bb903331..1d5c848f92b42fe0c484dbbf589d57d23e5c3bc2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=100
+EXTRA_VERSION=101

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/manual/advanced.xml b/manual/advanced.xml
index b958d3c9c5da6e66a5ba692644d28eacd8154f8b..d0018cbbbbd504b99dab4d6c077d39caff766703 100644 (file)
--- 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
        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>
        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
index 32fbdb42d76af64b29d2d3350121fdc178c5359c..15c3b1f0b878dcc88290ad7da91620b77bf913e1 100644 (file)
--- 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
        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>
        <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
index 9d0cbf29232612d30d46129377e38db56291c6db..e22a5f2770eec4c403818740dcccba3e018f6ed5 100644 (file)
--- 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 "
 
        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_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 "
 #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);
        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);
 
        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);
                         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;
 }
 
        return scrolledwin;
 }