From: Paul Mangan <paul@claws-mail.org>
Date: Tue, 24 Apr 2007 14:44:16 +0000 (+0000)
Subject: 2007-04-24 [paul]	2.9.1cvs21
X-Git-Tag: rel_2_10_0~108
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=b6216bd5f25dce2d0083410a28b85d7929a38738

2007-04-24 [paul]	2.9.1cvs21

	* src/Makefile.am
	* src/stock_pixmap.c
	* src/stock_pixmap.h
		complete last commit
---

diff --git a/ChangeLog b/ChangeLog
index 79256d455..b368f6f7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-24 [paul]	2.9.1cvs21
+
+	* src/Makefile.am
+	* src/stock_pixmap.c
+	* src/stock_pixmap.h
+		complete last commit
+
 2007-04-24 [paul]	2.9.1cvs20
 
 	* src/gtk/about.c
diff --git a/PATCHSETS b/PATCHSETS
index 7a9117adb..1b449d55e 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2548,3 +2548,4 @@
 ( cvs diff -u -r 1.204.2.131 -r 1.204.2.132 src/prefs_common.c;  ) > 2.9.1cvs18.patchset
 ( cvs diff -u -r 1.96.2.169 -r 1.96.2.170 src/textview.c;  cvs diff -u -r 1.12.2.18 -r 1.12.2.19 src/textview.h;  ) > 2.9.1cvs19.patchset
 ( cvs diff -u -r 1.4.2.49 -r 1.4.2.50 src/gtk/about.c;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/active.xpm;  cvs diff -u -r 1.1.16.1 -r 1.1.16.2 src/pixmaps/checkbox_off.xpm;  cvs diff -u -r 1.1.16.1 -r 1.1.16.2 src/pixmaps/checkbox_on.xpm;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/inactive.xpm;  ) > 2.9.1cvs20.patchset
+( cvs diff -u -r 1.155.2.62 -r 1.155.2.63 src/Makefile.am;  cvs diff -u -r 1.25.2.37 -r 1.25.2.38 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.26 -r 1.18.2.27 src/stock_pixmap.h;  ) > 2.9.1cvs21.patchset
diff --git a/configure.ac b/configure.ac
index 15d812277..4ee457cb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 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 1d48e9b7d..b9c4323a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -299,7 +299,6 @@ BUILT_SOURCES = \
 	quote_fmt_parse.h
 
 EXTRA_DIST = \
-	pixmaps/active.xpm \
 	pixmaps/addr_one.xpm \
 	pixmaps/addr_two.xpm \
 	pixmaps/address_book.xpm \
@@ -335,7 +334,6 @@ EXTRA_DIST = \
 	pixmaps/group.xpm \
 	pixmaps/ham_btn.xpm \
 	pixmaps/ignorethread.xpm \
-	pixmaps/inactive.xpm \
 	pixmaps/inbox_open_hrm.xpm \
 	pixmaps/inbox_open.xpm \
 	pixmaps/inbox_close_hrm.xpm \
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 4cb034d50..8664a3e69 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -164,8 +164,6 @@
 #include "pixmaps/ham_btn.xpm"
 #include "pixmaps/moved.xpm"
 #include "pixmaps/copied.xpm"
-#include "pixmaps/active.xpm"
-#include "pixmaps/inactive.xpm"
 #include "pixmaps/selection.xpm"
 #include "pixmaps/empty.xpm"
 
@@ -341,8 +339,6 @@ static StockPixmapData pixmaps[] =
         {ham_btn_xpm                            , NULL, NULL, "ham_btn" , NULL},
 	{moved_xpm				, NULL, NULL, "moved", NULL},
 	{copied_xpm				, NULL, NULL, "copied", NULL},
-	{active_xpm				, NULL, NULL, "active", NULL},
-	{inactive_xpm				, NULL, NULL, "inactive", NULL},
 	{selection_xpm				, NULL, NULL, "selection", NULL},
         {empty_xpm                              , NULL, NULL, "empty" , NULL}
 };
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index a0046340e..cbeeef40b 100644
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -164,8 +164,6 @@ typedef enum
 	STOCK_PIXMAP_HAM_BTN,
 	STOCK_PIXMAP_MOVED,
 	STOCK_PIXMAP_COPIED,
-	STOCK_PIXMAP_ACTIVE,
-	STOCK_PIXMAP_INACTIVE,
 	STOCK_PIXMAP_SELECTION,
 	STOCK_PIXMAP_EMPTY,              /* last entry */
 	N_STOCK_PIXMAPS