2008-05-13 [colin] 3.4.0cvs32

	* src/prefs_themes.c
		Count .png files as icons too (fixes part
		of bug 1609, 'Icon issues')

diff --git a/ChangeLog b/ChangeLog
index 6604610746a6db7939952e07935680bab2c6ac8b..33e2019cbf475d3d03c685e06602eb19d609fbce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-13 [colin]     3.4.0cvs32
+
+       * src/prefs_themes.c
+               Count .png files as icons too (fixes part
+               of bug 1609, 'Icon issues')
+
 2008-05-13 [wwp]       3.4.0cvs31
 
        * src/addressbook_foldersel.c

diff --git a/PATCHSETS b/PATCHSETS
index c53e416b9669654db0b0e8edbfd29a16b1a4b004..8296ff4c9fc0b7ebc56951ff3ebd4f47323541ca 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3327,3 +3327,4 @@
 ( cvs diff -u -r 1.654.2.3385 -r 1.654.2.3386 configure.ac;  ) > 3.4.0cvs29.patchset
 ( cvs diff -u -r 1.60.2.115 -r 1.60.2.116 src/addressbook.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/addressbook_foldersel.c;  cvs diff -u -r 1.60.2.43 -r 1.60.2.44 src/filtering.c;  cvs diff -u -r 1.75.2.58 -r 1.75.2.59 src/matcher.c;  cvs diff -u -r 1.43.2.71 -r 1.43.2.72 src/prefs_matcher.c;  cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.18.2.59 -r 1.18.2.60 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.23.2.47 -r 1.23.2.48 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 3.4.0cvs30.patchset
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/addressbook_foldersel.c;  ) > 3.4.0cvs31.patchset
+( cvs diff -u -r 1.3.2.55 -r 1.3.2.56 src/prefs_themes.c;  ) > 3.4.0cvs32.patchset

diff --git a/configure.ac b/configure.ac
index 5fef2152b756cd49018de658565a8d2c4d49252e..a68f4a218e43a9aa6b96fa2120550c1422693d66 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=31
+EXTRA_VERSION=32
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index e4a7e0eb06610eaa245a39db57bfc4da5560096b..b876a375de5002e48262fed0ae9ad89725287f69 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -168,8 +168,10 @@ static void prefs_themes_file_stats(const gchar *filename, gpointer data)
                di->files++;
                len = strlen(filename);
                if (len > 4) {
-                       if (filename[len - 1] == 'm' && filename[len - 2] == 'p' &&
-                           filename[len - 3] == 'x' && filename[len - 4] == '.')
+                       const gchar *extension = filename+(len-4);
+                       if (!strcmp(extension, ".xpm"))
+                               di->pixms++;
+                       else if (!strcmp(extension, ".png"))
                                di->pixms++;
                }
        }