2005-11-02 [wwp] 1.9.99cvs5

	* src/prefs_themes.c
		fix directory name checking (theme installation/removal),
		made related error a bit more verbose

diff --git a/ChangeLog b/ChangeLog
index 637199a4764db55c16e5a696e33cecafa0f2fa00..c47a860f1b54532300d3137003a37a0463b1af69 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-02 [wwp]       1.9.99cvs5
+
+       * src/prefs_themes.c
+               fix directory name checking (theme installation/removal),
+               made related error a bit more verbose
+
 2005-11-02 [cleroy]    1.9.99cvs4
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 754354e56140ae36d2fa5e1563a974935a7f5712..4a157f34e27b5248a78f63b15600026979d61b5c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -971,3 +971,4 @@
 ( cvs diff -u -r 1.382.2.191 -r 1.382.2.192 src/compose.c;  cvs diff -u -r 1.94.2.69 -r 1.94.2.70 src/messageview.c;  cvs diff -u -r 1.83.2.50 -r 1.83.2.51 src/mimeview.c;  cvs diff -u -r 1.20.2.5 -r 1.20.2.6 src/mimeview.h;  cvs diff -u -r 1.10.2.5 -r 1.10.2.6 src/privacy.h;  cvs diff -u -r 1.395.2.145 -r 1.395.2.146 src/summaryview.c;  ) > 1.9.99cvs2.patchset
 ( cvs diff -u -r 1.8.2.4 -r 1.8.2.5 po/ko.po;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 po/nb.po;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/wizard.c;  ) > 1.9.99cvs3.patchset
 ( cvs diff -u -r 1.395.2.146 -r 1.395.2.147 src/summaryview.c;  ) > 1.9.99cvs4.patchset
+( cvs diff -u -r 1.3.2.32 -r 1.3.2.33 src/prefs_themes.c;  ) > 1.9.99cvs5.patchset

diff --git a/configure.ac b/configure.ac
index 947d86633372370cc55faf18ce4decee4a76e646..d8d5c29b116c5f605a8fc5d656ae6aac3f454183 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=99
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 3ae9935bda8c252052a0ff83b6f7613ec73a32e7..24aeb92d6f6f59b8fa72cfa8e99443bb79c53b0e 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -186,8 +186,9 @@ static void prefs_themes_file_remove(const gchar *filename, gpointer data)
        
        base = g_path_get_basename(filename);
        if (TRUE == is_dir_exist(filename)) {
-               if (!((base[0] == '.') || (base[0] == '.' && base[1] == '.')))
-                       g_warning("prefs_themes_file_remove(): subdir in theme dir skipped.\n");
+               if (strcmp(base, ".") != 0 && strcmp(base, "..") != 0)
+                       g_warning("prefs_themes_file_remove(): subdir in theme dir skipped: '%s'.\n",
+                                               base);
        }
        else if (0 != g_unlink(filename)) {
                (*status) = g_strdup(filename);
@@ -205,8 +206,9 @@ static void prefs_themes_file_install(const gchar *filename, gpointer data)
        
        base = g_path_get_basename(filename);
        if (TRUE == is_dir_exist(filename)) {
-               if (!((base[0] == '.') || (base[0] == '.' && base[1] == '.')))
-                       g_warning("prefs_themes_file_install(): subdir in theme dir skipped.\n");
+               if (strcmp(base, ".") != 0 && strcmp(base, "..") !=0 )
+                       g_warning("prefs_themes_file_install(): subdir in theme dir skipped: '%s'.\n",
+                                               base);
        }
        else {
                gchar *fulldest;