2007-04-24 [paul] 2.9.1cvs20

	* src/gtk/about.c
	* src/pixmaps/active.xpm
	* src/pixmaps/checkbox_off.xpm
	* src/pixmaps/checkbox_on.xpm
	* src/pixmaps/inactive.xpm
		kick out the blobs
		remove transparent border from checkbox icons

diff --git a/ChangeLog b/ChangeLog
index 3ca1f92fc90272cb087f965820a17f8e3b2e3af5..79256d4558195bd872a4af37dbf70cc304e28eff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-04-24 [paul]      2.9.1cvs20
+
+       * src/gtk/about.c
+       * src/pixmaps/active.xpm
+       * src/pixmaps/checkbox_off.xpm
+       * src/pixmaps/checkbox_on.xpm
+       * src/pixmaps/inactive.xpm
+               kick out the blobs
+               remove transparent border from checkbox icons
+

 2007-04-24 [wwp]       2.9.1cvs19
 
        * src/textview.c
 2007-04-24 [wwp]       2.9.1cvs19
 
        * src/textview.c

diff --git a/PATCHSETS b/PATCHSETS
index effb781b5e153bb8b920757bce08e4fb8b5e9aff..7a9117adbd2cceeedb54a8b55e82e77e839c43ea 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2547,3 +2547,4 @@
 ( cvs diff -u -r 1.155.2.61 -r 1.155.2.62 src/Makefile.am;  cvs diff -u -r 1.25.2.36 -r 1.25.2.37 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.25 -r 1.18.2.26 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.298 -r 1.395.2.299 src/summaryview.c;  cvs diff -u -r 1.68.2.36 -r 1.68.2.37 src/summaryview.h;  cvs diff -u -r 1.1.4.38 -r 1.1.4.39 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/gtksctree.h;  diff -u /dev/null src/pixmaps/selection.xpm;  ) > 2.9.1cvs17.patchset
 ( 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.155.2.61 -r 1.155.2.62 src/Makefile.am;  cvs diff -u -r 1.25.2.36 -r 1.25.2.37 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.25 -r 1.18.2.26 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.298 -r 1.395.2.299 src/summaryview.c;  cvs diff -u -r 1.68.2.36 -r 1.68.2.37 src/summaryview.h;  cvs diff -u -r 1.1.4.38 -r 1.1.4.39 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/gtksctree.h;  diff -u /dev/null src/pixmaps/selection.xpm;  ) > 2.9.1cvs17.patchset
 ( 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

diff --git a/configure.ac b/configure.ac
index a77dfb4f261e8c0d662a3ed6a941c6a6a38eeb22..15d812277c0c03d33a1ef98c1a5edb217e0e6348 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=19
+EXTRA_VERSION=20

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/about.c b/src/gtk/about.c
index b1ff8f99a3a072f95d5a35d83ed210a6840d04c5..6c5ffab7cd2296431c10dbec4104d270c19e0c53 100644 (file)
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -404,8 +404,8 @@ static GtkWidget *about_create_child_page_features(void)
        gtk_text_buffer_create_tag(buffer, "bold", "weight", PANGO_WEIGHT_BOLD,
                                   NULL);
 
        gtk_text_buffer_create_tag(buffer, "bold", "weight", PANGO_WEIGHT_BOLD,
                                   NULL);
 

-       stock_pixbuf_gdk(window, STOCK_PIXMAP_ACTIVE, &active_pixbuf);
-       stock_pixbuf_gdk(window, STOCK_PIXMAP_INACTIVE, &inactive_pixbuf);
+       stock_pixbuf_gdk(window, STOCK_PIXMAP_CHECKBOX_ON, &active_pixbuf);
+       stock_pixbuf_gdk(window, STOCK_PIXMAP_CHECKBOX_OFF, &inactive_pixbuf);

 
 #if INET6
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
 
 #if INET6
        gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);

diff --git a/src/pixmaps/active.xpm b/src/pixmaps/active.xpm
deleted file mode 100644 (file)
index e70c9d1..0000000
--- a/src/pixmaps/active.xpm
+++ /dev/null
@@ -1,67 +0,0 @@
-/* XPM */
-static char * active_xpm[] = {
-"12 9 55 1",
-"      c None",
-".     c #02270B",
-"+     c #044013",
-"@     c #064B16",
-"#     c #064E17",
-"$     c #064F18",
-"%     c #065619",
-"&     c #07601C",
-"*     c #02280C",
-"=     c #054414",
-"-     c #08681F",
-";     c #097422",
-">     c #097523",
-",     c #097623",
-"'     c #097121",
-")     c #086F21",
-"!     c #054013",
-"~     c #08671F",
-"{     c #097724",
-"]     c #097924",
-"^     c #097A24",
-"/     c #0A7B25",
-"(     c #0A8327",
-"_     c #0B8828",
-":     c #097322",
-"<     c #0F7D29",
-"[     c #0E7D28",
-"}     c #0C8027",
-"|     c #0B912B",
-"1     c #0B932C",
-"2     c #065419",
-"3     c #0D7C27",
-"4     c #0C7E27",
-"5     c #0B8A2A",
-"6     c #0C9D2E",
-"7     c #0C9D2F",
-"8     c #075F1C",
-"9     c #097021",
-"0     c #097B25",
-"a     c #0A7D25",
-"b     c #0A7E25",
-"c     c #0C892A",
-"d     c #0D9D2F",
-"e     c #0DA732",
-"f     c #096E20",
-"g     c #0A8227",
-"h     c #0B8E2A",
-"i     c #0B902B",
-"j     c #0C932C",
-"k     c #0D9E2F",
-"l     c #0DA832",
-"m     c #0DA531",
-"n     c #0B942C",
-"o     c #0C962D",
-"p     c #0C9E2F",
-"            ",
-"  .+@##$%&  ",
-" *=-;>>,,') ",
-" !~{]^^^^/(_",
-" @:^^^^<[}|1",
-" 2;^^^^34567",
-" 890aab}cde ",
-"  fghiijklm ",
-"   _|1nop   "};

diff --git a/src/pixmaps/checkbox_off.xpm b/src/pixmaps/checkbox_off.xpm
index 3e0355eb15c5cbeea630295b9c8ba0ae26028a23..b0b76d0cced03425c158adee8f89630a4083cc88 100644 (file)
--- a/src/pixmaps/checkbox_off.xpm
+++ b/src/pixmaps/checkbox_off.xpm
@@ -1,24 +1,22 @@
 /* XPM */
 static char * checkbox_off_xpm[] = {
 /* XPM */
 static char * checkbox_off_xpm[] = {

-"15 15 6 1",
+"13 13 6 1",

 "      c None",
 ".     c #9D9D9D",
 "+     c #E0E0E0",
 "@     c #DADADA",
 "#     c #F4F4F4",
 "$     c #FFFFFF",
 "      c None",
 ".     c #9D9D9D",
 "+     c #E0E0E0",
 "@     c #DADADA",
 "#     c #F4F4F4",
 "$     c #FFFFFF",

-"               ",
-"  ...........  ",
-" .++++++++++@. ",
-" .+#########$. ",
-" .+#########$. ",
-" .+#########$. ",
-" .+#########$. ",
-" .+#########$. ",
-" .+#########$. ",
-" .+#########$. ",
-" .+#########$. ",
-" .+#########$. ",
-" .@$$$$$$$$$$. ",
-"  ...........  ",
-"               "};
+" ........... ",
+".++++++++++@.",
+".+#########$.",
+".+#########$.",
+".+#########$.",
+".+#########$.",
+".+#########$.",
+".+#########$.",
+".+#########$.",
+".+#########$.",
+".+#########$.",
+".@$$$$$$$$$$.",
+" ........... "};

diff --git a/src/pixmaps/checkbox_on.xpm b/src/pixmaps/checkbox_on.xpm
index 8cea59955a9f744fff981bb416db872bb0454fbe..ca5ed5ba8e120edfc958d5e0f2a011720abb026f 100644 (file)
--- a/src/pixmaps/checkbox_on.xpm
+++ b/src/pixmaps/checkbox_on.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * checkbox_on_xpm[] = {
 /* XPM */
 static char * checkbox_on_xpm[] = {

-"15 15 25 1",
+"13 13 25 1",

 "      c None",
 ".     c #9D9D9D",
 "+     c #E0E0E0",
 "      c None",
 ".     c #9D9D9D",
 "+     c #E0E0E0",


@@ -26,18 +26,16 @@ static char * checkbox_on_xpm[] = {
 "(     c #444444",
 "_     c #DDDDDD",
 ":     c #8A8A8A",
 "(     c #444444",
 "_     c #DDDDDD",
 ":     c #8A8A8A",

-"               ",
-"  ...........  ",
-" .++++++++++@. ",
-" .+########$%. ",
-" .+#######&*%. ",
-" .+######=*-%. ",
-" .+#####=;>#%. ",
-" .+#,'#);=##%. ",
-" .+!;;~*{]##%. ",
-" .+#^/;;(###%. ",
-" .+#_~/;:###%. ",
-" .+###'*@###%. ",
-" .@%%%%%%%%%%. ",
-"  ...........  ",
-"               "};
+" ........... ",
+".++++++++++@.",
+".+########$%.",
+".+#######&*%.",
+".+######=*-%.",
+".+#####=;>#%.",
+".+#,'#);=##%.",
+".+!;;~*{]##%.",
+".+#^/;;(###%.",
+".+#_~/;:###%.",
+".+###'*@###%.",
+".@%%%%%%%%%%.",
+" ........... "};

diff --git a/src/pixmaps/inactive.xpm b/src/pixmaps/inactive.xpm
deleted file mode 100644 (file)
index 4e58dce..0000000
--- a/src/pixmaps/inactive.xpm
+++ /dev/null
@@ -1,71 +0,0 @@
-/* XPM */
-static char * inactive_xpm[] = {
-"12 9 59 1",
-"      c None",
-".     c #FE0000",
-"+     c #F20000",
-"@     c #E30000",
-"#     c #E00000",
-"$     c #DD0000",
-"%     c #CA0000",
-"&     c #AA0000",
-"*     c #F30000",
-"=     c #D50000",
-"-     c #C60000",
-";     c #C30000",
-">     c #BF0000",
-",     c #AE0000",
-"'     c #930000",
-")     c #F10000",
-"!     c #C20000",
-"~     c #BE0000",
-"{     c #BF0505",
-"]     c #BE0202",
-"^     c #BE0404",
-"/     c #B50000",
-"(     c #830000",
-"_     c #790000",
-":     c #E10000",
-"<     c #BF0202",
-"[     c #BE0101",
-"}     c #BD0202",
-"|     c #B30000",
-"1     c #760000",
-"2     c #6D0000",
-"3     c #CC0000",
-"4     c #C00000",
-"5     c #BD0000",
-"6     c #BF0404",
-"7     c #BA0303",
-"8     c #9F0000",
-"9     c #5B0000",
-"0     c #5E0000",
-"a     c #AD0000",
-"b     c #AF0000",
-"c     c #B60000",
-"d     c #B70000",
-"e     c #B40000",
-"f     c #A00000",
-"g     c #690000",
-"h     c #3C0000",
-"i     c #940000",
-"j     c #850000",
-"k     c #7B0000",
-"l     c #7A0000",
-"m     c #750000",
-"n     c #3B0000",
-"o     c #4C0000",
-"p     c #770000",
-"q     c #700000",
-"r     c #6B0000",
-"s     c #680000",
-"t     c #5C0000",
-"            ",
-"  .+@##$%&  ",
-" .*=-;;;>,' ",
-" )=!>~{]^/(_",
-" :-~~~<[}|12",
-" 34~5~6]7890",
-" abcdddefgh ",
-"  ijkllm9no ",
-"   pqrrst   "};