2005-04-01 [colin] 1.9.6cvs21

	* src/Makefile.am
	* src/stock_pixmap.c
	* src/pixmaps/dir-noselect.xpm ** REMOVED **
	* src/pixmaps/dir_noselect.xpm ** ADDED **
		Fix pixmap name mismatch (Thanks Stephan Sachse)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index c1c4f8034345b7d1295aa760239b5e64c2b9fae9..c7602ad3b968d059a50592ba54759bbe4d6b3f36 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,11 @@
+2005-04-01 [colin]     1.9.6cvs21
+
+       * src/Makefile.am
+       * src/stock_pixmap.c
+       * src/pixmaps/dir-noselect.xpm ** REMOVED **
+       * src/pixmaps/dir_noselect.xpm ** ADDED **
+               Fix pixmap name mismatch (Thanks Stephan Sachse)
+
 2005-04-01 [colin]     1.9.6cvs20
 
        * src/image_viewer.c

diff --git a/PATCHSETS b/PATCHSETS
index 3555d360fa413b88781461ae4065ec86ce79173b..e4426b8e0994436586f0a1ebced0d53dd24013fa 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -437,3 +437,4 @@
 ( cvs diff -u -r 1.101.2.10 -r 1.101.2.11 src/news.c; cvs diff -u -r 1.16.2.16 -r 1.16.2.17 src/msgcache.c; cvs diff -u -r 1.47.2.18 -r 1.47.2.19 src/procheader.c; ) > 1.9.6cvs18.patchset
 ( cvs diff -u -r 1.100.2.15 -r 1.100.2.16 AUTHORS; cvs diff -u -r 1.24.2.6 -r 1.24.2.7 Makefile.am; cvs diff -u -r 1.654.2.471 -r 1.654.2.472 configure.ac; cvs diff -u -r 1.17.2.7 -r 1.17.2.8 po/ru.po; ) > 1.9.6cvs19.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/image_viewer.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/image_viewer.h; cvs diff -u -r 1.49.2.37 -r 1.49.2.38 src/procmime.c; cvs diff -u -r 1.17.2.8 -r 1.17.2.9 src/procmime.h; cvs diff -u -r 1.96.2.51 -r 1.96.2.52 src/textview.c; cvs diff -u -r 1.12.2.4 -r 1.12.2.5 src/textview.h; ) > 1.9.6cvs20.patchset
+( cvs diff -u -r 1.155.2.20 -r 1.155.2.21 src/Makefile.am; cvs diff -u -r 1.25.2.10 -r 1.25.2.11 src/stock_pixmap.c; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/dir-noselect.xpm; cvs diff -u -r 0 -r 1 src/pixmaps/dir_noselect.xpm; ) > 1.9.6cvs21.patchset

diff --git a/configure.ac b/configure.ac
index 4afbff4040b4ae0eaad7b3cc6a910b8370dd99ed..096744fd724bb21b4c52f6af05d66896f6323e4e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=20
+EXTRA_VERSION=21
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/Makefile.am b/src/Makefile.am
index adab3ad44dac06c1a020a074840cdcc540845f04..dab83fd41d771f7ac108976825100e0d68a7d6e9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -276,7 +276,7 @@ EXTRA_DIST = \
        pixmaps/continue.xpm \
        pixmaps/deleted.xpm \
        pixmaps/dir_close.xpm \
-       pixmaps/dir_no_select.xpm \
+       pixmaps/dir_noselect.xpm \
         pixmaps/dir_open_hrm.xpm \
        pixmaps/dir_open.xpm \
        pixmaps/down_arrow.xpm \

diff --git a/src/pixmaps/dir-noselect.xpm b/src/pixmaps/dir_noselect.xpm
similarity index 100%
rename from src/pixmaps/dir-noselect.xpm
rename to src/pixmaps/dir_noselect.xpm

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 1da108b7b8c73a071a23b88aeb606d309a34a8b2..5bbdcf409e4b3de7937efb7af71fb4063f12a6e5 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -117,7 +117,7 @@
 #include "pixmaps/mime_message.xpm"                  
 #include "pixmaps/address_search.xpm"
 #include "pixmaps/check_spelling.xpm"
-#include "pixmaps/dir-noselect.xpm"
+#include "pixmaps/dir_noselect.xpm"
 
 typedef struct _StockPixmapData        StockPixmapData;