unicode fix submitted by Alte <010@imis.ru>

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7586d3a5f7e6f6fb4b6f14c247b0d2751b6a9588..dd385e1331a2b86f053c547c22cbcfbc9d5598be 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -9,6 +9,9 @@
        * src/textview.c: now also possible to add mail addresses by right
          clicking in the text view
 
        * src/textview.c: now also possible to add mail addresses by right
          clicking in the text view
 

+       * src/codeconv.c: merged patch which fixes endless loop when encountering
+         invalid wide characters; from Alte <010@imis.ru>  
+

 2001-05-20 [alfons]
 
        Added installation of gnome specific things:
 2001-05-20 [alfons]
 
        Added installation of gnome specific things:

diff --git a/src/codeconv.c b/src/codeconv.c
index 32f347a217364b7e4620adc7529c7199c5b81847..f822a3dcb066873e70212b8b4a2d585cb44b4f3d 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -840,6 +840,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                                mbl = wctomb(tmpp, *wtmpp);
                                if (mbl == -1) {
                                        g_warning("invalid wide character\n");
                                mbl = wctomb(tmpp, *wtmpp);
                                if (mbl == -1) {
                                        g_warning("invalid wide character\n");

+                                       wtmpp++;

                                        continue;
                                }
                                /* g_free(raw); */
                                        continue;
                                }
                                /* g_free(raw); */

diff --git a/sylpheed.desktop b/sylpheed.desktop
index 08e137af3faee4a8b553df2abe3fe09b5a85a33e..e691ee0b153f195d0aaa71b1e1f5eb574c7939ec 100644 (file)
--- a/sylpheed.desktop
+++ b/sylpheed.desktop
@@ -2,6 +2,6 @@
 Name=Sylpheed
 Comment=Sylpheed Mail
 Exec=sylpheed
 Name=Sylpheed
 Comment=Sylpheed Mail
 Exec=sylpheed

-Icon=sylpheed.png
+Icon=sylpheed.xpm

 Terminal=0
 Type=Application
 Terminal=0
 Type=Application

diff --git a/sylpheed.png b/sylpheed.png
index 8a63447b61c9cf48031066222a1c9437ecb412d7..e60c304a47503ff528dc3ba8db89dd9f8582a6d9 100644 (file)
Binary files a/sylpheed.png and b/sylpheed.png differ