2007-08-21 [paul] 2.10.0cvs139

	* src/mainwindow.c
		replace deprecated g_strncasecmp()
	* src/messageview.c
		fix 'List URLS'

diff --git a/ChangeLog b/ChangeLog
index bb7bc39832258506d8f0c54025598a28c67d4f5a..6f925625849cb0f4efbaa2513a1b671a7359e48b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-21 [paul]      2.10.0cvs139
+
+       * src/mainwindow.c
+               replace deprecated g_strncasecmp()
+       * src/messageview.c
+               fix 'List URLS'
+

 2007-08-20 [ticho]     2.10.0cvs138
 
        * src/account.c
 2007-08-20 [ticho]     2.10.0cvs138
 
        * src/account.c

diff --git a/PATCHSETS b/PATCHSETS
index 7bffcd39fa38263b0fe128ff008809d0cf3a59e6..6578ade83b5c08c8352ceb93cdd241bc0f745d93 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2793,3 +2793,4 @@
 ( cvs diff -u -r 1.2.4.17 -r 1.2.4.18 src/browseldap.c;  cvs diff -u -r 1.8.2.24 -r 1.8.2.25 src/editldap.c;  cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/ldapctrl.c;  cvs diff -u -r 1.3.2.20 -r 1.3.2.21 src/ldapquery.c;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/ldapquery.h;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/ldapserver.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/ldaputil.c;  ) > 2.10.0cvs136.patchset
 ( cvs diff -u -r 1.2.2.12 -r 1.2.2.13 src/ldapctrl.c;  ) > 2.10.0cvs137.patchset
 ( cvs diff -u -r 1.61.2.65 -r 1.61.2.66 src/account.c;  cvs diff -u -r 1.105.2.107 -r 1.105.2.108 src/prefs_account.c;  cvs diff -u -r 1.49.2.32 -r 1.49.2.33 src/prefs_account.h;  ) > 2.10.0cvs138.patchset
 ( cvs diff -u -r 1.2.4.17 -r 1.2.4.18 src/browseldap.c;  cvs diff -u -r 1.8.2.24 -r 1.8.2.25 src/editldap.c;  cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/ldapctrl.c;  cvs diff -u -r 1.3.2.20 -r 1.3.2.21 src/ldapquery.c;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/ldapquery.h;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/ldapserver.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/ldaputil.c;  ) > 2.10.0cvs136.patchset
 ( cvs diff -u -r 1.2.2.12 -r 1.2.2.13 src/ldapctrl.c;  ) > 2.10.0cvs137.patchset
 ( cvs diff -u -r 1.61.2.65 -r 1.61.2.66 src/account.c;  cvs diff -u -r 1.105.2.107 -r 1.105.2.108 src/prefs_account.c;  cvs diff -u -r 1.49.2.32 -r 1.49.2.33 src/prefs_account.h;  ) > 2.10.0cvs138.patchset

+( cvs diff -u -r 1.274.2.205 -r 1.274.2.206 src/mainwindow.c;  cvs diff -u -r 1.94.2.145 -r 1.94.2.146 src/messageview.c;  ) > 2.10.0cvs139.patchset

diff --git a/configure.ac b/configure.ac
index 5f894382612a8baf30184a27a858bc514ba01206..8c6c55e194551dcedfe4f8c1d7135519bc977d6b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=138
+EXTRA_VERSION=139

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mainwindow.c b/src/mainwindow.c
index ff8a1db5875c818c604f961cdf899452fe88ec7c..dbfe74dde585ac14d77e579ac8982c0bacfd73c3 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2834,14 +2834,14 @@ static gint mailing_list_populate_submenu (GtkWidget *menuitem, const gchar * li
                for (url_pt = list_header; url_pt && *url_pt;) {
                        get_url_part (&url_pt, url_decoded, BUFFSIZE);
                        item = NULL;
                for (url_pt = list_header; url_pt && *url_pt;) {
                        get_url_part (&url_pt, url_decoded, BUFFSIZE);
                        item = NULL;

-                       if (!g_strncasecmp(url_decoded, "mailto:", 7)) {
+                       if (!g_ascii_strncasecmp(url_decoded, "mailto:", 7)) {

                                item = gtk_menu_item_new_with_label ((url_decoded));
                                g_signal_connect(G_OBJECT(item), "activate",
                                                 G_CALLBACK(mailing_list_compose),
                                                 NULL);
                        }
                                item = gtk_menu_item_new_with_label ((url_decoded));
                                g_signal_connect(G_OBJECT(item), "activate",
                                                 G_CALLBACK(mailing_list_compose),
                                                 NULL);
                        }

-                       else if (!g_strncasecmp (url_decoded, "http:", 5) ||
-                                !g_strncasecmp (url_decoded, "https:",6)) {
+                       else if (!g_ascii_strncasecmp(url_decoded, "http:", 5) ||
+                                !g_ascii_strncasecmp(url_decoded, "https:",6)) {

 
                                item = gtk_menu_item_new_with_label ((url_decoded));
                                g_signal_connect(G_OBJECT(item), "activate",
 
                                item = gtk_menu_item_new_with_label ((url_decoded));
                                g_signal_connect(G_OBJECT(item), "activate",

diff --git a/src/messageview.c b/src/messageview.c
index c95c6d9a2ca7d8a4511762753e2fda82aa51214c..6a4331c0d275398f9403b12044940d534076330f 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1872,10 +1872,12 @@ void messageview_list_urls (MessageView *msgview)
        GSList *newlist = NULL;
        for (; cur; cur = cur->next) {
                ClickableText *uri = (ClickableText *)cur->data;
        GSList *newlist = NULL;
        for (; cur; cur = cur->next) {
                ClickableText *uri = (ClickableText *)cur->data;

-               if (!uri->uri || !g_ascii_strncasecmp(uri->uri, "mailto:", 7) 
-               ||  uri->is_quote)
-                       continue;
-               newlist = g_slist_prepend(newlist, uri);
+               if (uri->uri &&
+                   (!g_ascii_strncasecmp(uri->uri, "ftp.", 4) ||
+                    !g_ascii_strncasecmp(uri->uri, "www.", 4) ||
+                    !g_ascii_strncasecmp(uri->uri, "http:", 5) ||
+                    !g_ascii_strncasecmp(uri->uri, "https:", 6)))
+                       newlist = g_slist_prepend(newlist, uri);

        }
        newlist = g_slist_reverse(newlist);
        uri_opener_open(msgview, newlist);
        }
        newlist = g_slist_reverse(newlist);
        uri_opener_open(msgview, newlist);