talons

commit 4205d0bb6f0fcb755cf25d7b06eaaaae8246b1c0
parent dc2119dfee075f8b08470ffba221b6836b75d3d9
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 13 May 2008 16:46:22 +0000

2008-05-13 [colin]	3.4.0cvs32

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

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/prefs_themes.c
 | 
6
++++--

4 files changed, 12 insertions(+), 3 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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++;
 		}
 	}