diff options
| author |   Marinus Schraal <foser@gentoo.org> | 2003-06-10 13:15:45 +0000 |
|---|---|---|
| committer | Marinus Schraal <foser@gentoo.org> | 2003-06-10 13:15:45 +0000 |
| commit | 321a031ffd239cd17cff0c43c150f2c120fba377 (patch) | |
| tree | e3d840b0de6233afbc1957fa755a9deaacf0bc19 /x11-libs | |
| parent | cleanup libgtkhtml/gal deps (diff) | |
| download | historical-321a031ffd239cd17cff0c43c150f2c120fba377.tar.gz historical-321a031ffd239cd17cff0c43c150f2c120fba377.tar.bz2 historical-321a031ffd239cd17cff0c43c150f2c120fba377.zip | |
New version and big cleanup
Diffstat (limited to 'x11-libs')
29 files changed, 298 insertions, 4877 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index 129380834a3a..1bdcd6313be8 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for x11-libs/gtk+ # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.64 2003/05/29 22:09:05 lu_zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.65 2003/06/10 13:15:35 foser Exp $ +*gtk+-2.2.2 (10 Jun 2003) + + 10 Jun 2003; foser <foser@gentoo.org> gtk+-2.2.2.ebuild : + New version, enabled xinput support (#20407) which needs a recent xfree + Added GDK_USE_XFT as environment var as suggested by utx + Make png USE dependant + 30 May 2003; Luca Barbato <lu_zero@gentoo.org> gtk+-2.2.1.ebuild: Added ppc to keywords. diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index ef721646ad3e..ceb0d13d9c6b 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,41 +1,19 @@ -MD5 0709b2e2639857f1c7fa8913842f5df5 ChangeLog 11232 -MD5 959f35785c787b992a5e04b1f2cc62c9 gtk+-1.2.10-r8.ebuild 1760 -MD5 63b66999c16c73d9fcdc4104d1022da2 gtk+-1.2.10-r9.ebuild 1769 -MD5 21e4f9064c87e9e1111afdc60e654649 gtk+-2.0.6-r3.ebuild 1835 -MD5 8ef91cdec85627e2559d675dd7eaa60e gtk+-2.0.7-r1.ebuild 1765 -MD5 7e399e7991817168f25e2e4f42217831 gtk+-2.0.8-r1.ebuild 1770 -MD5 1c244c848a665643bebee7153e86b59a gtk+-2.0.8.ebuild 1589 -MD5 5b673686c95fc75669dff27f2d4155f6 gtk+-2.0.9.ebuild 1783 -MD5 6fd6538633ae6810f18dc09c43aefca9 gtk+-2.1.2.ebuild 1850 -MD5 df66b393c3bbbd60d41324715a758d80 gtk+-2.2.0.ebuild 2024 -MD5 fbce154efc95d256097e4c80c6903dc9 gtk+-2.2.0-r1.ebuild 2102 MD5 01148935388230826d6a072e9841a8ef gtk+-2.2.1.ebuild 2355 MD5 d639c96d2bb6007573dba36985e67e45 gtk+-1.2.10-r10.ebuild 1869 +MD5 63b66999c16c73d9fcdc4104d1022da2 gtk+-1.2.10-r9.ebuild 1769 +MD5 e08e695e467c7359fb3af7efeff6ffaa ChangeLog 11478 +MD5 28ec31800b24ee72f140e44b98600f90 gtk+-2.2.2.ebuild 2952 MD5 87f991351775a855c2cc3fdabc38f541 gtk+-2.2.1-r1.ebuild 2472 -MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r8 138 -MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r9 138 -MD5 67b4350ad5b852c2335f7e32f414b48e files/digest-gtk+-2.0.6-r3 145 -MD5 6aee0aaa4589f2f505f33f092b9f13a6 files/digest-gtk+-2.0.7-r1 64 -MD5 6f0d7e14e40ad0985d8cf1a3e58aa0bd files/digest-gtk+-2.0.8 64 -MD5 e48f7d7fffc023aa1c6377ec5c2b80fa files/digest-gtk+-2.0.8-r1 139 -MD5 d36507745716d5c87e1abfdc9bc7fa3c files/digest-gtk+-2.0.9 64 -MD5 84cbae478d13eb2d19b2e092647a4626 files/digest-gtk+-2.1.2 64 -MD5 1731c077c2fdd27dc2e76c1952423b48 files/digest-gtk+-2.2.0 64 -MD5 478dbcad193a220886f8ea27195ba224 files/gentoo-gtk+-2.0.7-gdk-pixbuf.patch 605 -MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558 -MD5 afda005741a4acde47b6f829c3066b9a files/gtk-1.2.10.patch 52239 -MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627 -MD5 1731c077c2fdd27dc2e76c1952423b48 files/digest-gtk+-2.2.0-r1 64 MD5 dab380359be57a8b0234710651374e96 files/digest-gtk+-2.2.1 64 -MD5 0ab7928b5279c384b39e7aaf56e3aa69 files/gtk+-wm.patch 11496 -MD5 a0e14ed281fc891fd169e2bf7e247ad4 files/gtk+-2.2.1-gdkpixbuf-bigendian.patch 724 -MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 +MD5 eb031c47250137c58587c61124e7abf9 files/digest-gtk+-2.2.2 64 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138 +MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419 +MD5 a0e14ed281fc891fd169e2bf7e247ad4 files/gtk+-2.2.1-gdkpixbuf-bigendian.patch 724 +MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558 +MD5 c979d9262eccf5bdf8dbfa50b8d57b13 files/gtk+-2-xftprefs.patch 6711 +MD5 0ab7928b5279c384b39e7aaf56e3aa69 files/gtk+-wm.patch 11496 MD5 dab380359be57a8b0234710651374e96 files/digest-gtk+-2.2.1-r1 64 +MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 +MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r9 138 MD5 c63b9c6e57c8c554b32a8e40e46d1291 files/gtk+-2.2.1-scrollfix.patch 504 -MD5 4e18091067358f241b8f2a2d4bbfc4bb files/1.2.10/gtk+-filesel-dirchanged-fix.patch 4050 -MD5 c30d8fec9641dd3acd97fcc739dd6589 files/1.2.10/gtk+-filesel-move-fileops.patch 2542 -MD5 de6c845f6003217ba46dba68301a245e files/1.2.10/gtk+-filesel-navigation-buttons.patch 48562 -MD5 03b355fad7d6c75b0aadb96d79df864c files/1.2.10/gtk+-filesel-save-dir.patch 1675 -MD5 73115fa0b6d1100b69e642b6005ed06f files/1.2.10/gtk+-mac_ctree.patch 499 diff --git a/x11-libs/gtk+/files/1.2.10/gtk+-filesel-dirchanged-fix.patch b/x11-libs/gtk+/files/1.2.10/gtk+-filesel-dirchanged-fix.patch deleted file mode 100644 index a12092b72f19..000000000000 --- a/x11-libs/gtk+/files/1.2.10/gtk+-filesel-dirchanged-fix.patch +++ /dev/null @@ -1,141 +0,0 @@ -diff -Nrc -x *~ gtk+-1.2.10.orig/gtk/gtkfilesel.c gtk+-1.2.10/gtk/gtkfilesel.c -*** gtk+-1.2.10.orig/gtk/gtkfilesel.c Fri Apr 12 15:40:33 2002 ---- gtk+-1.2.10/gtk/gtkfilesel.c Fri Apr 12 15:40:15 2002 -*************** -*** 2338,2343 **** ---- 2338,2344 ---- - (GtkSignalFunc) gtk_button_clicked, - GTK_OBJECT (filesel->ok_button)); - gtk_box_pack_start (GTK_BOX (entry_vbox), filesel->selection_entry, TRUE, TRUE, 0); -+ gtk_object_set_data (GTK_OBJECT (filesel->selection_entry), "last_entry_was_dir_selection", (gpointer) FALSE); - gtk_widget_show (filesel->selection_entry); - - if (!cmpl_state_okay (filesel->cmpl_state)) -*************** -*** 2975,2983 **** - g_return_val_if_fail (widget != NULL, FALSE); - g_return_val_if_fail (event != NULL, FALSE); - - if (event->keyval == GDK_Tab) - { -- fs = GTK_FILE_SELECTION (user_data); - text = gtk_entry_get_text (GTK_ENTRY (fs->selection_entry)); - - text = g_strdup (text); ---- 2976,2986 ---- - g_return_val_if_fail (widget != NULL, FALSE); - g_return_val_if_fail (event != NULL, FALSE); - -+ fs = GTK_FILE_SELECTION (user_data); -+ gtk_object_set_data (GTK_OBJECT (fs->selection_entry), "last_entry_was_dir_selection", (gpointer) FALSE); -+ - if (event->keyval == GDK_Tab) - { - text = gtk_entry_get_text (GTK_ENTRY (fs->selection_entry)); - - text = g_strdup (text); -*************** -*** 3116,3122 **** - - if (filename) - { -! if (bevent) - switch (bevent->type) - { - case GDK_2BUTTON_PRESS: ---- 3119,3126 ---- - - if (filename) - { -! gtk_object_set_data (GTK_OBJECT (fs->selection_entry), "last_entry_was_dir_selection", (gpointer) FALSE); -! if (bevent) - switch (bevent->type) - { - case GDK_2BUTTON_PRESS: -*************** -*** 3143,3148 **** ---- 3147,3154 ---- - { - GtkFileSelection *fs = NULL; - gchar *filename, *temp = NULL; -+ const gchar *entry_text; -+ gboolean last_entry_was_dir_selection; - - g_return_if_fail (GTK_IS_CLIST (widget)); - -*************** -*** 3153,3158 **** ---- 3159,3168 ---- - gtk_clist_get_text (GTK_CLIST (fs->dir_list), row, 0, &temp); - filename = g_strdup (temp); - -+ entry_text = gtk_entry_get_text (GTK_ENTRY (fs->selection_entry)); -+ last_entry_was_dir_selection = (gboolean) gtk_object_get_data (GTK_OBJECT (fs->selection_entry), -+ "last_entry_was_dir_selection"); -+ - if (filename) - { - if (bevent) -*************** -*** 3163,3176 **** - break; - - default: -! gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename); - break; - } -! else -! gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename); - - g_free (filename); - } - } - - static void ---- 3173,3196 ---- - break; - - default: -! if (!entry_text || !strlen (entry_text) || last_entry_was_dir_selection) -! { -! gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename); -! last_entry_was_dir_selection = TRUE; -! } - break; - } -! else if (!entry_text || !strlen (entry_text) || last_entry_was_dir_selection) -! { -! gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), filename); -! last_entry_was_dir_selection = TRUE; -! } - - g_free (filename); - } -+ -+ gtk_object_set_data (GTK_OBJECT (fs->selection_entry), "last_entry_was_dir_selection", -+ (gpointer) last_entry_was_dir_selection); - } - - static void -*************** -*** 3313,3319 **** - } - else - { -! if (fs->selection_entry) - gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), ""); - } - ---- 3333,3344 ---- - } - else - { -! gboolean last_entry_was_dir_selection; -! -! last_entry_was_dir_selection = (gboolean) gtk_object_get_data (GTK_OBJECT (fs->selection_entry), -! "last_entry_was_dir_selection"); -! -! if (fs->selection_entry && last_entry_was_dir_selection) - gtk_entry_set_text (GTK_ENTRY (fs->selection_entry), ""); - } - diff --git a/x11-libs/gtk+/files/1.2.10/gtk+-filesel-move-fileops.patch b/x11-libs/gtk+/files/1.2.10/gtk+-filesel-move-fileops.patch deleted file mode 100644 index 848fa345f01d..000000000000 --- a/x11-libs/gtk+/files/1.2.10/gtk+-filesel-move-fileops.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nrc -x *~ gtk+-1.2.10.orig/gtk/gtkfilesel.c gtk+-1.2.10/gtk/gtkfilesel.c -*** gtk+-1.2.10.orig/gtk/gtkfilesel.c Thu Apr 19 08:20:04 2001 ---- gtk+-1.2.10/gtk/gtkfilesel.c Thu Apr 19 08:19:07 2001 -*************** -*** 2182,2197 **** - gtk_container_add (GTK_CONTAINER (filesel), filesel->main_vbox); - gtk_widget_show (filesel->main_vbox); - -- /* The horizontal box containing create, rename etc. buttons */ -- filesel->button_area = gtk_hbutton_box_new (); -- gtk_button_box_set_layout(GTK_BUTTON_BOX(filesel->button_area), GTK_BUTTONBOX_START); -- gtk_button_box_set_spacing(GTK_BUTTON_BOX(filesel->button_area), 0); -- gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, -- FALSE, FALSE, 0); -- gtk_widget_show (filesel->button_area); -- -- gtk_file_selection_show_fileop_buttons(filesel); -- - /* hbox for pulldown menu */ - pulldown_hbox = gtk_hbox_new (TRUE, 5); - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), pulldown_hbox, FALSE, FALSE, 0); ---- 2182,2187 ---- -*************** -*** 2201,2207 **** - filesel->history_pulldown = gtk_option_menu_new (); - gtk_widget_show (filesel->history_pulldown); - gtk_box_pack_start (GTK_BOX (pulldown_hbox), filesel->history_pulldown, -! FALSE, FALSE, 0); - - /* The horizontal box containing the directory and file listboxes */ - list_hbox = gtk_hbox_new (FALSE, 5); ---- 2191,2197 ---- - filesel->history_pulldown = gtk_option_menu_new (); - gtk_widget_show (filesel->history_pulldown); - gtk_box_pack_start (GTK_BOX (pulldown_hbox), filesel->history_pulldown, -! TRUE, FALSE, 0); - - /* The horizontal box containing the directory and file listboxes */ - list_hbox = gtk_hbox_new (FALSE, 5); -*************** -*** 2288,2293 **** ---- 2278,2293 ---- - gtk_box_pack_start (GTK_BOX (list_hbox), scrolled_win, TRUE, TRUE, 0); - gtk_widget_show (filesel->file_list); - gtk_widget_show (scrolled_win); -+ -+ /* The horizontal box containing create, rename etc. buttons */ -+ filesel->button_area = gtk_hbutton_box_new (); -+ gtk_button_box_set_layout(GTK_BUTTON_BOX(filesel->button_area), GTK_BUTTONBOX_END); -+ gtk_button_box_set_spacing(GTK_BUTTON_BOX(filesel->button_area), 0); -+ gtk_box_pack_start (GTK_BOX (filesel->main_vbox), filesel->button_area, -+ FALSE, FALSE, 0); -+ gtk_widget_show (filesel->button_area); -+ -+ gtk_file_selection_show_fileop_buttons(filesel); - - /* action area for packing buttons into. */ - filesel->action_area = gtk_hbox_new (TRUE, 0); diff --git a/x11-libs/gtk+/files/1.2.10/gtk+-filesel-navigation-buttons.patch b/x11-libs/gtk+/files/1.2.10/gtk+-filesel-navigation-buttons.patch deleted file mode 100644 index 2093c70d788a..000000000000 --- a/x11-libs/gtk+/files/1.2.10/gtk+-filesel-navigation-buttons.patch +++ /dev/null @@ -1,1935 +0,0 @@ -diff --exclude=Makefile.in -Nrc -x *~ gtk+-1.2.10.orig/gtk/gtkfilesel.c gtk+-1.2.10/gtk/gtkfilesel.c -*** gtk+-1.2.10.orig/gtk/gtkfilesel.c Thu Feb 15 23:36:19 2001 ---- gtk+-1.2.10/gtk/gtkfilesel.c Fri Apr 13 02:19:30 2001 -*************** -*** 55,60 **** ---- 55,1799 ---- - #include "gtkclist.h" - #include "gtkdialog.h" - #include "gtkintl.h" -+ #include "gtkpixmap.h" -+ -+ static char * home_xpm[] = { -+ "48 48 714 2", -+ " c None", -+ ". c #634D3A", -+ "+ c #9C8871", -+ "@ c #654E3D", -+ "# c #35271C", -+ "$ c #000000", -+ "% c #050101", -+ "& c #0B0301", -+ "* c #080100", -+ "= c #0F0402", -+ "- c #B0A08D", -+ "; c #7C6859", -+ "> c #9C8B7C", -+ ", c #523D31", -+ "' c #271D16", -+ ") c #200806", -+ "! c #C6918A", -+ "~ c #8D2C22", -+ "{ c #541812", -+ "] c #6E1C15", -+ "^ c #020000", -+ "/ c #B6A996", -+ "( c #716052", -+ "_ c #453324", -+ ": c #3F2E24", -+ "< c #C3B7B0", -+ "[ c #443529", -+ "} c #1B140F", -+ "| c #110403", -+ "1 c #581A14", -+ "2 c #49120D", -+ "3 c #49130E", -+ "4 c #42110C", -+ "5 c #0A0101", -+ "6 c #A79A87", -+ "7 c #837566", -+ "8 c #423124", -+ "9 c #231B15", -+ "0 c #4B423A", -+ "a c #6B5D52", -+ "b c #D1C9C3", -+ "c c #3D3127", -+ "d c #16100C", -+ "e c #371915", -+ "f c #B46B60", -+ "g c #60221C", -+ "h c #69201A", -+ "i c #681F19", -+ "j c #96836F", -+ "k c #9F9185", -+ "l c #5D4A39", -+ "m c #0F0C09", -+ "n c #3A3632", -+ "o c #9A9C99", -+ "p c #453B33", -+ "q c #8A7C71", -+ "r c #C4BAB0", -+ "s c #2E241C", -+ "t c #110C09", -+ "u c #1D0806", -+ "v c #62221C", -+ "w c #541611", -+ "x c #46120D", -+ "y c #A2917D", -+ "z c #AEA397", -+ "A c #806B58", -+ "B c #25201B", -+ "C c #525251", -+ "D c #949493", -+ "E c #656665", -+ "F c #6E6259", -+ "G c #72665C", -+ "H c #D4CDC6", -+ "I c #261D18", -+ "J c #2E0E0B", -+ "K c #A64D41", -+ "L c #603429", -+ "M c #968772", -+ "N c #B7AEA3", -+ "O c #7F6C5D", -+ "P c #0E0B09", -+ "Q c #211C18", -+ "R c #BABAB9", -+ "S c #494948", -+ "T c #B4B5B4", -+ "U c #565655", -+ "V c #B7B9B7", -+ "W c #85807A", -+ "X c #66594F", -+ "Y c #BDB2A7", -+ "Z c #3A2D23", -+ "` c #080504", -+ " . c #2B231D", -+ ".. c #190605", -+ "+. c #9F5546", -+ "@. c #998A77", -+ "#. c #B0A599", -+ "$. c #6F6254", -+ "%. c #0B0907", -+ "&. c #1F1B18", -+ "*. c #5C5C5A", -+ "=. c #B9B9B7", -+ "-. c #40403F", -+ ";. c #CFD1CF", -+ ">. c #565656", -+ ",. c #D2D2D2", -+ "'. c #939391", -+ "). c #918D88", -+ "!. c #3C2E25", -+ "~. c #A39385", -+ "{. c #5C4B40", -+ "]. c #29211B", -+ "^. c #423B32", -+ "/. c #9A8B77", -+ "(. c #A99D91", -+ "_. c #564B40", -+ ":. c #070605", -+ "<. c #1A1715", -+ "[. c #A6A6A5", -+ "}. c #4F514F", -+ "|. c #3A3B3A", -+ "1. c #E4E4E4", -+ "2. c #606060", -+ "3. c #A5A6A5", -+ "4. c #9D9D9C", -+ "5. c #75716E", -+ "6. c #281E17", -+ "7. c #A29387", -+ "8. c #6F5D4F", -+ "9. c #090605", -+ "0. c #271F19", -+ "a. c #B4A58D", -+ "b. c #978777", -+ "c. c #BEB5AA", -+ "d. c #4B4139", -+ "e. c #080605", -+ "f. c #1E1B19", -+ "g. c #666665", -+ "h. c #B1B1B0", -+ "i. c #5A5A5A", -+ "j. c #BEBEBD", -+ "k. c #555555", -+ "l. c #EAEAEA", -+ "m. c #696969", -+ "n. c #E7E7E7", -+ "o. c #A9A9A9", -+ "p. c #C2C3C2", -+ "q. c #686968", -+ "r. c #9C9996", -+ "s. c #2E221B", -+ "t. c #837569", -+ "u. c #685446", -+ "v. c #AA9A85", -+ "w. c #B5A997", -+ "x. c #D2CCC3", -+ "y. c #3D352D", -+ "z. c #080705", -+ "A. c #23201C", -+ "B. c #B2B2B1", -+ "C. c #AEAEAE", -+ "D. c #7D7D7D", -+ "E. c #DADADA", -+ "F. c #777777", -+ "G. c #999999", -+ "H. c #EBEBEB", -+ "I. c #A7A7A7", -+ "J. c #DDDDDD", -+ "K. c #A5A5A3", -+ "L. c #6E6B68", -+ "M. c #332921", -+ "N. c #68564A", -+ "O. c #634D3D", -+ "P. c #16100B", -+ "Q. c #1B130F", -+ "R. c #A0907A", -+ "S. c #D1C8B9", -+ "T. c #A2968A", -+ "U. c #28221C", -+ "V. c #0B0908", -+ "W. c #4A4641", -+ "X. c #828280", -+ "Y. c #EFEFEF", -+ "Z. c #858585", -+ "`. c #E9E9E9", -+ " + c #979797", -+ ".+ c #EEEEEE", -+ "++ c #9A9A9A", -+ "@+ c #6F6F6F", -+ "#+ c #D4D4D4", -+ "$+ c #5F5F5D", -+ "%+ c #9C9C99", -+ "&+ c #2D251E", -+ "*+ c #5D4D40", -+ "=+ c #6B5545", -+ "-+ c #2B1F16", -+ ";+ c #C0B199", -+ ">+ c #E7E1D6", -+ ",+ c #756B5F", -+ "'+ c #18130F", -+ ")+ c #100D0A", -+ "!+ c #595551", -+ "~+ c #B7B7B6", -+ "{+ c #585958", -+ "]+ c #A9A9A7", -+ "^+ c #6E6F6E", -+ "/+ c #C6C8C6", -+ "(+ c #8E8E8E", -+ "_+ c #F2F2F2", -+ ":+ c #E8E8E8", -+ "<+ c #A0A0A0", -+ "[+ c #9C9C9C", -+ "}+ c #F0F0F0", -+ "|+ c #8D8D8D", -+ "1+ c #777775", -+ "2+ c #AAAAA9", -+ "3+ c #74726F", -+ "4+ c #271F1A", -+ "5+ c #58483B", -+ "6+ c #695442", -+ "7+ c #39291D", -+ "8+ c #231D1A", -+ "9+ c #B7A994", -+ "0+ c #F3ECDA", -+ "a+ c #DAD4C9", -+ "b+ c #5F524A", -+ "c+ c #94918D", -+ "d+ c #717271", -+ "e+ c #B6B6B5", -+ "f+ c #686866", -+ "g+ c #7A7A78", -+ "h+ c #969696", -+ "i+ c #F3F3F3", -+ "j+ c #B4B4B4", -+ "k+ c #E5E5E5", -+ "l+ c #A2A2A2", -+ "m+ c #EDEDED", -+ "n+ c #AAAAAA", -+ "o+ c #D9D9D9", -+ "p+ c #727271", -+ "q+ c #93918E", -+ "r+ c #27211B", -+ "s+ c #493B30", -+ "t+ c #715C4B", -+ "u+ c #463324", -+ "v+ c #0E0906", -+ "w+ c #251F1B", -+ "x+ c #D6C9B2", -+ "y+ c #FFFBEE", -+ "z+ c #D2CBC0", -+ "A+ c #4D4137", -+ "B+ c #110E0B", -+ "C+ c #1D1711", -+ "D+ c #837F7A", -+ "E+ c #696968", -+ "F+ c #B5B5B5", -+ "G+ c #6E6E6C", -+ "H+ c #D9D9D8", -+ "I+ c #F4F4F4", -+ "J+ c #A6A6A6", -+ "K+ c #E2E2E2", -+ "L+ c #9D9D9D", -+ "M+ c #A5A5A5", -+ "N+ c #A3A3A3", -+ "O+ c #908E8D", -+ "P+ c #251F19", -+ "Q+ c #3A2C24", -+ "R+ c #6F5C4B", -+ "S+ c #4F3A2A", -+ "T+ c #150F0B", -+ "U+ c #171411", -+ "V+ c #B4A796", -+ "W+ c #DACBB2", -+ "X+ c #FEFAEE", -+ "Y+ c #DBD3C9", -+ "Z+ c #352C24", -+ "`+ c #120F0B", -+ " @ c #2E261F", -+ ".@ c #8E8E8D", -+ "+@ c #6C6C6B", -+ "@@ c #BABBBA", -+ "#@ c #838383", -+ "$@ c #ABABAB", -+ "%@ c #BABABA", -+ "&@ c #E3E3E3", -+ "*@ c #ECECEC", -+ "=@ c #B2B2B2", -+ "-@ c #DCDCDC", -+ ";@ c #ABADAB", -+ ">@ c #656360", -+ ",@ c #251E17", -+ "'@ c #2E231B", -+ ")@ c #6E5949", -+ "!@ c #513B2B", -+ "~@ c #1F1710", -+ "{@ c #0D0A08", -+ "]@ c #C5B7A5", -+ "^@ c #E5DCCA", -+ "/@ c #A0948B", -+ "(@ c #1E1711", -+ "_@ c #1C1511", -+ ":@ c #514940", -+ "<@ c #454544", -+ "[@ c #969694", -+ "}@ c #B0B0AE", -+ "|@ c #7F7F7D", -+ "1@ c #B0B0B0", -+ "2@ c #C2C2C2", -+ "3@ c #C8C8C8", -+ "4@ c #BBBBBB", -+ "5@ c #B9B9B9", -+ "6@ c #B7B7B7", -+ "7@ c #DFDFDF", -+ "8@ c #B6B6B6", -+ "9@ c #D3D3D3", -+ "0@ c #4A4948", -+ "a@ c #261F1B", -+ "b@ c #32251C", -+ "c@ c #543F2E", -+ "d@ c #493526", -+ "e@ c #120D09", -+ "f@ c #16120F", -+ "g@ c #5F5248", -+ "h@ c #221912", -+ "i@ c #554437", -+ "j@ c #ADA9A6", -+ "k@ c #3A3A3A", -+ "l@ c #232322", -+ "m@ c #444544", -+ "n@ c #9FA09F", -+ "o@ c #C5C5C5", -+ "p@ c #BFBFBF", -+ "q@ c #BEBEBE", -+ "r@ c #B1B1B1", -+ "s@ c #9F9F9F", -+ "t@ c #808080", -+ "u@ c #909090", -+ "v@ c #4B4B4B", -+ "w@ c #4A4A4A", -+ "x@ c #2A2A29", -+ "y@ c #443C36", -+ "z@ c #291E15", -+ "A@ c #19120D", -+ "B@ c #9A9088", -+ "C@ c #0E0E0E", -+ "D@ c #1B1B1A", -+ "E@ c #4A4B4A", -+ "F@ c #DCDDDC", -+ "G@ c #F1F1F1", -+ "H@ c #F5F5F5", -+ "I@ c #373737", -+ "J@ c #242424", -+ "K@ c #080808", -+ "L@ c #292726", -+ "M@ c #1C1714", -+ "N@ c #1F1F1F", -+ "O@ c #E0E0E0", -+ "P@ c #D1D1D1", -+ "Q@ c #CFCFCF", -+ "R@ c #CECECE", -+ "S@ c #C9C9C9", -+ "T@ c #757575", -+ "U@ c #343434", -+ "V@ c #1B1B1B", -+ "W@ c #292929", -+ "X@ c #545454", -+ "Y@ c #ADADAD", -+ "Z@ c #3B3B3B", -+ "`@ c #D5D5D5", -+ " # c #DBDBDB", -+ ".# c #D8D8D8", -+ "+# c #464646", -+ "@# c #252828", -+ "## c #050505", -+ "$# c #0F0E0C", -+ "%# c #0C0F0F", -+ "&# c #2D302E", -+ "*# c #C0C0C0", -+ "=# c #BDBDBD", -+ "-# c #272727", -+ ";# c #404040", -+ "># c #E1E1E1", -+ ",# c #DEDEDE", -+ "'# c #D7D7D7", -+ ")# c #181B1B", -+ "!# c #374845", -+ "~# c #242D2C", -+ "{# c #303636", -+ "]# c #363D3C", -+ "^# c #595D5A", -+ "/# c #23221F", -+ "(# c #949494", -+ "_# c #4F4F4F", -+ ":# c #222222", -+ "<# c #444444", -+ "[# c #939393", -+ "}# c #262626", -+ "|# c #161917", -+ "1# c #0A0B0A", -+ "2# c #080908", -+ "3# c #090B0A", -+ "4# c #161716", -+ "5# c #303030", -+ "6# c #0E0E0C", -+ "7# c #2B3534", -+ "8# c #555856", -+ "9# c #515251", -+ "0# c #8E8E8B", -+ "a# c #A5A3A0", -+ "b# c #0C0C0C", -+ "c# c #747474", -+ "d# c #3D3D3D", -+ "e# c #2E2E2E", -+ "f# c #2D2D2D", -+ "g# c #525252", -+ "h# c #7F7F7F", -+ "i# c #151515", -+ "j# c #1F221E", -+ "k# c #362E2A", -+ "l# c #050705", -+ "m# c #070C08", -+ "n# c #232D25", -+ "o# c #393939", -+ "p# c #151513", -+ "q# c #191F1E", -+ "r# c #6F6F6E", -+ "s# c #8A8B8A", -+ "t# c #CDCCCA", -+ "u# c #0A0B0B", -+ "v# c #727272", -+ "w# c #484848", -+ "x# c #2B2B2B", -+ "y# c #333333", -+ "z# c #424242", -+ "A# c #6E6E6E", -+ "B# c #1E1E1E", -+ "C# c #7A5551", -+ "D# c #C2827C", -+ "E# c #C4A6A3", -+ "F# c #271E1C", -+ "G# c #0D0C0A", -+ "H# c #313432", -+ "I# c #363B37", -+ "J# c #CBCBCB", -+ "K# c #070808", -+ "L# c #171F1E", -+ "M# c #7C7D7C", -+ "N# c #111313", -+ "O# c #666666", -+ "P# c #3F3F3F", -+ "Q# c #494949", -+ "R# c #181615", -+ "S# c #974B46", -+ "T# c #482521", -+ "U# c #B25851", -+ "V# c #DEC0BD", -+ "W# c #3C3535", -+ "X# c #010101", -+ "Y# c #262827", -+ "Z# c #1C2221", -+ "`# c #8B8B8B", -+ " $ c #D1D2D2", -+ ".$ c #D8D9D8", -+ "+$ c #080909", -+ "@$ c #4D4D4D", -+ "#$ c #5D5D5D", -+ "$$ c #040202", -+ "%$ c #391D1A", -+ "&$ c #7D312B", -+ "*$ c #B04D45", -+ "=$ c #C47168", -+ "-$ c #33201F", -+ ";$ c #292B2A", -+ ">$ c #CDCDCD", -+ ",$ c #CCCCCC", -+ "'$ c #0E0D0C", -+ ")$ c #212926", -+ "!$ c #999997", -+ "~$ c #BBBDBD", -+ "{$ c #DFE0E0", -+ "]$ c #141414", -+ "^$ c #282828", -+ "/$ c #5F5F5F", -+ "($ c #414141", -+ "_$ c #080606", -+ ":$ c #833C34", -+ "<$ c #8D3F37", -+ "[$ c #9C413B", -+ "}$ c #9A413A", -+ "|$ c #261615", -+ "1$ c #242524", -+ "2$ c #CACACA", -+ "3$ c #1C1E1D", -+ "4$ c #29322E", -+ "5$ c #D2D3D2", -+ "6$ c #D7D7D6", -+ "7$ c #111111", -+ "8$ c #919191", -+ "9$ c #2C2C2C", -+ "0$ c #0D0D0D", -+ "a$ c #636363", -+ "b$ c #9D524A", -+ "c$ c #9F3C34", -+ "d$ c #994037", -+ "e$ c #9C4841", -+ "f$ c #151716", -+ "g$ c #6C6C6C", -+ "h$ c #24201D", -+ "i$ c #323530", -+ "j$ c #2E2E28", -+ "k$ c #343532", -+ "l$ c #353532", -+ "m$ c #212121", -+ "n$ c #3C3C3C", -+ "o$ c #686868", -+ "p$ c #0F0F0F", -+ "q$ c #060606", -+ "r$ c #8D5651", -+ "s$ c #9D3D36", -+ "t$ c #9C453D", -+ "u$ c #A35149", -+ "v$ c #2C1F1E", -+ "w$ c #1B1C1B", -+ "x$ c #C6C6C6", -+ "y$ c #BDB4A9", -+ "z$ c #B0AAA5", -+ "A$ c #979796", -+ "B$ c #828282", -+ "C$ c #626262", -+ "D$ c #090909", -+ "E$ c #684946", -+ "F$ c #8A362E", -+ "G$ c #97453F", -+ "H$ c #9C5A54", -+ "I$ c #261716", -+ "J$ c #191C1A", -+ "K$ c #C4C4C4", -+ "L$ c #C3C3C3", -+ "M$ c #5C5C5C", -+ "N$ c #171717", -+ "O$ c #392423", -+ "P$ c #632E29", -+ "Q$ c #96453D", -+ "R$ c #88544F", -+ "S$ c #291D1C", -+ "T$ c #010000", -+ "U$ c #121513", -+ "V$ c #1C1C1C", -+ "W$ c #7A7A7A", -+ "X$ c #1A1B1B", -+ "Y$ c #885A56", -+ "Z$ c #753B36", -+ "`$ c #804F4B", -+ " % c #904F49", -+ ".% c #282020", -+ "+% c #151715", -+ "@% c #949790", -+ "#% c #626362", -+ "$% c #282C23", -+ "%% c #36412B", -+ "&% c #202E15", -+ "*% c #8B8E88", -+ "=% c #394131", -+ "-% c #A0A59A", -+ ";% c #1E2020", -+ ">% c #524442", -+ ",% c #65403C", -+ "'% c #69514E", -+ ")% c #875551", -+ "!% c #2A2424", -+ "~% c #070505", -+ "{% c #202120", -+ "]% c #B0B4AB", -+ "^% c #9DA694", -+ "/% c #778B65", -+ "(% c #6B8258", -+ "_% c #6E855A", -+ ":% c #7F8E6F", -+ "<% c #778868", -+ "[% c #60774B", -+ "}% c #607254", -+ "|% c #3F5431", -+ "1% c #394B30", -+ "2% c #35422E", -+ "3% c #30402C", -+ "4% c #30412C", -+ "5% c #2B3A2B", -+ "6% c #2E3F2B", -+ "7% c #3C562A", -+ "8% c #425F2C", -+ "9% c #A2AB99", -+ "0% c #3D4A35", -+ "a% c #638052", -+ "b% c #3B4A30", -+ "c% c #21291A", -+ "d% c #241918", -+ "e% c #4B3533", -+ "f% c #6B4F4D", -+ "g% c #392D2A", -+ "h% c #180C0C", -+ "i% c #152215", -+ "j% c #161E15", -+ "k% c #1F291F", -+ "l% c #222C23", -+ "m% c #29352B", -+ "n% c #2B392D", -+ "o% c #2E3F2E", -+ "p% c #32452E", -+ "q% c #32422E", -+ "r% c #2D3B2E", -+ "s% c #2A392C", -+ "t% c #2D422E", -+ "u% c #2A362B", -+ "v% c #2C3C2C", -+ "w% c #2C3C2D", -+ "x% c #2C3B2D", -+ "y% c #2B3B2C", -+ "z% c #30402A", -+ "A% c #394F2B", -+ "B% c #45632E", -+ "C% c #415F2C", -+ "D% c #3F6232", -+ "E% c #406634", -+ "F% c #416330", -+ "G% c #3D592C", -+ "H% c #405F30", -+ "I% c #3F5F2E", -+ "J% c #42482C", -+ "K% c #191210", -+ "L% c #0F0908", -+ "M% c #080505", -+ "N% c #070B07", -+ "O% c #080D09", -+ "P% c #0B0F0B", -+ "Q% c #121A0F", -+ "R% c #1B2917", -+ "S% c #293B1F", -+ "T% c #394E2D", -+ "U% c #3B5930", -+ "V% c #406532", -+ "W% c #44652E", -+ "X% c #446630", -+ "Y% c #354F30", -+ "Z% c #29362B", -+ "`% c #2A362C", -+ " & c #2B3A2C", -+ ".& c #2C3B2A", -+ "+& c #304129", -+ "@& c #303F2D", -+ "#& c #446C37", -+ "$& c #446934", -+ "%& c #446332", -+ "&& c #405F2D", -+ "*& c #416531", -+ "=& c #446531", -+ "-& c #3D6232", -+ ";& c #3B562B", -+ ">& c #374827", -+ ",& c #3F2B25", -+ "'& c #31341F", -+ ")& c #1D1C11", -+ "!& c #1E2312", -+ "~& c #253719", -+ "{& c #243518", -+ "]& c #233317", -+ "^& c #2C3D1C", -+ "/& c #375125", -+ "(& c #42602D", -+ "_& c #466630", -+ ":& c #44632E", -+ "<& c #3C552D", -+ "[& c #293A28", -+ "}& c #2A3B27", -+ "|& c #314527", -+ "1& c #2C3D22", -+ "2& c #1E2A19", -+ "3& c #212E1B", -+ "4& c #253321", -+ "5& c #2A3A26", -+ "6& c #446933", -+ "7& c #426531", -+ "8& c #3C6032", -+ "9& c #34512B", -+ "0& c #354B23", -+ "a& c #27371A", -+ "b& c #2B3D1C", -+ "c& c #28391B", -+ "d& c #334921", -+ "e& c #395125", -+ "f& c #3D5829", -+ "g& c #3A5226", -+ "h& c #395129", -+ "i& c #3C592D", -+ "j& c #3F6332", -+ "k& c #42652E", -+ "l& c #42632E", -+ "m& c #3C592A", -+ "n& c #233217", -+ "o& c #0B0F09", -+ "p& c #26341E", -+ "q& c #24321B", -+ "r& c #2E4122", -+ "s& c #202C1B", -+ "t& c #27361E", -+ "u& c #233219", -+ "v& c #3B5527", -+ "w& c #3C5628", -+ "x& c #334922", -+ "y& c #36542B", -+ "z& c #334A22", -+ "A& c #30441F", -+ "B& c #374F25", -+ "C& c #324821", -+ "D& c #344A22", -+ "E& c #314520", -+ " ", -+ " ", -+ " ", -+ " ", -+ " . ", -+ " + @ # ", -+ " $ % & * = $ - ; > , ' ", -+ " ) ! ~ { ] ^ / ( _ : < [ } ", -+ " | 1 2 3 4 5 6 7 8 9 0 a b c d ", -+ " e f g h i j k l m n o p q r s t ", -+ " u v w x y z A m B C D E F G H I t ", -+ " J K L M N O P Q R S T U V W X Y Z ` . ", -+ " ..+.@.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.` ]. ", -+ " ^./.(._.:.<.[.}.R |.1.2.1.3.4.5.6.7.8.9.0. ", -+ " a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.9.} ", -+ " v.w.x.y.z.A.B.U C.D.E.F.l.G.H.I.J.m.K.L.M.N.O.P.Q. ", -+ " R.S.T.U.V.W.g.C.}.h.X.Y.Z.`. +.+++H.@+#+$+%+&+*+=+-+` ", -+ " ;+>+,+'+)+!+~+{+]+^+/+(+_+I.:+<+.+[+}+|+l.1+2+3+4+5+6+7+` 8+ ", -+ " 9+0+a+b+)+'+c+d+e+f+e+g+Y.h+i+j+k+l+m+++.+n+`.|+o+p+q+r+s+t+u+v+w+ ", -+ " x+y+z+A+B+C+D+h.E+F+G+H+ +I+J+}+n+K+L+l.M+.+N+n.I.1.[+C.O+P+Q+R+S+T+U+ ", -+ " V+W+X+Y+Z+`+ @L..@C.+@@@#@i+$@i+j+Y.%@&@I.n.I.*@I.k+C.1.=@-@;@>@,@'@)@!@~@{@ ", -+ " ]@^@/@(@_@:@<@C [@}@|@n.1@.+2@}+3@H.4@K+%@K+5@n.6@7@n+-@8@J.9@2.0@a@b@c@d@e@f@ ", -+ " g@h@i@j@k@l@m@n@B.j+o@6@p@1@q@r@6@J+=@++L+s@ +t@L+u@I.G.$@1@v@w@x@y@z@A@9 ", -+ " B@4@C@$ D@E@F@.+}+G@I+H@i+i+I+H@H@I+_+i+I+I+_+}+H..+:+J.6@I@J@$ K@L@M@$ ", -+ " $ $ $ N@k.:+n.`.l.k+K+1.l.`.`.k+1.O@J.o+P@,.,.P@Q@R@S@T@U@V@$ $ $ $ $ ", -+ " $ W@X@o@S@3@4@%@p@5@8@M+J+$@Y@C.n+r@C.o.N+o.L+J+r@i.W@J@$ $ $ ", -+ " Z@X@3@1.1.K+J.-@`@9@#+ #E.o+.#+#@###$#%#&#+#*#=#v@J@-#$ ", -+ " ;#i.o.&@K+>#7@,#J.-@R@C..#'#Q@)#!#~#{#]#^#/#(#F+_#:#-#$ ", -+ " <#2.[#>#}#|#1#2#3#4#5#X@r@C.o.6#7#8#9#0#a#b#c#J+d#e#f#$ ", -+ " g#v@h#o+i#j#k#l#$ m#n#o#`@#+,.p#q#r#h#s#t#u#v#q@w#x#y#$ ", -+ " 2.z#A#,#B#C#D#E#F#G#H#I#J#q@4@K#L#M#h#q@'#N#O#F+P#V@<#$ ", -+ " A#Q#T@-@R#S#T#U#V#W#X#Y#++h+h+K@Z#`#l+ $.$+$z#F.B#i#@$$ ", -+ " #$Z@@+o+$$%$&$*$=$-$$ ;$Q@>$,$'$)$!$~${$1.]$>.<+^$b#f#$ ", -+ " /$($A#o+_$:$<$[$}$|$$ 1$>$,$2$3$4$5$'#7@6$7$k.8$9$0$5#$ ", -+ " m.e#a$'#K@b$c$d$e$|$$ f$M+++g$h$i$j$3$k$l$m$n$o$-#p$5# ", -+ " @+d#P#,.q$r$s$t$u$v$$ w$S@3@x$y$z$A$B$C$a$>.<#O#n$p$5# ", -+ " A#>.d#q@D$E$F$G$H$I$$ J$3@o@K$L$2@*#q@=#J+1@C$M$o#N$f# ", -+ " c#A#<#Y@D$O$P$Q$R$S$T$U$6@F+n+<+<+[+h+(+t@a$/$w@V$V@9$ ", -+ " W$n$=@X$Y$Z$`$ %.%X#+%6@8@8@j+r@1@N+ +@%h+Z.#%$%%%&% ", -+ " *%=%-%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8% ", -+ " 9%0%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v%w%x%y%z%A% ", -+ " B%C%D%E%F%G%H%I%J%I$K%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% & &.&+&6%@& ", -+ " #&$&%&&&*&=&*&-&;&>&,&'&)&!&~&{&]&^&/&(&_&_&:&<&[&}&|&1&2&3&4&5& ", -+ " 6&7&8&9&0&a&b&c&d&e&f&g&h&i&j&k&k&l&m&n& o&p&q&r&s&t&u& ", -+ " v&w&x& y&z& A&x&B&C&D&E& ", -+ " ", -+ " ", -+ " "}; -+ static char * desktop_xpm[] = { -+ "48 48 554 2", -+ " c None", -+ ". c #D6CCB9", -+ "+ c #DED6C7", -+ "@ c #BFB090", -+ "# c #BFB095", -+ "$ c #9A949A", -+ "% c #BBB5BE", -+ "& c #B5AFB9", -+ "* c #AEA7B1", -+ "= c #AAA3AE", -+ "- c #A69FAA", -+ "; c #A49CA7", -+ "> c #A199A5", -+ ", c #A098A4", -+ "' c #A097A4", -+ ") c #9F97A3", -+ "! c #A098A5", -+ "~ c #9C94A1", -+ "{ c #908894", -+ "] c #9A8F83", -+ "^ c #776D5A", -+ "/ c #E5E0D4", -+ "( c #F0EDE7", -+ "_ c #E3DDD1", -+ ": c #D9D0BD", -+ "< c #D0C6B1", -+ "[ c #746C60", -+ "} c #C0B29D", -+ "| c #F2EFE9", -+ "1 c #D0C5B0", -+ "2 c #BFAF90", -+ "3 c #B8A88C", -+ "4 c #38353A", -+ "5 c #4C464F", -+ "6 c #867B8B", -+ "7 c #827787", -+ "8 c #817687", -+ "9 c #7E7383", -+ "0 c #7C7282", -+ "a c #7A6E80", -+ "b c #766A7C", -+ "c c #776B7D", -+ "d c #736879", -+ "e c #746879", -+ "f c #76697C", -+ "g c #74687A", -+ "h c #706376", -+ "i c #6E6174", -+ "j c #6A5D71", -+ "k c #66596D", -+ "l c #5D4F64", -+ "m c #44384B", -+ "n c #3F363B", -+ "o c #B6B3AA", -+ "p c #F8F8F6", -+ "q c #ECE8E0", -+ "r c #CFC3AB", -+ "s c #C4B699", -+ "t c #564F41", -+ "u c #5A4F4B", -+ "v c #BBAF97", -+ "w c #FBFAF8", -+ "x c #C0B192", -+ "y c #BFAF8F", -+ "z c #9F9177", -+ "A c #0F0C10", -+ "B c #281F2B", -+ "C c #514259", -+ "D c #504058", -+ "E c #52425A", -+ "F c #4C3C54", -+ "G c #4B3B53", -+ "H c #483950", -+ "I c #4A3B52", -+ "J c #46374D", -+ "K c #48384F", -+ "L c #4A3A52", -+ "M c #45364C", -+ "N c #403247", -+ "O c #43354B", -+ "P c #221B26", -+ "Q c #433D3A", -+ "R c #F6F4F0", -+ "S c #D1C6B0", -+ "T c #BEAE8F", -+ "U c #4A4338", -+ "V c #443D39", -+ "W c #CEC2AC", -+ "X c #F9F7F5", -+ "Y c #675D52", -+ "Z c #0A070B", -+ "` c #2B212F", -+ " . c #493A51", -+ ".. c #6A6070", -+ "+. c #706575", -+ "@. c #746979", -+ "#. c #9A939D", -+ "$. c #B4AFB7", -+ "%. c #BBB5BD", -+ "&. c #BDB7BF", -+ "*. c #E6E4E7", -+ "=. c #FDFDFD", -+ "-. c #000000", -+ ";. c #281F2D", -+ ">. c #221A25", -+ ",. c #201A21", -+ "'. c #E8E3DB", -+ "). c #C2B396", -+ "!. c #3D392E", -+ "~. c #363129", -+ "{. c #E1D9CB", -+ "]. c #E9E4DB", -+ "^. c #312A2D", -+ "/. c #0B080C", -+ "(. c #372B3D", -+ "_. c #C2BDC5", -+ ":. c #B8B8B8", -+ "<. c #B1B1B1", -+ "[. c #C8C8C8", -+ "}. c #DBDBDB", -+ "|. c #E6E6E6", -+ "1. c #EDEDED", -+ "2. c #F4F4F4", -+ "3. c #F7F7F7", -+ "4. c #FBFBFB", -+ "5. c #FCFCFC", -+ "6. c #FEFEFE", -+ "7. c #040305", -+ "8. c #2A212F", -+ "9. c #252023", -+ "0. c #BBB098", -+ "a. c #4A4438", -+ "b. c #27241D", -+ "c. c #D7D2C8", -+ "d. c #363237", -+ "e. c #181219", -+ "f. c #5C4F64", -+ "g. c #EAE8EB", -+ "h. c #FFFFFF", -+ "i. c #A7A7A7", -+ "j. c #989898", -+ "k. c #BEBEBE", -+ "l. c #DCDCDC", -+ "m. c #E5E5E5", -+ "n. c #EAEAEA", -+ "o. c #F5F5F5", -+ "p. c #F8F8F8", -+ "q. c #555555", -+ "r. c #020202", -+ "s. c #322835", -+ "t. c #5C524B", -+ "u. c #36312A", -+ "v. c #12100E", -+ "w. c #656263", -+ "x. c #413945", -+ "y. c #423449", -+ "z. c #6D6D6D", -+ "A. c #707070", -+ "B. c #BCBCBC", -+ "C. c #D3D3D3", -+ "D. c #9B9B9B", -+ "E. c #6F6F6F", -+ "F. c #797979", -+ "G. c #929292", -+ "H. c #D1D1D1", -+ "I. c #3D333F", -+ "J. c #120F15", -+ "K. c #C1BDC4", -+ "L. c #56475E", -+ "M. c #44364B", -+ "N. c #3F3246", -+ "O. c #D4D4D4", -+ "P. c #8F8F8F", -+ "Q. c #5D5D5D", -+ "R. c #343434", -+ "S. c #484848", -+ "T. c #5F5F5F", -+ "U. c #4E4E4E", -+ "V. c #373737", -+ "W. c #454545", -+ "X. c #A4A4A4", -+ "Y. c #DFDFDF", -+ "Z. c #B6B6B6", -+ "`. c #493951", -+ " + c #1C1620", -+ ".+ c #201923", -+ "++ c #AEA7B0", -+ "@+ c #B6B1B9", -+ "#+ c #43354A", -+ "$+ c #858585", -+ "%+ c #737373", -+ "&+ c #787878", -+ "*+ c #8D8D8D", -+ "=+ c #959595", -+ "-+ c #ADADAD", -+ ";+ c #BFBFBF", -+ ">+ c #E8E8E8", -+ ",+ c #F0F0F0", -+ "'+ c #F9F9F9", -+ ")+ c #717171", -+ "!+ c #3A2E40", -+ "~+ c #28212D", -+ "{+ c #BCB6BE", -+ "]+ c #A79FAA", -+ "^+ c #C3C3C3", -+ "/+ c #ACACAC", -+ "(+ c #8B8B8B", -+ "_+ c #5E5E5E", -+ ":+ c #808080", -+ "<+ c #AAAAAA", -+ "[+ c #332839", -+ "}+ c #3D3044", -+ "|+ c #362B3C", -+ "1+ c #342939", -+ "2+ c #C0BAC3", -+ "3+ c #8F8594", -+ "4+ c #CECECE", -+ "5+ c #BBBBBB", -+ "6+ c #949494", -+ "7+ c #595959", -+ "8+ c #282828", -+ "9+ c #575757", -+ "0+ c #6A6A6A", -+ "a+ c #EFEFEF", -+ "b+ c #E0E0E0", -+ "c+ c #CFCFCF", -+ "d+ c #D8D8D8", -+ "e+ c #281F2C", -+ "f+ c #35293B", -+ "g+ c #322737", -+ "h+ c #C5BFC8", -+ "i+ c #7C7081", -+ "j+ c #E1E1E1", -+ "k+ c #4A4A4A", -+ "l+ c #AEAEAE", -+ "m+ c #E9E9E9", -+ "n+ c #FAFAFA", -+ "o+ c #C6C6C6", -+ "p+ c #171219", -+ "q+ c #C1995E", -+ "r+ c #D5A960", -+ "s+ c #735B57", -+ "t+ c #42344A", -+ "u+ c #312636", -+ "v+ c #C5C0C7", -+ "w+ c #685B6E", -+ "x+ c #46374E", -+ "y+ c #EBEBEB", -+ "z+ c #EEEEEE", -+ "A+ c #6C6C6C", -+ "B+ c #C4C4C4", -+ "C+ c #AD8947", -+ "D+ c #FECA65", -+ "E+ c #BE8134", -+ "F+ c #5A424A", -+ "G+ c #312736", -+ "H+ c #BEB9C2", -+ "I+ c #47384E", -+ "J+ c #C9C9C9", -+ "K+ c #7E7E7E", -+ "L+ c #5C5C5C", -+ "M+ c #3B3B3B", -+ "N+ c #4C4C4C", -+ "O+ c #A9A9A9", -+ "P+ c #9F9F9F", -+ "Q+ c #9D9D9D", -+ "R+ c #FEF9EE", -+ "S+ c #C59C4E", -+ "T+ c #EABA62", -+ "U+ c #CC7300", -+ "V+ c #84532E", -+ "W+ c #44354B", -+ "X+ c #413347", -+ "Y+ c #47384F", -+ "Z+ c #332939", -+ "`+ c #B4AEB7", -+ " @ c #AFA8B2", -+ ".@ c #F3F3F3", -+ "+@ c #B2B2B2", -+ "@@ c #CDCDCD", -+ "#@ c #ECECEC", -+ "$@ c #FED076", -+ "%@ c #E3B45A", -+ "&@ c #C37413", -+ "*@ c #AD6510", -+ "=@ c #392C3E", -+ "-@ c #392D40", -+ ";@ c #3E3044", -+ ">@ c #47374F", -+ ",@ c #B4ADB7", -+ "'@ c #A39BA7", -+ ")@ c #493950", -+ "!@ c #FEF3DD", -+ "~@ c #D2A456", -+ "{@ c #652A0C", -+ "]@ c #2C2231", -+ "^@ c #2F2535", -+ "/@ c #2F2534", -+ "(@ c #322838", -+ "_@ c #332A37", -+ ":@ c #352938", -+ "<@ c #B1ABB4", -+ "[@ c #756C64", -+ "}@ c #3A2F3D", -+ "|@ c #3F3145", -+ "1@ c #444444", -+ "2@ c #898989", -+ "3@ c #505050", -+ "4@ c #3E3E3E", -+ "5@ c #C3B290", -+ "6@ c #F2C174", -+ "7@ c #B06006", -+ "8@ c #602105", -+ "9@ c #662100", -+ "0@ c #2C2230", -+ "a@ c #241C28", -+ "b@ c #231B26", -+ "c@ c #1D1720", -+ "d@ c #362B3D", -+ "e@ c #2D2332", -+ "f@ c #322B30", -+ "g@ c #6D605B", -+ "h@ c #2E2432", -+ "i@ c #B6B0B6", -+ "j@ c #C2B7A7", -+ "k@ c #63574D", -+ "l@ c #3E3245", -+ "m@ c #D5D5D5", -+ "n@ c #C7B694", -+ "o@ c #E6AC5A", -+ "p@ c #7E3E02", -+ "q@ c #3A1E1B", -+ "r@ c #211A25", -+ "s@ c #18131B", -+ "t@ c #231B27", -+ "u@ c #171118", -+ "v@ c #3B3333", -+ "w@ c #988A77", -+ "x@ c #8E8172", -+ "y@ c #2B2230", -+ "z@ c #C0B6AF", -+ "A@ c #F3F0EA", -+ "B@ c #B4A489", -+ "C@ c #4A413F", -+ "D@ c #19141B", -+ "E@ c #413348", -+ "F@ c #FEDB98", -+ "G@ c #FACB71", -+ "H@ c #DE9E42", -+ "I@ c #612700", -+ "J@ c #5E2004", -+ "K@ c #2A1B21", -+ "L@ c #1B151E", -+ "M@ c #1C151E", -+ "N@ c #0E0A0E", -+ "O@ c #6E6258", -+ "P@ c #CDC3B2", -+ "Q@ c #D5CCC1", -+ "R@ c #9E907B", -+ "S@ c #28202D", -+ "T@ c #E2DDD5", -+ "U@ c #F3F1EE", -+ "V@ c #D3C8B3", -+ "W@ c #C9BCA4", -+ "X@ c #2A2327", -+ "Y@ c #120D15", -+ "Z@ c #33283A", -+ "`@ c #FDCE73", -+ " # c #D58824", -+ ".# c #BB6C10", -+ "+# c #622304", -+ "@# c #441600", -+ "## c #1C161F", -+ "$# c #18121A", -+ "%# c #120E14", -+ "&# c #141016", -+ "*# c #100C10", -+ "=# c #998D78", -+ "-# c #E9E5E0", -+ ";# c #EAE6E0", -+ "># c #BDAE90", -+ ",# c #A4957F", -+ "'# c #29202D", -+ ")# c #ABA4AD", -+ "!# c #F1EEE8", -+ "~# c #EFEBE5", -+ "{# c #DDD7C9", -+ "]# c #DBD3C3", -+ "^# c #BEB197", -+ "/# c #302A2B", -+ "(# c #09060A", -+ "_# c #2A212E", -+ ":# c #837988", -+ "<# c #807C81", -+ "[# c #B3ADA2", -+ "}# c #EBC274", -+ "|# c #7C3D00", -+ "1# c #220B00", -+ "2# c #100D12", -+ "3# c #130F15", -+ "4# c #130F16", -+ "5# c #100C12", -+ "6# c #0A080A", -+ "7# c #9D9180", -+ "8# c #F3F2F0", -+ "9# c #F2EFEA", -+ "0# c #CBBFA7", -+ "a# c #BAAA8C", -+ "b# c #A3947F", -+ "c# c #ACA4A6", -+ "d# c #F9F8F6", -+ "e# c #E3DDCF", -+ "f# c #CEC3B0", -+ "g# c #BEB099", -+ "h# c #C4B7A0", -+ "i# c #B2A388", -+ "j# c #39342F", -+ "k# c #0A090C", -+ "l# c #251D29", -+ "m# c #17121A", -+ "n# c #1B160B", -+ "o# c #E1B359", -+ "p# c #AF7C2D", -+ "q# c #692900", -+ "r# c #5A1D00", -+ "s# c #110806", -+ "t# c #0C090D", -+ "u# c #0F0C12", -+ "v# c #181414", -+ "w# c #A59D91", -+ "x# c #F2F0EF", -+ "y# c #EDE8E1", -+ "z# c #E3DDD0", -+ "A# c #C0B19A", -+ "B# c #BCAC8D", -+ "C# c #988878", -+ "D# c #2C2331", -+ "E# c #B6ABA2", -+ "F# c #F8F7F4", -+ "G# c #CFC4AD", -+ "H# c #D2C8B3", -+ "I# c #C7BAA2", -+ "J# c #C1B396", -+ "K# c #AB9C80", -+ "L# c #AC9D82", -+ "M# c #352E2D", -+ "N# c #1A151E", -+ "O# c #322738", -+ "P# c #413349", -+ "Q# c #0A080B", -+ "R# c #09070A", -+ "S# c #403220", -+ "T# c #E3B45C", -+ "U# c #B47929", -+ "V# c #AD5D02", -+ "W# c #642102", -+ "X# c #4C1C09", -+ "Y# c #100C11", -+ "Z# c #080609", -+ "`# c #0B090D", -+ " $ c #151017", -+ ".$ c #262120", -+ "+$ c #A49987", -+ "@$ c #D4CDC1", -+ "#$ c #DDD6C9", -+ "$$ c #E4DED4", -+ "%$ c #D4CCC0", -+ "&$ c #CABFAC", -+ "*$ c #BDAF96", -+ "=$ c #827469", -+ "-$ c #584D4B", -+ ";$ c #2D2330", -+ ">$ c #B0A28A", -+ ",$ c #B3B0AC", -+ "'$ c #565146", -+ ")$ c #464035", -+ "!$ c #4A4139", -+ "~$ c #3C352F", -+ "{$ c #302927", -+ "]$ c #413936", -+ "^$ c #161018", -+ "/$ c #251C28", -+ "($ c #1E1721", -+ "_$ c #271F2B", -+ ":$ c #6E583E", -+ "<$ c #E7B75E", -+ "[$ c #BF710F", -+ "}$ c #914C06", -+ "|$ c #2A110A", -+ "1$ c #050406", -+ "2$ c #130E14", -+ "3$ c #151018", -+ "4$ c #1C161D", -+ "5$ c #4E4445", -+ "6$ c #494044", -+ "7$ c #8C7E6E", -+ "8$ c #7C6E66", -+ "9$ c #766962", -+ "0$ c #817368", -+ "a$ c #897B6D", -+ "b$ c #6B5E5A", -+ "c$ c #3C3239", -+ "d$ c #1E1720", -+ "e$ c #201924", -+ "f$ c #736B65", -+ "g$ c #544E4A", -+ "h$ c #292325", -+ "i$ c #110E13", -+ "j$ c #17131A", -+ "k$ c #1B161F", -+ "l$ c #211A23", -+ "m$ c #383037", -+ "n$ c #241D29", -+ "o$ c #241E29", -+ "p$ c #261F2B", -+ "q$ c #221B25", -+ "r$ c #928156", -+ "s$ c #D5A556", -+ "t$ c #6E2E06", -+ "u$ c #5C1E01", -+ "v$ c #0F0705", -+ "w$ c #030304", -+ "x$ c #030203", -+ "y$ c #050405", -+ "z$ c #1D1721", -+ "A$ c #211B25", -+ "B$ c #251E2A", -+ "C$ c #161118", -+ "D$ c #D5D68D", -+ "E$ c #E2BB5D", -+ "F$ c #C06700", -+ "G$ c #692100", -+ "H$ c #4B1800", -+ "I$ c #BDCC99", -+ "J$ c #F2ECC5", -+ "K$ c #B2A96D", -+ "L$ c #965A05", -+ "M$ c #A35502", -+ "N$ c #270C00", -+ "O$ c #EBE7C0", -+ "P$ c #CDC398", -+ "Q$ c #1E1D0F", -+ "R$ c #0C0900", -+ "S$ c #512A04", -+ "T$ c #5E1E00", -+ "U$ c #0D0400", -+ "V$ c #9B9D78", -+ "W$ c #938C6A", -+ "X$ c #221E17", -+ "Y$ c #121001", -+ "Z$ c #391900", -+ "`$ c #1B1B14", -+ " % c #060505", -+ ".% c #090700", -+ " ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " . + @ @ @ # $ % & * = - ; > , ' > > ) ' > ! > ! ~ { ] ^ / ( _ : < [ ", -+ " } | 1 2 2 3 4 5 6 6 7 8 8 9 0 a b c d e f g h i j k l m n o p q r s t u ", -+ " v w x y z A B C D E F G H I F F F J K G L M N F F F F F O P Q R S T U V ", -+ " W X y Y Z ` F F F F L .F ..+.@.#.$.%.&.*.=.-.;.F F F F F G >.,.'.).!.~. ", -+ " {.].^./.(.F F F F H _.:.<.[.}.|.1.2.3.4.5.6.-.7.F F F F F F F 8.9.0.a.b. ", -+ " c.d.e.O F F F H f.g.h.i.j.k.l.m.n.o.p.1.=.6.q.r.F F F F F F F L s.t.u.v. ", -+ " w.x.F F L y.M 6 h.h.h.z.A.B.C.D.E.F.G.H.=.h.q.-.F F F F F F L I F I.A J. ", -+ " K.L.M.N.N K F O.P.Q.R.R.S.T.U.V.W.X.Y.Z.h.h.q.-.F F F F F `.F F F F +.+ ", -+ " ++@+#+K G F F F $+%+&+*+=+-+;+>+,+'+5.6.h.h.h.)+-.N F F F I G F F F F !+~+ ", -+ " {+]+F F F F F F -+<.Z.^+^+/+(+_+S.A.=+:+,+h.h.<+-.[+F F G L F F F F F }+|+1+ ", -+ " 2+3+F F F F F F 4+<+5+6+7+8+9+i.0+a+b+c+d+h.h.<+-.e+F I .F F F F F F y.f+g+ ", -+ " h+i+F F F F F G j+k.k+Q.l+m+n+5.Z.p.h.h.h.h.h.o+-.p+q+r+s+F F F F F G t+[+u+ ", -+ " v+w+F F F F .x+y+>+z+2.o.p.5.=.5.-+U.A+B+h.h.h.-.C+D+D+E+F+F G G `.`.x+[+G+ ", -+ " H+C F F F H I+F ,+J+E.K+L+M+)+A.N+&+O+P+Q+h.h.R+S+D+T+E+U+V+H W+X+x+Y+x+|+Z+ ", -+ " `+ @F F F `.`.F F .@b+n.c++@@@4.h.h.h.h.#@h.h.R+$@D+%@&@U+U+*@=@f+-@;@>@J g+1+ ", -+ " ,@'@F F )@G F F F '+n+n+4.=.=.h.X.h.h.h.A.h.!@$@D+~@U+U+U+U+{@]@^@/@(@!+M |+_@:@ ", -+ " <@[@}@|@F F F F F n+n+|.1@o+O.2@3@:+A+A+4@5@D+D+6@U+U+U+7@8@9@0@a@b@c@d@e@f@g@h@ ", -+ " i@j@k@b@l@F F F F 5.=.4.%+m@5.p.b+h.h.h.n@D+D+o@U+U+U+p@9@9@q@r@c@s@t@u@v@w@x@y@ ", -+ " z@A@B@C@D@E@F F F =.6.6.6.h.h.h.h.h.h.F@D+G@H@U+U+U+I@9@J@K@c@L@D@M@N@O@P@Q@R@S@ ", -+ " T@U@V@W@X@Y@Z@F F 6.6.6.h.h.h.h.h.h.F@D+`@ #U+U+.#+#9@@###s@$#%#&#*#=#-#;#>#,#'# ", -+ " )#!#~#{#]#^#/#(#_#G :#<#<+<+<+<+<+[#}#D+~@U+U+U+|#9@9@1#2#3##5#6#7#8#9#0#a#b#y@ ", -+ " c#d#e#f#g#h#i#j#k#l#G m#-.-.-.-.n#o#D+p#U+U+U+q#9@r#s#t#t#5#%#u#v#w#x#y#z#A#B#C#D# ", -+ " E#F#G#H#I#J#K#L#M#N#O#P#m#Q#R#S#T#D+U#U+U+V#W#9@X#Y#R#Z#`# $Y#.$+$@$#$$$%$&$*$=$-$;$ ", -+ " >$,$'$a.)$!$~${$]$^$/$($t@_$:$D+<$[$U+U+}$9@9@|$Z#1$1$Q#2$3$4$5$6$7$8$9$0$a$b$c$d$e$ ", -+ " f$g$h$i$j$N#k$l$m$n$o$p$q$r$D+s$[$U+U+t$9@u$v$w$x$y$R#2#s@z$A$n$B$p$p$p$p$p$p$r@m#C$ ", -+ " D$E$U+U+F$G$9@H$-.-.-.-.-. ", -+ " I$J$K$L$M$9@9@N$-.-.-.-.-. ", -+ " O$P$Q$R$S$T$U$-.-.-.-. ", -+ " V$W$X$-.Y$Z$-.-.-.-. ", -+ " `$ %.% -.-.-. ", -+ " -.-. ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " "}; -+ -+ static char * documents_xpm[] = { -+ "48 48 317 2", -+ " c None", -+ ". c #000000", -+ "+ c #978F7C", -+ "@ c #8F8775", -+ "# c #605D52", -+ "$ c #070706", -+ "% c #24231F", -+ "& c #33312C", -+ "* c #3B3932", -+ "= c #3A372F", -+ "- c #676154", -+ "; c #AE8E53", -+ "> c #DDAF5A", -+ ", c #F3B94F", -+ "' c #948C79", -+ ") c #24221E", -+ "! c #7E7767", -+ "~ c #857E6D", -+ "{ c #524D42", -+ "] c #3E3B34", -+ "^ c #2F2D29", -+ "/ c #201F1D", -+ "( c #191816", -+ "_ c #282622", -+ ": c #858175", -+ "< c #A59E8D", -+ "[ c #99927F", -+ "} c #B18F52", -+ "| c #E4B04F", -+ "1 c #B48B3A", -+ "2 c #6F5224", -+ "3 c #DEC277", -+ "4 c #CAAF6F", -+ "5 c #90825F", -+ "6 c #A4A093", -+ "7 c #C8C4B9", -+ "8 c #D0CDC4", -+ "9 c #C5C0B6", -+ "0 c #B2AC9E", -+ "a c #A7A090", -+ "b c #7E7867", -+ "c c #6D6758", -+ "d c #22201C", -+ "e c #151411", -+ "f c #181714", -+ "g c #232220", -+ "h c #343432", -+ "i c #43423F", -+ "j c #3D3C38", -+ "k c #524E47", -+ "l c #716B5C", -+ "m c #928A78", -+ "n c #8D8472", -+ "o c #706557", -+ "p c #50473D", -+ "q c #29221E", -+ "r c #201A17", -+ "s c #4D3C1F", -+ "t c #5F4922", -+ "u c #604A22", -+ "v c #E9E089", -+ "w c #FDFAA2", -+ "x c #FAF5A0", -+ "y c #D3C28F", -+ "z c #858481", -+ "A c #C5C2BC", -+ "B c #B6B1A5", -+ "C c #8E8674", -+ "D c #645F54", -+ "E c #57544D", -+ "F c #37352F", -+ "G c #2C2923", -+ "H c #2C2A24", -+ "I c #32302B", -+ "J c #5D5A54", -+ "K c #737069", -+ "L c #A7A59D", -+ "M c #BBB9B1", -+ "N c #A5A297", -+ "O c #A29D93", -+ "P c #857F6E", -+ "Q c #8A8371", -+ "R c #918977", -+ "S c #857B6A", -+ "T c #5B5146", -+ "U c #342D27", -+ "V c #241D17", -+ "W c #4E3D1F", -+ "X c #E5D683", -+ "Y c #E8E392", -+ "Z c #BFBD7C", -+ "` c #312C28", -+ " . c #4E4640", -+ ".. c #605750", -+ "+. c #413B34", -+ "@. c #413C36", -+ "#. c #514B42", -+ "$. c #B6B3AD", -+ "%. c #B9B5AF", -+ "&. c #C0BDB4", -+ "*. c #C1BDB2", -+ "=. c #BAB5A8", -+ "-. c #B5AFA2", -+ ";. c #B0A99B", -+ ">. c #A29B8A", -+ ",. c #958C78", -+ "'. c #887E6D", -+ "). c #675C50", -+ "!. c #3C342D", -+ "~. c #221B17", -+ "{. c #4C3B1F", -+ "]. c #D0B470", -+ "^. c #B8A263", -+ "/. c #332E29", -+ "(. c #3B3530", -+ "_. c #5C524B", -+ ":. c #585048", -+ "<. c #4B433E", -+ "[. c #847B75", -+ "}. c #695E56", -+ "|. c #877F78", -+ "1. c #77736D", -+ "2. c #EBE6AB", -+ "3. c #EEECCF", -+ "4. c #DEDDB0", -+ "5. c #C1BE70", -+ "6. c #9C8653", -+ "7. c #9E8B5B", -+ "8. c #1F1916", -+ "9. c #1E1815", -+ "0. c #1E1816", -+ "a. c #948259", -+ "b. c #3E3731", -+ "c. c #3E3732", -+ "d. c #534A44", -+ "e. c #625850", -+ "f. c #574E47", -+ "g. c #413A34", -+ "h. c #99918B", -+ "i. c #463E39", -+ "j. c #867E56", -+ "k. c #E3E2AB", -+ "l. c #C8C7AB", -+ "m. c #938E5B", -+ "n. c #615233", -+ "o. c #3E3522", -+ "p. c #181311", -+ "q. c #1C1714", -+ "r. c #504842", -+ "s. c #423B35", -+ "t. c #938B85", -+ "u. c #332D28", -+ "v. c #B6A267", -+ "w. c #857F4E", -+ "x. c #5F5134", -+ "y. c #352D1C", -+ "z. c #191412", -+ "A. c #5B514A", -+ "B. c #504741", -+ "C. c #645951", -+ "D. c #564D46", -+ "E. c #2F2926", -+ "F. c #3D352B", -+ "G. c #8D7E49", -+ "H. c #493D27", -+ "I. c #161210", -+ "J. c #5D534C", -+ "K. c #5E544D", -+ "L. c #635851", -+ "M. c #594F49", -+ "N. c #37302D", -+ "O. c #99928C", -+ "P. c #3A3430", -+ "Q. c #433924", -+ "R. c #251F17", -+ "S. c #171311", -+ "T. c #1A1512", -+ "U. c #61564F", -+ "V. c #5A514A", -+ "W. c #332D29", -+ "X. c #9E9792", -+ "Y. c #1A1513", -+ "Z. c #514943", -+ "`. c #5A504A", -+ " + c #2C2724", -+ ".+ c #9D9691", -+ "++ c #332D2A", -+ "@+ c #3B3531", -+ "#+ c #645A52", -+ "$+ c #5F554E", -+ "%+ c #352F2C", -+ "&+ c #A29C97", -+ "*+ c #5F554D", -+ "=+ c #655A52", -+ "-+ c #34302B", -+ ";+ c #ABA5A1", -+ ">+ c #2E2926", -+ ",+ c #665B53", -+ "'+ c #342E2A", -+ ")+ c #A59E9A", -+ "!+ c #0C0908", -+ "~+ c #595049", -+ "{+ c #595048", -+ "]+ c #282421", -+ "^+ c #9F9893", -+ "/+ c #624C27", -+ "(+ c #231A0C", -+ "_+ c #47403A", -+ ":+ c #514842", -+ "<+ c #27221F", -+ "[+ c #AAA39F", -+ "}+ c #382C1D", -+ "|+ c #E3AF4D", -+ "1+ c #372A12", -+ "2+ c #48403B", -+ "3+ c #4D443F", -+ "4+ c #554C46", -+ "5+ c #231F1C", -+ "6+ c #AFA9A5", -+ "7+ c #403833", -+ "8+ c #B3893E", -+ "9+ c #CE9C43", -+ "0+ c #2B200E", -+ "a+ c #3A342F", -+ "b+ c #48413B", -+ "c+ c #5A5049", -+ "d+ c #23201D", -+ "e+ c #AAA4A0", -+ "f+ c #61574F", -+ "g+ c #755928", -+ "h+ c #423214", -+ "i+ c #140F06", -+ "j+ c #18130C", -+ "k+ c #39332F", -+ "l+ c #36312C", -+ "m+ c #4A423C", -+ "n+ c #37312D", -+ "o+ c #9E9995", -+ "p+ c #5D544C", -+ "q+ c #4F4741", -+ "r+ c #665C54", -+ "s+ c #040303", -+ "t+ c #0B0904", -+ "u+ c #71613A", -+ "v+ c #242018", -+ "w+ c #413A35", -+ "x+ c #524A43", -+ "y+ c #2F2A27", -+ "z+ c #999490", -+ "A+ c #120F0D", -+ "B+ c #030302", -+ "C+ c #D1CD7A", -+ "D+ c #454025", -+ "E+ c #1C1916", -+ "F+ c #4A433D", -+ "G+ c #86807E", -+ "H+ c #60564E", -+ "I+ c #3F3732", -+ "J+ c #1D1714", -+ "K+ c #D6CD7A", -+ "L+ c #A69557", -+ "M+ c #2A251D", -+ "N+ c #352F2B", -+ "O+ c #403934", -+ "P+ c #84807D", -+ "Q+ c #625750", -+ "R+ c #3D3531", -+ "S+ c #1B1613", -+ "T+ c #38311C", -+ "U+ c #9B8652", -+ "V+ c #84724C", -+ "W+ c #292421", -+ "X+ c #3C3631", -+ "Y+ c #7F7A76", -+ "Z+ c #322C28", -+ "`+ c #181411", -+ " @ c #1C1614", -+ ".@ c #0F0C0B", -+ "+@ c #070604", -+ "@@ c #2D281D", -+ "#@ c #1D1A17", -+ "$@ c #302B28", -+ "%@ c #696561", -+ "&@ c #544B45", -+ "*@ c #433C37", -+ "=@ c #5E5240", -+ "-@ c #938151", -+ ";@ c #2F271D", -+ ">@ c #1D1815", -+ ",@ c #1C1917", -+ "'@ c #36302C", -+ ")@ c #726D6B", -+ "!@ c #554C45", -+ "~@ c #6F6349", -+ "{@ c #E4D985", -+ "]@ c #B9AF67", -+ "^@ c #6A5D39", -+ "/@ c #31291C", -+ "(@ c #221C16", -+ "_@ c #1D1B1A", -+ ":@ c #49423B", -+ "<@ c #C2B570", -+ "[@ c #F7F49D", -+ "}@ c #C4BE71", -+ "|@ c #635333", -+ "1@ c #493E24", -+ "2@ c #1C1710", -+ "3@ c #49413B", -+ "4@ c #4A4131", -+ "5@ c #B6A864", -+ "6@ c #C3AC63", -+ "7@ c #78673D", -+ "8@ c #252012", -+ "9@ c #030202", -+ "0@ c #2A2419", -+ "a@ c #342D1B", -+ "b@ c #17130C", -+ " ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " . ", -+ " . . . . . . . . ", -+ " . . . . . . . . . ", -+ " . . . ", -+ " . . + @ # $ % & * = - + ; > , ", -+ " + ' ) ) ! ~ { ] ^ / ( _ : < [ + + + + } | 1 2 ", -+ " 3 4 5 6 7 8 9 0 a + + + b c d e f g h i j k l m + + n o p q r r s t u ", -+ " v w x y z A B C D E F G H I J K L M N O P Q R n S T U r r r r r r r V W t ", -+ " X Y Z ` ...+.@.#.$.%.&.*.=.-.;.>.+ ,.'.).!.r r r r r r r r r r r r r ~.{. ", -+ " ].^./.(._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.r r r r r r r r r r r r r r r r r ", -+ " a.b.c.d.e.f.g.h.}.}.i.j.k.l.m.n.o.p.q.r r r r r r r r r r r r r r r r r ", -+ " r.<._.}.f.s.t.}.}.}.u.v.w.x.y.z.p.8.r r r r r r r r r r r r r r r r r ", -+ " A.B.C.}.D.E.t.}.}.}.d.F.G.H.z.I.q.r r r r r r r r r r r r r r r r r r ", -+ " J.K.L.}.M.N.O.}.}.}.}.P.Q.R.S.T.r r r r r r r r r r r r r r r r r r r ", -+ " A.U.}.}.V.W.X.}.}.}.}.A.Y.T.I.r r r r r r r r r r r r r r r r r r r r ", -+ " Z._.e.}.`. +.+}.}.}.}._.r 9.q.r r r r r r r r r r r r r r r r r r r r ", -+ " i.U.U.}._.++O.}.}.}.}._.r r r r r r r r r r r r r r r r r r r r r r r ", -+ " @+#+$+}._.%+&+}.}.}.}._.r r r r r r r r r r r r r r r r r r r r r r r ", -+ " +*+$+=+D.-+;+}.}.}.}._.r r r r r r r r r r r r r r r r r r r r r r 9. ", -+ " >+K._.,+V.'+)+}.}.}.}._.r r r r r r r r r r r r r r r r r r r r r 0.!+ ", -+ " ~+~+C.{+]+^+}.}.}.}._.r r r r r r r r r r r r r r r r r r r r r /+(+ ", -+ " _+:+A.`.<+[+}.}.}.}._.r r r r r r r r r r r r r r r r r r r r }+|+1+ ", -+ " . 2+3+4+_.5+6+}.}.}.}.7+r r r r r r r r r r r r r r r r r r r r 8+9+0+ ", -+ " a+:+b+c+d+e+}.}.f+~+7+r r r r r r r r r r r r r r r r r r r V g+h+i+. . . ", -+ " . j+k+l+m+n+o+}.p+q+r+7+r r r r r r r r r r r r r r r r r r p.s+. t+. . . . . . . ", -+ " u+v+w+x+y+z+K.d._.d.7+r r r r r r r r r r r r r r r r A+B+. . . . . . . . . . . . ", -+ " C+D+E+F+W.G+,+H+f.f+I+J+8.r r r r r r r r r r r r A+B+. . . . . . . . . . . . . ", -+ " . K+L+M+N+O+P+L._.A.Q+R+q.S+9.r r r r r r r r r A+B+. . . . . . . . . . . . . ", -+ " . T+U+V+W+X+Y+#+f.A.q+Z+z.`+Y. @r r r r r q..@B+. . . . . . . . . . . . . ", -+ " . +@@@#@$@%@H+&@*@=@-@;@I.z.Y.>@r r q..@. . . . . . . . . . . . . . ", -+ " . ,@'@)@!@*@~@{@]@^@/@(@q.r q..@. . . . . . . . . . . . . . ", -+ " . _@a+:@<@[@}@|@1@2@I..@. . . . . . . . . . . . . ", -+ " 3@4@5@6@7@8@9@. . . . . . . . . . . . . ", -+ " 0@a@b@. . . . . . . . . . ", -+ " . . . . ", -+ " ", -+ " ", -+ " ", -+ " ", -+ " "}; -+ - - #define DIR_LIST_WIDTH 180 - #define DIR_LIST_HEIGHT 180 -*************** -*** 335,340 **** ---- 2074,2082 ---- - static void gtk_file_selection_delete_file (GtkWidget *widget, gpointer data); - static void gtk_file_selection_rename_file (GtkWidget *widget, gpointer data); - -+ static void home_clicked (GtkWidget *widget, gpointer data); -+ static void desktop_clicked (GtkWidget *widget, gpointer data); -+ static void documents_clicked (GtkWidget *widget, gpointer data); - - - static GtkWindowClass *parent_class = NULL; -*************** -*** 379,384 **** ---- 2121,2163 ---- - object_class->destroy = gtk_file_selection_destroy; - } - -+ static GtkWidget * -+ create_pixmap_button (GtkFileSelection *filesel, -+ GtkWidget *parent_hbox, -+ gchar **xpm_data, -+ gchar *title) -+ { -+ GtkWidget *btn; -+ GtkWidget *hbox; -+ GtkWidget *wpixmap; -+ GtkWidget *label; -+ GdkPixmap *pixmap; -+ GdkPixmap *mask; -+ -+ btn = gtk_button_new (); -+ gtk_box_pack_start (GTK_BOX (parent_hbox), btn, TRUE, FALSE, 5); -+ gtk_widget_realize (btn); -+ -+ pixmap = gdk_pixmap_create_from_xpm_d (btn->window, &mask, -+ &btn->style->bg[GTK_STATE_NORMAL], -+ (gchar**)xpm_data); -+ -+ label = gtk_label_new (title); -+ -+ wpixmap = gtk_pixmap_new (pixmap, mask); -+ -+ hbox = gtk_vbox_new (FALSE, 5); -+ -+ gtk_box_pack_start (GTK_BOX (hbox), wpixmap, FALSE, FALSE, 0); -+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); -+ -+ gtk_widget_show_all (hbox); -+ -+ gtk_container_add (GTK_CONTAINER (btn), hbox); -+ -+ return btn; -+ } -+ - static void - gtk_file_selection_init (GtkFileSelection *filesel) - { -*************** -*** 388,394 **** ---- 2167,2176 ---- - GtkWidget *confirm_area; - GtkWidget *pulldown_hbox; - GtkWidget *scrolled_win; -+ GtkWidget *navigation_area; -+ GtkWidget *btn; - -+ char *dirname; - char *dir_title [2]; - char *file_title [2]; - -*************** -*** 426,431 **** ---- 2208,2256 ---- - gtk_box_pack_start (GTK_BOX (filesel->main_vbox), list_hbox, TRUE, TRUE, 0); - gtk_widget_show (list_hbox); - -+ /* The navigation buttons */ -+ navigation_area = gtk_vbox_new (TRUE, 0); -+ gtk_box_pack_start (GTK_BOX (list_hbox), navigation_area, FALSE, FALSE, 5); -+ gtk_widget_show (navigation_area); -+ -+ if (g_get_home_dir () != NULL) -+ { -+ struct stat sb; -+ btn = create_pixmap_button (filesel, navigation_area, -+ (gchar **)home_xpm, -+ _("Home")); -+ gtk_widget_show (btn); -+ gtk_signal_connect (GTK_OBJECT (btn), "clicked", -+ home_clicked, filesel); -+ -+ dirname = g_strdup_printf ("%s/.gnome-desktop/", g_get_home_dir ()); -+ if (stat (dirname, &sb) == 0 && S_ISDIR(sb.st_mode)) -+ { -+ btn = create_pixmap_button (filesel, navigation_area, -+ (gchar **)desktop_xpm, -+ _("Desktop")); -+ gtk_widget_show (btn); -+ gtk_signal_connect (GTK_OBJECT (btn), "clicked", -+ desktop_clicked, filesel); -+ -+ -+ } -+ g_free (dirname); -+ -+ dirname = g_strdup_printf ("%s/Documents/", g_get_home_dir ()); -+ if (stat (dirname, &sb) == 0 && S_ISDIR(sb.st_mode)) -+ { -+ btn = create_pixmap_button (filesel, navigation_area, -+ (gchar **)documents_xpm, -+ _("Documents")); -+ gtk_widget_show (btn); -+ gtk_signal_connect (GTK_OBJECT (btn), "clicked", -+ documents_clicked, filesel); -+ } -+ -+ g_free (dirname); -+ } -+ - /* The directories clist */ - dir_title[0] = _("Directories"); - dir_title[1] = NULL; -*************** -*** 1094,1099 **** ---- 2919,2959 ---- - } - - -+ static void -+ home_clicked (GtkWidget *widget, gpointer data) -+ { -+ char *dir; -+ -+ dir = g_strdup_printf ("%s/", g_get_home_dir()); -+ -+ gtk_file_selection_populate (GTK_FILE_SELECTION (data), -+ dir, FALSE); -+ g_free (dir); -+ } -+ -+ static void -+ desktop_clicked (GtkWidget *widget, gpointer data) -+ { -+ char *dir; -+ -+ dir = g_strdup_printf ("%s/.gnome-desktop/", g_get_home_dir ()); -+ -+ gtk_file_selection_populate (GTK_FILE_SELECTION (data), -+ dir, FALSE); -+ g_free (dir); -+ } -+ -+ static void -+ documents_clicked (GtkWidget *widget, gpointer data) -+ { -+ char *dir; -+ dir = g_strdup_printf ("%s/Documents/", g_get_home_dir ()); -+ -+ gtk_file_selection_populate (GTK_FILE_SELECTION (data), dir, FALSE); -+ -+ g_free (dir); -+ } -+ - static gint - gtk_file_selection_key_press (GtkWidget *widget, - GdkEventKey *event, -*************** -*** 1466,1472 **** - { - gtk_file_selection_update_history_menu (fs, cmpl_reference_position (cmpl_state)); - } -! - } - } - ---- 3326,3332 ---- - { - gtk_file_selection_update_history_menu (fs, cmpl_reference_position (cmpl_state)); - } -! - } - } - diff --git a/x11-libs/gtk+/files/1.2.10/gtk+-filesel-save-dir.patch b/x11-libs/gtk+/files/1.2.10/gtk+-filesel-save-dir.patch deleted file mode 100644 index 5584fdccf06a..000000000000 --- a/x11-libs/gtk+/files/1.2.10/gtk+-filesel-save-dir.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --exclude=Makefile.in -Nrc -x *~ gtk+-1.2.10.orig/gtk/gtkfilesel.c gtk+-1.2.10/gtk/gtkfilesel.c -*** gtk+-1.2.10.orig/gtk/gtkfilesel.c Fri Apr 13 02:25:17 2001 ---- gtk+-1.2.10/gtk/gtkfilesel.c Fri Apr 13 02:24:52 2001 -*************** -*** 2081,2086 **** ---- 2081,2088 ---- - - static GtkWindowClass *parent_class = NULL; - -+ static char *last_dir = NULL; -+ - /* Saves errno when something cmpl does fails. */ - static gint cmpl_errno; - -*************** -*** 2347,2353 **** - } - else - { -! gtk_file_selection_populate (filesel, "", FALSE); - } - - gtk_widget_grab_focus (filesel->selection_entry); ---- 2349,2362 ---- - } - else - { -! if (last_dir) -! { -! gtk_file_selection_populate (filesel, last_dir, FALSE); -! } -! else -! { -! gtk_file_selection_populate (filesel, "", FALSE); -! } - } - - gtk_widget_grab_focus (filesel->selection_entry); -*************** -*** 3309,3314 **** ---- 3318,3325 ---- - - if (!did_recurse) - { -+ char *dirname; -+ struct stat ent_sbuf; - if (fs->selection_entry) - gtk_entry_set_position (GTK_ENTRY (fs->selection_entry), selection_index); - -*************** -*** 1467,1472 **** ---- 1478,1495 ---- - gtk_file_selection_update_history_menu (fs, cmpl_reference_position (cmpl_state)); - } - -+ dirname = cmpl_reference_position (cmpl_state); -+ if(dirname && stat(dirname, &ent_sbuf) >= 0 && S_ISDIR(ent_sbuf.st_mode)) -+ { -+ if (last_dir) -+ { -+ g_free (last_dir); -+ } -+ -+ -+ -+ last_dir = g_strdup_printf ("%s%c", dirname, G_DIR_SEPARATOR); -+ } - } - } - diff --git a/x11-libs/gtk+/files/1.2.10/gtk+-mac_ctree.patch b/x11-libs/gtk+/files/1.2.10/gtk+-mac_ctree.patch deleted file mode 100644 index 64f3879e5c5b..000000000000 --- a/x11-libs/gtk+/files/1.2.10/gtk+-mac_ctree.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gtk+-1.2.7/gtk/gtkctree.c~ Wed Feb 16 06:18:07 2000 -+++ gtk+-1.2.7/gtk/gtkctree.c Fri May 19 23:05:15 2000 -@@ -609,8 +609,8 @@ - ctree->tree_indent = 20; - ctree->tree_spacing = 5; - ctree->tree_column = 0; -- ctree->line_style = GTK_CTREE_LINES_SOLID; -- ctree->expander_style = GTK_CTREE_EXPANDER_SQUARE; -+ ctree->line_style = GTK_CTREE_LINES_NONE; -+ ctree->expander_style = GTK_CTREE_EXPANDER_TRIANGLE; - ctree->drag_compare = NULL; - ctree->show_stub = TRUE; - diff --git a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r8 b/x11-libs/gtk+/files/digest-gtk+-1.2.10-r8 deleted file mode 100644 index c7995d372331..000000000000 --- a/x11-libs/gtk+/files/digest-gtk+-1.2.10-r8 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 4d5cb2fc7fb7830e4af9747a36bfce20 gtk+-1.2.10.tar.gz 2868322 -MD5 0ae8dcec20e0fa6dbc022d5eb00dc2a3 gtk+-1.2.10-r8-gentoo.diff.bz2 81223 diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.6-r3 b/x11-libs/gtk+/files/digest-gtk+-2.0.6-r3 deleted file mode 100644 index 549216ca2941..000000000000 --- a/x11-libs/gtk+/files/digest-gtk+-2.0.6-r3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 5f9c1b54abea95408155045c661a5adf gtk+-2.0.6.tar.bz2 6118141 -MD5 9aa3c564462049490bff7007e423a019 gtk+-directfb-2.0.6-gentoo.patch.bz2 125787 diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.7-r1 b/x11-libs/gtk+/files/digest-gtk+-2.0.7-r1 deleted file mode 100644 index 24041ff7750e..000000000000 --- a/x11-libs/gtk+/files/digest-gtk+-2.0.7-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 c9f641a22400660555094506f298e9b8 gtk+-2.0.7.tar.bz2 6319904 diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.8 b/x11-libs/gtk+/files/digest-gtk+-2.0.8 deleted file mode 100644 index 86039853b269..000000000000 --- a/x11-libs/gtk+/files/digest-gtk+-2.0.8 +++ /dev/null @@ -1 +0,0 @@ -MD5 3f2fdc357494b9733175d6a7bbf5d786 gtk+-2.0.8.tar.bz2 6303912 diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.8-r1 b/x11-libs/gtk+/files/digest-gtk+-2.0.8-r1 deleted file mode 100644 index 564f70074241..000000000000 --- a/x11-libs/gtk+/files/digest-gtk+-2.0.8-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 3f2fdc357494b9733175d6a7bbf5d786 gtk+-2.0.8.tar.bz2 6303912 -MD5 e56ff551a5086eb4c63a72a5640b7bf5 gtk+-directfb-2.0.8-gentoo.bz2 128048 diff --git a/x11-libs/gtk+/files/digest-gtk+-2.0.9 b/x11-libs/gtk+/files/digest-gtk+-2.0.9 deleted file mode 100644 index 21c117e74c43..000000000000 --- a/x11-libs/gtk+/files/digest-gtk+-2.0.9 +++ /dev/null @@ -1 +0,0 @@ -MD5 9827bca97fc09ff62b75579614dcfeb2 gtk+-2.0.9.tar.bz2 6310530 diff --git a/x11-libs/gtk+/files/digest-gtk+-2.1.2 b/x11-libs/gtk+/files/digest-gtk+-2.1.2 deleted file mode 100644 index 1a395b0f58ef..000000000000 --- a/x11-libs/gtk+/files/digest-gtk+-2.1.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 b5d9c50ce7e09f78a18047ddcf60de6d gtk+-2.1.2.tar.bz2 6174940 diff --git a/x11-libs/gtk+/files/digest-gtk+-2.2.0 b/x11-libs/gtk+/files/digest-gtk+-2.2.0 deleted file mode 100644 index e8f7824352ab..000000000000 --- a/x11-libs/gtk+/files/digest-gtk+-2.2.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 99d891779be79f348b85ac44a8c04ee9 gtk+-2.2.0.tar.bz2 6448407 diff --git a/x11-libs/gtk+/files/digest-gtk+-2.2.0-r1 b/x11-libs/gtk+/files/digest-gtk+-2.2.0-r1 deleted file mode 100644 index e8f7824352ab..000000000000 --- a/x11-libs/gtk+/files/digest-gtk+-2.2.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 99d891779be79f348b85ac44a8c04ee9 gtk+-2.2.0.tar.bz2 6448407 diff --git a/x11-libs/gtk+/files/digest-gtk+-2.2.2 b/x11-libs/gtk+/files/digest-gtk+-2.2.2 new file mode 100644 index 000000000000..1c2912f96d68 --- /dev/null +++ b/x11-libs/gtk+/files/digest-gtk+-2.2.2 @@ -0,0 +1 @@ +MD5 5a7c639f0f2d682bdc17e3f81c17c79c gtk+-2.2.2.tar.bz2 6975953 diff --git a/x11-libs/gtk+/files/gentoo-gtk+-2.0.7-gdk-pixbuf.patch b/x11-libs/gtk+/files/gentoo-gtk+-2.0.7-gdk-pixbuf.patch deleted file mode 100644 index 6b3fe0afd2e9..000000000000 --- a/x11-libs/gtk+/files/gentoo-gtk+-2.0.7-gdk-pixbuf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk+-2.0.7/gdk-pixbuf/io-gif.c.old 2002-11-06 00:11:44.000000000 +0100 -+++ gtk+-2.0.7/gdk-pixbuf/io-gif.c 2002-11-06 00:12:25.000000000 +0100 -@@ -534,7 +534,7 @@ - return 0; - } - --#define CHECK_LZW_SP() if(((guchar *)context->lzw_sp) >= (((guchar *)context->lzw_stack) + sizeof(context->lzw_stack))) { \ -+#define CHECK_LZWP_SP() if(((guchar *)context->lzw_sp) >= (((guchar *)context->lzw_stack) + sizeof(context->lzw_stack))) { \ - g_set_error (context->error, \ - GDK_PIXBUF_ERROR, \ - GDK_PIXBUF_ERROR_CORRUPT_IMAGE, \ diff --git a/x11-libs/gtk+/files/gtk+-2-xftprefs.patch b/x11-libs/gtk+/files/gtk+-2-xftprefs.patch new file mode 100644 index 000000000000..fbc9fc253a29 --- /dev/null +++ b/x11-libs/gtk+/files/gtk+-2-xftprefs.patch @@ -0,0 +1,229 @@ +--- gtk+-2.2.1/gdk/x11/gdkevents-x11.c.xftprefs Thu Jan 23 16:57:04 2003 ++++ gtk+-2.2.1/gdk/x11/gdkevents-x11.c Sun Feb 2 22:29:22 2003 +@@ -2497,7 +2497,12 @@ + { "Gtk/IMStatusStyle", "gtk-im-status-style" }, + { "Net/CursorBlink", "gtk-cursor-blink" }, + { "Net/CursorBlinkTime", "gtk-cursor-blink-time" }, +- { "Net/ThemeName", "gtk-theme-name" } ++ { "Net/ThemeName", "gtk-theme-name" }, ++ { "Xft/Antialias", "gtk-xft-antialias" }, ++ { "Xft/Hinting", "gtk-xft-hinting" }, ++ { "Xft/HintStyle", "gtk-xft-hintstyle" }, ++ { "Xft/RGBA", "gtk-xft-rgba" }, ++ { "Xft/DPI", "gtk-xft-dpi" }, + }; + + static void +--- gtk+-2.2.1/gtk/gtksettings.c.xftprefs Sun Feb 2 22:29:22 2003 ++++ gtk+-2.2.1/gtk/gtksettings.c Sun Feb 2 22:31:55 2003 +@@ -42,6 +42,12 @@ + GtkSettingsSource source; + }; + ++#ifdef GDK_WINDOWING_X11 ++#include <X11/Xft/Xft.h> ++#include <pango/pangoxft.h> ++#include <gdk/x11/gdkx.h> ++#endif ++ + enum { + PROP_0, + PROP_DOUBLE_CLICK_TIME, +@@ -53,7 +59,12 @@ + PROP_MENU_BAR_ACCEL, + PROP_DND_DRAG_THRESHOLD, + PROP_FONT_NAME, +- PROP_ICON_SIZES ++ PROP_ICON_SIZES, ++ PROP_XFT_ANTIALIAS, ++ PROP_XFT_HINTING, ++ PROP_XFT_HINTSTYLE, ++ PROP_XFT_RGBA, ++ PROP_XFT_DPI + }; + + +@@ -112,6 +123,85 @@ + return settings_type; + } + ++#ifdef GDK_WINDOWING_X11 ++static void ++gtk_default_substitute (FcPattern *pattern, ++ gpointer data) ++{ ++ GtkSettings *settings = data; ++ gint antialias; ++ gint hinting; ++ char *rgba; ++ char *hintstyle; ++ gint dpi; ++ FcValue v; ++ ++ g_object_get (G_OBJECT (settings), ++ "gtk-xft-antialias", &antialias, ++ "gtk-xft-hinting", &hinting, ++ "gtk-xft-hintstyle", &hintstyle, ++ "gtk-xft-rgba", &rgba, ++ "gtk-xft-dpi", &dpi, ++ NULL); ++ ++ if (antialias >= 0 && ++ FcPatternGet (pattern, FC_ANTIALIAS, 0, &v) == FcResultNoMatch) ++ FcPatternAddBool (pattern, FC_ANTIALIAS, antialias != 0); ++ ++ if (hinting >= 0 && ++ FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch) ++ FcPatternAddBool (pattern, FC_HINTING, hinting != 0); ++ ++ if (hintstyle && FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch) ++ { ++ int val = FC_HINT_FULL; /* Quiet GCC */ ++ gboolean found = TRUE; ++ ++ if (strcmp (hintstyle, "hintnone") == 0) ++ val = FC_HINT_NONE; ++ else if (strcmp (hintstyle, "hintslight") == 0) ++ val = FC_HINT_SLIGHT; ++ else if (strcmp (hintstyle, "hintmedium") == 0) ++ val = FC_HINT_MEDIUM; ++ else if (strcmp (hintstyle, "hintfull") == 0) ++ val = FC_HINT_FULL; ++ else ++ found = FALSE; ++ ++ if (found) ++ FcPatternAddInteger (pattern, FC_HINT_STYLE, val); ++ } ++ ++ if (rgba && FcPatternGet (pattern, FC_RGBA, 0, &v) == FcResultNoMatch) ++ { ++ int val = FC_RGBA_NONE; /* Quiet GCC */ ++ gboolean found = TRUE; ++ ++ if (strcmp (rgba, "none") == 0) ++ val = FC_RGBA_NONE; ++ else if (strcmp (rgba, "rgb") == 0) ++ val = FC_RGBA_RGB; ++ else if (strcmp (rgba, "bgr") == 0) ++ val = FC_RGBA_BGR; ++ else if (strcmp (rgba, "vrgb") == 0) ++ val = FC_RGBA_VRGB; ++ else if (strcmp (rgba, "vbgr") == 0) ++ val = FC_RGBA_VBGR; ++ else ++ found = FALSE; ++ ++ if (found) ++ FcPatternAddInteger (pattern, FC_RGBA, val); ++ } ++ ++ if (dpi >= 0 && FcPatternGet (pattern, FC_DPI, 0, &v) == FcResultNoMatch) ++ FcPatternAddDouble (pattern, FC_DPI, dpi / 1024.); ++ ++ g_free (hintstyle); ++ g_free (rgba); ++} ++#endif /* GDK_WINDOWING_X11 */ ++ + static void + gtk_settings_init (GtkSettings *settings) + { +@@ -247,6 +337,58 @@ + G_PARAM_READWRITE), + NULL); + g_assert (result == PROP_ICON_SIZES); ++ ++#ifdef GDK_WINDOWING_X11 ++ result = settings_install_property_parser (class, ++ g_param_spec_int ("gtk-xft-antialias", ++ _("Xft Antialias"), ++ _("Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"), ++ -1, 1, -1, ++ G_PARAM_READWRITE), ++ NULL); ++ ++ g_assert (result == PROP_XFT_ANTIALIAS); ++ ++ result = settings_install_property_parser (class, ++ g_param_spec_int ("gtk-xft-hinting", ++ _("Xft Hinting"), ++ _("Whether to hint Xft fonts; 0=no, 1=yes, -1=default"), ++ -1, 1, -1, ++ G_PARAM_READWRITE), ++ NULL); ++ ++ g_assert (result == PROP_XFT_HINTING); ++ ++ result = settings_install_property_parser (class, ++ g_param_spec_string ("gtk-xft-hintstyle", ++ _("Xft Hint Style"), ++ _("What degree of hinting to use; none, slight, medium, or full"), ++ NULL, ++ G_PARAM_READWRITE), ++ NULL); ++ ++ g_assert (result == PROP_XFT_HINTSTYLE); ++ ++ result = settings_install_property_parser (class, ++ g_param_spec_string ("gtk-xft-rgba", ++ _("Xft RGBA"), ++ _("Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"), ++ NULL, ++ G_PARAM_READWRITE), ++ NULL); ++ ++ g_assert (result == PROP_XFT_RGBA); ++ ++ result = settings_install_property_parser (class, ++ g_param_spec_int ("gtk-xft-dpi", ++ _("Xft DPI"), ++ _("Resolution for Xft, in 1024 * dots/inch. -1 to use default value"), ++ -1, 1024*1024, -1, ++ G_PARAM_READWRITE), ++ NULL); ++ ++ g_assert (result == PROP_XFT_DPI); ++#endif /* GDK_WINDOWING_X11 */ + } + + static void +@@ -288,7 +430,17 @@ + { + settings = g_object_new (GTK_TYPE_SETTINGS, NULL); + settings->screen = screen; +- g_object_set_data (G_OBJECT (screen), "gtk-settings", settings); ++ g_object_set_data (G_OBJECT (screen), "gtk-settings", settings); ++ ++#ifdef GDK_WINDOWING_X11 ++ /* Set the default substitution function for the Pango fontmap. ++ */ ++ pango_xft_set_default_substitute (GDK_SCREEN_XDISPLAY (screen), ++ GDK_SCREEN_XNUMBER (screen), ++ gtk_default_substitute, ++ settings, NULL); ++#endif /* GDK_WINDOWING_X11 */ ++ + gtk_rc_reparse_all_for_settings (settings, TRUE); + settings_update_double_click_time (settings); + } +@@ -413,6 +565,19 @@ + case PROP_DOUBLE_CLICK_TIME: + settings_update_double_click_time (settings); + break; ++#ifdef GDK_WINDOWING_X11 ++ case PROP_XFT_ANTIALIAS: ++ case PROP_XFT_HINTING: ++ case PROP_XFT_HINTSTYLE: ++ case PROP_XFT_RGBA: ++ case PROP_XFT_DPI: ++ pango_xft_substitute_changed (GDK_SCREEN_XDISPLAY (settings->screen), ++ GDK_SCREEN_XNUMBER (settings->screen)); ++ /* See comments with _gtk_rc_reset_styles for why this is a hack ++ */ ++ _gtk_rc_reset_styles (GTK_SETTINGS (object)); ++ break; ++#endif /* GDK_WINDOWING_X11 */ + } + } + diff --git a/x11-libs/gtk+/files/gtk-1.2.10.patch b/x11-libs/gtk+/files/gtk-1.2.10.patch deleted file mode 100644 index 1931497866b4..000000000000 --- a/x11-libs/gtk+/files/gtk-1.2.10.patch +++ /dev/null @@ -1,1977 +0,0 @@ -Index: ChangeLog -=================================================================== -RCS file: /cvs/gnome/gtk+/ChangeLog,v -retrieving revision 1.1061.2.360 -retrieving revision 1.1061.2.372 -diff -u -r1.1061.2.360 -r1.1061.2.372 ---- ChangeLog 2001/04/02 03:50:55 1.1061.2.360 -+++ ChangeLog 2001/08/05 14:30:14 1.1061.2.372 -@@ -1,3 +1,75 @@ -+Sun Aug 5 10:29:42 2001 Owen Taylor <otaylor@redhat.com> -+ -+ * gtk/gtklist.c: ref/unref, not ref/ref. -+ -+Sun Aug 5 09:48:08 2001 Owen Taylor <otaylor@redhat.com> -+ -+ * gtk/gtklist.c (gtk_list_clear_items): Fix -+ problem with selecting a new focus child. -+ -+ * gtk/gtklist.c (gtk_list_clear_items): Clear -+ list->undo/list_focus_child after unparenting -+ child, since unparenting the child can result -+ in list->last_focus_child being set. (#58024) -+ -+Tue Jul 24 16:41:12 2001 Owen Taylor <otaylor@redhat.com> -+ -+ * configure.in po/ta.po (ALL_LINGUAS): Remove dummy ta po - Tamil -+ translation doesn't really make sense for GTK+-1.2 anyways, -+ so lets not worry about the fact that it is missing -+ in this branch. -+ -+2001-07-24 Darin Adler <darin@bentspoon.com> -+ -+ * acinclude.m4: Add BUILD_INCLUDED_LIBINTL for -+ compatibility with newer gettext. -+ -+ * examples/helloworld/.cvsignore: Ignore the -+ generated executable. -+ -+2001-07-10 jacob berkman <jacob@ximian.com> -+ -+ * gtk/gtkrc.c: #include <config.h> as the previous patch requires -+ it -+ -+2001-06-26 Fatih Demir <kabalak@gtranslator.org> -+ -+ * configure.in: Added ta to the languages list. -+ -+2001-06-06 Pablo Saratxaga <pablo@mandrakesoft.com> -+ -+ * configure.in: Check for nl_langinfo (CODESET). Code taken from -+ glib 1.3 branch. -+ * gtk/gtkrc.c,gtk/gtkrc.*,gtk/Makefile.am: changed the algorithm -+ ussed to look for locale dependent rc files so it does a better job -+ finding them based on charset. -+ -+2001-06-01 Alex Larsson <alexl@redhat.com> -+ -+ * gdk/gdkevents.c (expose_predicate): -+ Allow expose event compression past configure notify events for -+ other toplevel window. This fixes performance when dragging a -+ window of an application over another window of the same -+ application. In this case there will be interleaved exposure -+ and configure events. -+ -+Thu May 31 12:43:57 2001 Owen Taylor <otaylor@redhat.com> -+ -+ * gtk/gtkoptionmenu.c: Account for the fact that the border -+ width is _outside_ the window. (Fixes #54585) -+ -+2001-04-19 Federico Mena Quintero <federico@ximian.com> -+ -+ * gtk/gtkwindow.c (gtk_window_focus_filter): Only consider -+ crossing events if the parent of the window is the root window. -+ This is so that GtkPlugs will not do funny things when they think -+ they should get the focus. -+ -+Wed Apr 11 16:20:00 2001 Owen Taylor <otaylor@redhat.com> -+ -+ * gtk/gtklabel.c (gtk_label_parse_uline): Fix check -+ of wrong variable. -+ - Sun Apr 1 23:01:31 2001 Owen Taylor <otaylor@redhat.com> - - * Released 1.2.10. -Index: acinclude.m4 -=================================================================== -RCS file: /cvs/gnome/gtk+/acinclude.m4,v -retrieving revision 1.9.2.7 -retrieving revision 1.9.2.8 -diff -u -r1.9.2.7 -r1.9.2.8 ---- acinclude.m4 2000/02/03 01:07:42 1.9.2.7 -+++ acinclude.m4 2001/07/24 19:23:39 1.9.2.8 -@@ -452,6 +452,7 @@ - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) - -+ BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - - dnl If we use NLS figure out what method -@@ -632,6 +633,7 @@ - done - - dnl Make all variables we use known to autoconf. -+ AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) -Index: configure.in -=================================================================== -RCS file: /cvs/gnome/gtk+/configure.in,v -retrieving revision 1.109.2.45 -retrieving revision 1.109.2.49 -diff -u -r1.109.2.45 -r1.109.2.49 ---- configure.in 2001/03/15 22:13:18 1.109.2.45 -+++ configure.in 2001/08/01 19:33:44 1.109.2.49 -@@ -183,7 +183,7 @@ - AC_SUBST(STRIP_END) - - # i18n stuff --ALL_LINGUAS="az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl no nn pl pt pt_BR ro ru sk sl sp sr sv tr uk vi wa zh_CN.GB2312 zh_TW.Big5" -+ALL_LINGUAS="az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt lv nl no nn pl pt pt_BR ro ru sk sl sp sr sv tr uk vi wa zh_CN.GB2312 zh_TW.Big5" - AM_GTK_GNU_GETTEXT - LIBS="$LIBS $INTLLIBS" - -@@ -191,6 +191,15 @@ - # this is the directory where the *.{mo,gmo} files are installed - gtklocaledir='${prefix}/${DATADIRNAME}/locale' - AC_SUBST(gtklocaledir) -+ -+dnl Check for nl_langinfo and CODESET -+AC_MSG_CHECKING([for nl_langinfo (CODESET)]) -+AC_TRY_COMPILE([#include <langinfo.h>], -+ [char *codeset = nl_langinfo (CODESET);], -+ AC_DEFINE(HAVE_CODESET,1,[Have nl_langinfo (CODESET)]) -+ have_codeset=yes, -+ have_codeset=no) -+AC_MSG_RESULT($have_codeset) - - dnl The DU4 header files don't provide library prototypes unless - dnl -std1 is given to the native cc. -Index: gdk/gdkevents.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gdk/gdkevents.c,v -retrieving revision 1.20.2.11 -retrieving revision 1.20.2.12 -diff -u -r1.20.2.11 -r1.20.2.12 ---- gdk/gdkevents.c 2000/12/03 16:50:04 1.20.2.11 -+++ gdk/gdkevents.c 2001/06/01 23:13:50 1.20.2.12 -@@ -383,6 +383,7 @@ - struct _GdkExposeInfo - { - Window window; -+ Window toplevel_window; - gboolean seen_nonmatching; - }; - -@@ -401,7 +402,9 @@ - * expose events. - */ - if (xevent->xany.type != Expose && -- xevent->xany.type != GravityNotify) -+ xevent->xany.type != GravityNotify && -+ (xevent->xany.type != ConfigureNotify || -+ xevent->xany.window == info->toplevel_window)) - { - info->seen_nonmatching = TRUE; - } -@@ -429,6 +432,7 @@ - GdkEvent event; - - info.window = xevent->xany.window; -+ info.toplevel_window = GDK_WINDOW_XWINDOW (gdk_window_get_toplevel (window)); - info.seen_nonmatching = FALSE; - - rect1.x = xevent->xexpose.x; -Index: gtk/Makefile.am -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v -retrieving revision 1.84.2.32 -retrieving revision 1.84.2.33 -diff -u -r1.84.2.32 -r1.84.2.33 ---- gtk/Makefile.am 2001/02/02 17:16:11 1.84.2.32 -+++ gtk/Makefile.am 2001/06/21 20:06:14 1.84.2.33 -@@ -374,9 +374,11 @@ - - - gtkconfdir = $(sysconfdir)/gtk --gtkconf_DATA = gtkrc.az gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja \ -- gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 \ -- gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \ -+gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \ -+ gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \ -+ gtkrc.utf-8 gtkrc.iso-8859-2 \ -+ gtkrc.iso-8859-3 gtkrc.iso-8859-5 gtkrc.iso-8859-7 \ -+ gtkrc.iso-8859-9 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \ - gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \ - gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \ - gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255 -Index: gtk/gtklabel.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtklabel.c,v -retrieving revision 1.48.2.3 -retrieving revision 1.48.2.4 -diff -u -r1.48.2.3 -r1.48.2.4 ---- gtk/gtklabel.c 2001/04/02 03:50:59 1.48.2.3 -+++ gtk/gtklabel.c 2001/04/11 20:22:27 1.48.2.4 -@@ -1004,7 +1004,7 @@ - *r = 0; - - result_str = gdk_wcstombs (string_wc); -- if (string) -+ if (result_str) - { - gtk_label_set_text_internal (label, result_str, string_wc); - gtk_label_set_pattern (label, pattern); -Index: gtk/gtklist.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtklist.c,v -retrieving revision 1.42.2.5 -retrieving revision 1.42.2.7 -diff -u -r1.42.2.5 -r1.42.2.7 ---- gtk/gtklist.c 2001/01/31 21:28:20 1.42.2.5 -+++ gtk/gtklist.c 2001/08/05 14:30:16 1.42.2.7 -@@ -1299,7 +1299,7 @@ - if (start_list->prev) - new_focus_child = start_list->prev->data; - else if (list->children) -- new_focus_child = list->children->prev->data; -+ new_focus_child = list->children->data; - - if (GTK_WIDGET_HAS_FOCUS (container->focus_child)) - grab_focus = TRUE; -@@ -1312,16 +1312,20 @@ - widget = tmp_list->data; - tmp_list = tmp_list->next; - -+ gtk_widget_ref (widget); -+ - if (widget->state == GTK_STATE_SELECTED) - gtk_list_unselect_child (list, widget); - -+ gtk_signal_disconnect_by_data (GTK_OBJECT (widget), (gpointer) list); -+ gtk_widget_unparent (widget); -+ - if (widget == list->undo_focus_child) - list->undo_focus_child = NULL; - if (widget == list->last_focus_child) - list->last_focus_child = NULL; - -- gtk_signal_disconnect_by_data (GTK_OBJECT (widget), (gpointer) list); -- gtk_widget_unparent (widget); -+ gtk_widget_unref (widget); - } - - g_list_free (start_list); -@@ -1431,6 +1435,7 @@ - widget = tmp_list->data; - tmp_list = tmp_list->next; - -+ gtk_widget_ref (widget); - if (no_unref) - gtk_widget_ref (widget); - -@@ -1449,14 +1454,16 @@ - } - } - -+ gtk_signal_disconnect_by_data (GTK_OBJECT (widget), (gpointer) list); -+ list->children = g_list_remove (list->children, widget); -+ gtk_widget_unparent (widget); -+ - if (widget == list->undo_focus_child) - list->undo_focus_child = NULL; - if (widget == list->last_focus_child) - list->last_focus_child = NULL; - -- gtk_signal_disconnect_by_data (GTK_OBJECT (widget), (gpointer) list); -- list->children = g_list_remove (list->children, widget); -- gtk_widget_unparent (widget); -+ gtk_widget_unref (widget); - } - - if (new_focus_child && new_focus_child != old_focus_child) -Index: gtk/gtkmenu.h -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtkmenu.h,v -retrieving revision 1.13.2.4 -retrieving revision 1.13.2.5 -diff -u -r1.13.2.4 -r1.13.2.5 ---- gtk/gtkmenu.h 2000/02/29 13:28:12 1.13.2.4 -+++ gtk/gtkmenu.h 2001/04/02 06:58:40 1.13.2.5 -@@ -21,7 +21,7 @@ - * Modified by the GTK+ Team and others 1997-1999. See the AUTHORS - * file for a list of people on the GTK+ Team. See the ChangeLog - * files for a list of changes. These files are distributed with -- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. -+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - - #ifndef __GTK_MENU_H__ -Index: gtk/gtkoptionmenu.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtkoptionmenu.c,v -retrieving revision 1.26.2.4 -retrieving revision 1.26.2.5 -diff -u -r1.26.2.4 -r1.26.2.5 ---- gtk/gtkoptionmenu.c 2001/02/12 22:40:02 1.26.2.4 -+++ gtk/gtkoptionmenu.c 2001/05/31 18:22:24 1.26.2.5 -@@ -342,30 +342,26 @@ - GtkWidget *child; - GtkAllocation child_allocation; - GtkOptionMenuProps props; -+ gint border_width; - -- g_return_if_fail (widget != NULL); -- g_return_if_fail (GTK_IS_OPTION_MENU (widget)); -- g_return_if_fail (allocation != NULL); -- - gtk_option_menu_get_props (GTK_OPTION_MENU (widget), &props); -+ border_width = GTK_CONTAINER (widget)->border_width; - - widget->allocation = *allocation; - if (GTK_WIDGET_REALIZED (widget)) - gdk_window_move_resize (widget->window, -- allocation->x, allocation->y, -- allocation->width, allocation->height); -+ allocation->x + border_width, allocation->y + border_width, -+ allocation->width - 2 * border_width, allocation->height - 2 * border_width); - - child = GTK_BIN (widget)->child; - if (child && GTK_WIDGET_VISIBLE (child)) - { -- child_allocation.x = (GTK_CONTAINER (widget)->border_width + -- GTK_WIDGET (widget)->style->klass->xthickness) + 1; -- child_allocation.y = (GTK_CONTAINER (widget)->border_width + -- GTK_WIDGET (widget)->style->klass->ythickness) + 1; -- child_allocation.width = MAX (1, (gint)allocation->width - child_allocation.x * 2 - -+ child_allocation.x = GTK_WIDGET (widget)->style->klass->xthickness + 1; -+ child_allocation.y = GTK_WIDGET (widget)->style->klass->ythickness + 1; -+ child_allocation.width = MAX (1, (gint)allocation->width - child_allocation.x * 2 - border_width * 2 - - props.indicator_width - props.indicator_left_spacing - props.indicator_right_spacing - - CHILD_LEFT_SPACING - CHILD_RIGHT_SPACING - 2); -- child_allocation.height = MAX (1, (gint)allocation->height - child_allocation.y * 2 - -+ child_allocation.height = MAX (1, (gint)allocation->height - child_allocation.y * 2 - border_width * 2 - - CHILD_TOP_SPACING - CHILD_BOTTOM_SPACING - 2); - child_allocation.x += CHILD_LEFT_SPACING; - child_allocation.y += CHILD_TOP_SPACING; -@@ -380,6 +376,7 @@ - { - GdkRectangle button_area; - GtkOptionMenuProps props; -+ gint border_width; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GTK_IS_OPTION_MENU (widget)); -@@ -388,11 +385,12 @@ - if (GTK_WIDGET_DRAWABLE (widget)) - { - gtk_option_menu_get_props (GTK_OPTION_MENU (widget), &props); -+ border_width = GTK_CONTAINER (widget)->border_width; - -- button_area.x = GTK_CONTAINER (widget)->border_width + 1; -- button_area.y = GTK_CONTAINER (widget)->border_width + 1; -- button_area.width = widget->allocation.width - button_area.x * 2; -- button_area.height = widget->allocation.height - button_area.y * 2; -+ button_area.x = 1; -+ button_area.y = 1; -+ button_area.width = widget->allocation.width - button_area.x * 2 - border_width * 2; -+ button_area.height = widget->allocation.height - button_area.y * 2 - border_width * 2; - - /* This is evil, and should be elimated here and in the button - * code. The point is to clear the focus, and make it -Index: gtk/gtkrc.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtkrc.c,v -retrieving revision 1.40.2.15 -retrieving revision 1.40.2.17 -diff -u -r1.40.2.15 -r1.40.2.17 ---- gtk/gtkrc.c 2001/03/15 06:25:54 1.40.2.15 -+++ gtk/gtkrc.c 2001/07/10 18:06:35 1.40.2.17 -@@ -24,6 +24,7 @@ - * GTK+ at ftp://ftp.gtk.org/pub/gtk/. - */ - -+#include <config.h> - #include <X11/Xlocale.h> /* so we get the right setlocale */ - #include <ctype.h> - #include <unistd.h> -@@ -33,6 +34,9 @@ - #include <string.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_CODESET -+#include <langinfo.h> -+#endif - - #include "gtkrc.h" - #include "gtkbindings.h" -@@ -440,7 +444,7 @@ - void - gtk_rc_init (void) - { -- static gchar *locale_suffixes[3]; -+ static gchar *locale_suffixes[8]; - static gint n_locale_suffixes = 0; - - gint i, j; -@@ -449,8 +453,6 @@ - - if (!initted) - { -- gint length; -- - char *locale = setlocale (LC_CTYPE, NULL); - char *p; - -@@ -470,38 +472,91 @@ - * We normalize the charset into a standard form, - * which has all '-' and '_' characters removed, - * and is lowercase. -+ * -+ * the search is done in that order: -+ * gtkrc.ll_cc.lowercasecodeset -+ * gtkrc.ll_cc.normalizedcodeset -+ * gtkrc.ll.lowercasecodeset -+ * gtkrc.ll.normalizedcodeset -+ * gtkrc.lowercasecodeset -+ * gtkrc.normalizedcodeset -+ * gtkrc.ll_cc -+ * gtkrc.ll -+ * - */ -- gchar *normalized_locale; -+ char *codeset = NULL; -+ char *normalized_codeset = NULL; -+ char *cc = NULL; -+ char *ll; -+ char *tmp = NULL; - - p = strchr (locale, '@'); -- length = p ? (p -locale) : strlen (locale); -+ if (p) -+ *p = '\0'; - -+#ifdef HAVE_CODESET -+ codeset = nl_langinfo (CODESET); -+#endif - p = strchr (locale, '.'); -+ if ((codeset==NULL) && (p)) -+ codeset = p+1; - if (p) -- { -- gchar *tmp1 = g_strndup (locale, p - locale + 1); -- gchar *tmp2 = _gtk_normalize_codeset (p + 1, length - (p - locale + 1)); -- -- normalized_locale = g_strconcat (tmp1, tmp2, NULL); -- g_free (tmp1); -- g_free (tmp2); -- -- locale_suffixes[n_locale_suffixes++] = g_strdup (normalized_locale); -- length = p - locale; -- } -- else -- normalized_locale = g_strndup (locale, length); -+ *p = '\0'; - -- p = strchr (normalized_locale, '_'); -- if (p) -+ if (codeset) - { -- locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length); -- length = p - normalized_locale; -+ /* if codeset is the result of nl_langinfo() it is -+ * read-only so we need to copy it to a rw place */ -+ tmp = g_strdup(codeset); -+ p = tmp; -+ -+ while (*p) -+ { -+ /* tolower not used, because some locales are not -+ * compatible with C locale in lowercasing ascii */ -+ if (*p >= 'A' && *p <= 'Z') -+ *p = (*p)-'A'+'a'; -+ p++; -+ } -+ codeset = tmp; -+ normalized_codeset = -+ _gtk_normalize_codeset(codeset, strlen(codeset)); -+ if (strcmp(normalized_codeset,codeset) == 0) -+ normalized_codeset = NULL; - } -- -- locale_suffixes[n_locale_suffixes++] = g_strndup (normalized_locale, length); -+ -+ p = strchr (locale, '_'); -+ if (p) { -+ cc = p+1; -+ *p = '\0'; -+ } -+ -+ ll = locale; -+ -+ if (cc && codeset) -+ locale_suffixes[n_locale_suffixes++] = -+ g_strdup ( g_strconcat(ll,"_",cc,".",codeset,NULL)); -+ if (cc && normalized_codeset) -+ locale_suffixes[n_locale_suffixes++] = -+ g_strdup ( g_strconcat(ll,"_",cc,".",normalized_codeset,NULL)); -+ if (codeset) -+ locale_suffixes[n_locale_suffixes++] = -+ g_strdup ( g_strconcat(ll,".",codeset,NULL)); -+ if (normalized_codeset) -+ locale_suffixes[n_locale_suffixes++] = -+ g_strdup ( g_strconcat(ll,".",normalized_codeset,NULL)); -+ if (codeset) -+ locale_suffixes[n_locale_suffixes++] = -+ g_strdup ( codeset ); -+ if (normalized_codeset) -+ locale_suffixes[n_locale_suffixes++] = -+ g_strdup ( normalized_codeset ); -+ if (cc) -+ locale_suffixes[n_locale_suffixes++] = -+ g_strdup ( g_strconcat(ll,"_",cc,NULL)); -+ locale_suffixes[n_locale_suffixes++] = g_strdup ( ll ); - -- g_free (normalized_locale); -+ if (tmp) g_free (tmp); - } - } - -Index: gtk/gtktypeutils.h -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtktypeutils.h,v -retrieving revision 1.45.2.1 -retrieving revision 1.45.2.2 -diff -u -r1.45.2.1 -r1.45.2.2 ---- gtk/gtktypeutils.h 2000/07/19 14:12:07 1.45.2.1 -+++ gtk/gtktypeutils.h 2001/07/24 20:42:20 1.45.2.2 -@@ -191,6 +191,13 @@ - GtkTypeClass *klass; - }; - -+#ifdef __GNUC__ -+struct _GtkTypeClassDummyAlign -+{ -+ GtkType type; -+ guint *signals; -+}; -+#endif /* __GNUC__ */ - - /* A GtkTypeClass defines the minimum structure requirements for - * a types class. Classes returned from gtk_type_class () and -@@ -203,7 +210,11 @@ - * one unique identifier per class. - */ - GtkType type; --}; -+} -+#ifdef __GNUC__ -+__attribute__ ((aligned (__alignof (struct _GtkTypeClassDummyAlign)))) -+#endif /* __GNUC__ */ -+; - - - struct _GtkArg -Index: gtk/gtkwindow.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtkwindow.c,v -retrieving revision 1.75.2.28 -retrieving revision 1.75.2.29 -diff -u -r1.75.2.28 -r1.75.2.29 ---- gtk/gtkwindow.c 2001/03/15 04:39:32 1.75.2.28 -+++ gtk/gtkwindow.c 2001/04/25 22:30:52 1.75.2.29 -@@ -985,7 +985,13 @@ - break; - case EnterNotify: - case LeaveNotify: -- if (xev->xcrossing.detail != NotifyInferior && -+ /* We only track the actual destination of keyboard events for real -+ * toplevels, not for embedded toplevels such as GtkPlug. The reason for -+ * this is that GtkPlug redirects events so the widget may effectively not -+ * have the focus even if it actually has the focus. -+ */ -+ if (gdk_window_get_parent (GTK_WIDGET (window)->window) == GDK_ROOT_PARENT () && -+ xev->xcrossing.detail != NotifyInferior && - xev->xcrossing.focus && !window->window_has_focus) - { - window->window_has_pointer_focus = (xev->xany.type == EnterNotify) ? TRUE : FALSE; -Index: gtk/testdnd.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/Attic/testdnd.c,v -retrieving revision 1.7.2.1 -retrieving revision 1.7.2.2 -diff -u -r1.7.2.1 -r1.7.2.2 ---- gtk/testdnd.c 1999/04/06 18:50:38 1.7.2.1 -+++ gtk/testdnd.c 2001/07/24 20:42:20 1.7.2.2 -@@ -312,6 +312,7 @@ - gtk_pixmap_set (GTK_PIXMAP (widget), trashcan_open, trashcan_open_mask); - } - -+ - source_widget = gtk_drag_get_source_widget (context); - g_print("motion, source %s\n", source_widget ? - gtk_type_name (GTK_OBJECT (source_widget)->klass->type) : -@@ -328,10 +329,19 @@ - gint y, - guint time) - { -+ GList *tmp_list; -+ - g_print("drop\n"); - have_drag = FALSE; - - gtk_pixmap_set (GTK_PIXMAP (widget), trashcan_closed, trashcan_closed_mask); -+ -+ tmp_list = context->targets; -+ while (tmp_list) -+ { -+ g_print ("%s\n", gdk_atom_name (GPOINTER_TO_UINT (tmp_list->data))); -+ tmp_list = tmp_list->next; -+ } - - if (context->targets) - { -Index: po/ChangeLog -=================================================================== -RCS file: /cvs/gnome/gtk+/po/ChangeLog,v -retrieving revision 1.16.2.64 -retrieving revision 1.16.2.70 -diff -u -r1.16.2.64 -r1.16.2.70 ---- po/ChangeLog 2001/03/27 20:12:43 1.16.2.64 -+++ po/ChangeLog 2001/08/14 08:03:49 1.16.2.70 -@@ -1,3 +1,30 @@ -+2001-08-14 Abel Cheung <maddog@linux.org.hk> -+ -+ * zh_TW.Big5.po: Updated traditional Chinese translation. -+ * zh_CN.GB2312.po: Updated simplified Chinese translation, -+ and added header. -+ -+2001-08-09 Zbigniew Chyla <cyba@gnome.pl> -+ -+ * pl.po: Updated Polish translation. -+ -+2001-08-01 Peteris Krisjanis <peterisk@apollo.lv> -+ -+ * lv.po: Added Latvian translation. -+ -+2001-07-24 Darin Adler <darin@bentspoon.com> -+ -+ * ta.po: Placeholder empty Tamil translation to make -+ things build until the real translation is committed. -+ -+2001-07-18 Zbigniew Chyla <cyba@gnome.pl> -+ -+ * pl.po: Updated Polish translation. -+ -+2001-06-26 Fatih Demir <kabalak@gtranslator.org> -+ -+ * ta.po: Added Tamil translation by Dinesh. -+ - 2001-03-27 Ole Laursen <olau@hardworking.dk> - - * da.po: Updated and fixed some issues in the Danish translation. -Index: po/ko.po -=================================================================== -RCS file: /cvs/gnome/gtk+/po/ko.po,v -retrieving revision 1.10.2.24 -retrieving revision 1.10.2.25 -diff -u -r1.10.2.24 -r1.10.2.25 ---- po/ko.po 2001/04/02 03:51:00 1.10.2.24 -+++ po/ko.po 2001/04/12 09:53:49 1.10.2.25 -@@ -3,10 +3,10 @@ - # Sung-Hyun Nam <namsh@lgic.co.kr>, 2000 - msgid "" - msgstr "" --"Project-Id-Version: gtk+ 1.2.9\n" --"POT-Creation-Date: 2001-03-28 16:12-0500\n" --"PO-Revision-Date: 2001-02-08 16:48+0900\n" --"Last-Translator: Sung-Hyun Nam <namsh@kldp.org>\n" -+"Project-Id-Version: gtk+ 1.2.10\n" -+"POT-Creation-Date: 2001-04-02 15:33+0900\n" -+"PO-Revision-Date: 2001-04-12 09:52+0900\n" -+"Last-Translator: Nam SungHyun <namsh@kldp.org>\n" - "Language-Team: Korean <ko@li.org>\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=euc-kr\n" -Index: po/pl.po -=================================================================== -RCS file: /cvs/gnome/gtk+/po/pl.po,v -retrieving revision 1.10.2.23 -retrieving revision 1.10.2.25 -diff -u -r1.10.2.23 -r1.10.2.25 ---- po/pl.po 2001/04/02 03:51:00 1.10.2.23 -+++ po/pl.po 2001/08/09 11:42:07 1.10.2.25 -@@ -1,83 +1,91 @@ -+# Copyright (C) 2001 Free Software Foundation, Inc. -+# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -+# Aktualn± wersjê tego pliku mo¿esz odnale¼æ w repozytorium cvs.gnome.pl -+# (:pserver:anonymous@cvs.gnome.pl:/home/cvs, puste has³o) -+# Je¶li masz jakiekolwiek uwagi odnosz±ce siê do t³umaczenia lub chcesz -+# pomóc w jego rozwijaniu i pielêgnowaniu, napisz do nas na adres: -+# translators@gnome.pl -+# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - msgid "" - msgstr "" - "Project-Id-Version: gtk+\n" --"POT-Creation-Date: 2001-03-28 16:12-0500\n" --"PO-Revision-Date: 1999-07-23 14:45+CET\n" --"Last-Translator: GNOME PL Team\n" --"Language-Team: Polish <gnomepl@pandora.info.bielsko.pl>\n" -+"POT-Creation-Date: 2001-08-09 13:42+0200\n" -+"PO-Revision-Date: 2001-08-09 13:37+0200\n" -+"Last-Translator: GNOME PL Team <translators@gnome.pl>\n" -+"Language-Team: Polish <pl@li.org>\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=iso-8859-2\n" - "Content-Transfer-Encoding: 8bit\n" - --#: gtk/gtkcolorsel.c:221 -+#: gtk/gtkcolorsel.c:1 - msgid "Hue:" - msgstr "Odcieñ:" - --#: gtk/gtkcolorsel.c:222 -+#: gtk/gtkcolorsel.c:1 - msgid "Saturation:" - msgstr "Nasycenie:" - --#: gtk/gtkcolorsel.c:223 -+#: gtk/gtkcolorsel.c:1 - msgid "Value:" - msgstr "Warto¶æ:" - --#: gtk/gtkcolorsel.c:224 -+#: gtk/gtkcolorsel.c:1 - msgid "Red:" - msgstr "Czerwony:" - --#: gtk/gtkcolorsel.c:225 -+#: gtk/gtkcolorsel.c:1 - msgid "Green:" - msgstr "Zielony:" - --#: gtk/gtkcolorsel.c:226 -+#: gtk/gtkcolorsel.c:1 - msgid "Blue:" - msgstr "Niebieski:" - --#: gtk/gtkcolorsel.c:227 -+#: gtk/gtkcolorsel.c:1 - msgid "Opacity:" --msgstr "Prze¼roczysto¶æ:" -+msgstr "Nieprzepuszczalno¶æ:" - - #. The OK button --#: gtk/gtkcolorsel.c:1727 gtk/gtkfilesel.c:481 gtk/gtkfontsel.c:3501 --#: gtk/gtkgamma.c:416 -+#: gtk/gtkcolorsel.c:1 gtk/gtkfilesel.c:1 gtk/gtkfontsel.c:1 -+#: gtk/gtkgamma.c:1 - msgid "OK" - msgstr "OK" - - #. The Cancel button --#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:488 gtk/gtkfilesel.c:868 --#: gtk/gtkfilesel.c:968 gtk/gtkfilesel.c:1083 gtk/gtkfontsel.c:3514 --#: gtk/gtkgamma.c:424 -+#: gtk/gtkcolorsel.c:1 gtk/gtkfilesel.c:1 gtk/gtkfilesel.c:1 -+#: gtk/gtkfilesel.c:1 gtk/gtkfilesel.c:1 gtk/gtkfontsel.c:1 -+#: gtk/gtkgamma.c:1 - msgid "Cancel" - msgstr "Anuluj" - --#: gtk/gtkcolorsel.c:1738 -+#: gtk/gtkcolorsel.c:1 - msgid "Help" - msgstr "Pomoc" - - #. The directories clist --#: gtk/gtkfilesel.c:430 -+#: gtk/gtkfilesel.c:1 - msgid "Directories" - msgstr "Katalogi" - - #. The files clist --#: gtk/gtkfilesel.c:449 -+#: gtk/gtkfilesel.c:1 - msgid "Files" - msgstr "Pliki" - --#: gtk/gtkfilesel.c:519 gtk/gtkfilesel.c:1478 -+#: gtk/gtkfilesel.c:1 gtk/gtkfilesel.c:1 - #, c-format - msgid "Directory unreadable: %s" - msgstr "Nie mo¿na odczytaæ katalogu: %s" - --#: gtk/gtkfilesel.c:551 -+#: gtk/gtkfilesel.c:1 - msgid "Create Dir" --msgstr "Utwórz katalog" -+msgstr "Stwórz katalog" - --#: gtk/gtkfilesel.c:562 gtk/gtkfilesel.c:937 -+#: gtk/gtkfilesel.c:1 gtk/gtkfilesel.c:1 - msgid "Delete File" - msgstr "Usuñ plik" - --#: gtk/gtkfilesel.c:573 gtk/gtkfilesel.c:1041 -+#: gtk/gtkfilesel.c:1 gtk/gtkfilesel.c:1 - msgid "Rename File" - msgstr "Zmieñ nazwê" - -@@ -86,377 +94,377 @@ - #. (GtkSignalFunc) gtk_file_selection_fileop_destroy, - #. (gpointer) fs); - #. --#: gtk/gtkfilesel.c:734 -+#: gtk/gtkfilesel.c:1 - msgid "Error" - msgstr "B³±d" - - #. close button --#: gtk/gtkfilesel.c:757 gtk/gtkinputdialog.c:354 -+#: gtk/gtkfilesel.c:1 gtk/gtkinputdialog.c:1 - msgid "Close" - msgstr "Zamknij" - --#: gtk/gtkfilesel.c:832 -+#: gtk/gtkfilesel.c:1 - msgid "Create Directory" --msgstr "Utwórz katalog" -+msgstr "Nowy katalog" - --#: gtk/gtkfilesel.c:846 -+#: gtk/gtkfilesel.c:1 - msgid "Directory name:" - msgstr "Nazwa katalogu:" - - #. buttons --#: gtk/gtkfilesel.c:859 -+#: gtk/gtkfilesel.c:1 - msgid "Create" - msgstr "Utwórz" - - #. buttons --#: gtk/gtkfilesel.c:959 -+#: gtk/gtkfilesel.c:1 - msgid "Delete" - msgstr "Usuñ" - - #. buttons --#: gtk/gtkfilesel.c:1074 -+#: gtk/gtkfilesel.c:1 - msgid "Rename" - msgstr "Zmieñ nazwê" - --#: gtk/gtkfilesel.c:1457 -+#: gtk/gtkfilesel.c:1 - msgid "Selection: " - msgstr "Wybór: " - --#: gtk/gtkfontsel.c:210 -+#: gtk/gtkfontsel.c:1 - msgid "Foundry:" - msgstr "Druk:" - --#: gtk/gtkfontsel.c:211 -+#: gtk/gtkfontsel.c:1 - msgid "Family:" - msgstr "Rodzina:" - --#: gtk/gtkfontsel.c:212 -+#: gtk/gtkfontsel.c:1 - msgid "Weight:" - msgstr "Pogrubienie:" - --#: gtk/gtkfontsel.c:213 -+#: gtk/gtkfontsel.c:1 - msgid "Slant:" - msgstr "Nachylenie:" - --#: gtk/gtkfontsel.c:214 -+#: gtk/gtkfontsel.c:1 - msgid "Set Width:" - msgstr "Ustaw szeroko¶æ:" - --#: gtk/gtkfontsel.c:215 -+#: gtk/gtkfontsel.c:1 - msgid "Add Style:" - msgstr "Dodaj styl:" - --#: gtk/gtkfontsel.c:216 -+#: gtk/gtkfontsel.c:1 - msgid "Pixel Size:" - msgstr "Rozmiar w pikselach:" - --#: gtk/gtkfontsel.c:217 -+#: gtk/gtkfontsel.c:1 - msgid "Point Size:" - msgstr "Rozmiar w punktach:" - --#: gtk/gtkfontsel.c:218 -+#: gtk/gtkfontsel.c:1 - msgid "Resolution X:" - msgstr "Rozdzielczo¶æ pozioma:" - --#: gtk/gtkfontsel.c:219 -+#: gtk/gtkfontsel.c:1 - msgid "Resolution Y:" - msgstr "Rozdzielczo¶æ pionowa:" - --#: gtk/gtkfontsel.c:220 -+#: gtk/gtkfontsel.c:1 - msgid "Spacing:" - msgstr "Odstêpy:" - --#: gtk/gtkfontsel.c:221 -+#: gtk/gtkfontsel.c:1 - msgid "Average Width:" - msgstr "¦rednia szeroko¶æ:" - --#: gtk/gtkfontsel.c:222 -+#: gtk/gtkfontsel.c:1 - msgid "Charset:" - msgstr "Kodowanie:" - - #. Number of internationalized titles here must match number - #. of NULL initializers above --#: gtk/gtkfontsel.c:459 -+#: gtk/gtkfontsel.c:1 - msgid "Font Property" - msgstr "W³a¶ciwo¶æ czcionki" - --#: gtk/gtkfontsel.c:460 -+#: gtk/gtkfontsel.c:1 - msgid "Requested Value" - msgstr "¯±dana warto¶æ" - --#: gtk/gtkfontsel.c:461 -+#: gtk/gtkfontsel.c:1 - msgid "Actual Value" - msgstr "Rzeczywista warto¶æ" - --#: gtk/gtkfontsel.c:494 -+#: gtk/gtkfontsel.c:1 - msgid "Font" - msgstr "Czcionka" - --#: gtk/gtkfontsel.c:504 gtk/gtkfontsel.c:2180 gtk/gtkfontsel.c:2410 -+#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1 - msgid "Font:" - msgstr "Czcionka:" - --#: gtk/gtkfontsel.c:509 -+#: gtk/gtkfontsel.c:1 - msgid "Font Style:" - msgstr "Styl czcionki:" - --#: gtk/gtkfontsel.c:514 -+#: gtk/gtkfontsel.c:1 - msgid "Size:" - msgstr "Rozmiar:" - --#: gtk/gtkfontsel.c:646 gtk/gtkfontsel.c:868 -+#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1 - msgid "Reset Filter" - msgstr "Wyczy¶æ filtr" - --#: gtk/gtkfontsel.c:660 -+#: gtk/gtkfontsel.c:1 - msgid "Metric:" - msgstr "Jednostki:" - --#: gtk/gtkfontsel.c:664 -+#: gtk/gtkfontsel.c:1 - msgid "Points" - msgstr "Punkty" - --#: gtk/gtkfontsel.c:671 -+#: gtk/gtkfontsel.c:1 - msgid "Pixels" - msgstr "Piksele" - - #. create the text entry widget --#: gtk/gtkfontsel.c:687 -+#: gtk/gtkfontsel.c:1 - msgid "Preview:" - msgstr "Podgl±d" - --#: gtk/gtkfontsel.c:716 -+#: gtk/gtkfontsel.c:1 - msgid "Font Information" - msgstr "Informacje o czcionce" - --#: gtk/gtkfontsel.c:749 -+#: gtk/gtkfontsel.c:1 - msgid "Requested Font Name:" - msgstr "¯±dana nazwa czcionki:" - --#: gtk/gtkfontsel.c:760 -+#: gtk/gtkfontsel.c:1 - msgid "Actual Font Name:" - msgstr "Rzeczywista nazwa czcionki:" - --#: gtk/gtkfontsel.c:771 -+#: gtk/gtkfontsel.c:1 - #, c-format - msgid "%i fonts available with a total of %i styles." - msgstr "dostêpnych czcionek: %i, liczba stylów : %i." - --#: gtk/gtkfontsel.c:786 -+#: gtk/gtkfontsel.c:1 - msgid "Filter" - msgstr "Filtr" - --#: gtk/gtkfontsel.c:799 -+#: gtk/gtkfontsel.c:1 - msgid "Font Types:" - msgstr "Typy czcionek:" - --#: gtk/gtkfontsel.c:807 -+#: gtk/gtkfontsel.c:1 - msgid "Bitmap" - msgstr "Bitmapowe" - --#: gtk/gtkfontsel.c:813 -+#: gtk/gtkfontsel.c:1 - msgid "Scalable" - msgstr "Skalowalne" - --#: gtk/gtkfontsel.c:819 -+#: gtk/gtkfontsel.c:1 - msgid "Scaled Bitmap" - msgstr "Skalowane bitmapy" - --#: gtk/gtkfontsel.c:890 -+#: gtk/gtkfontsel.c:1 - msgid "*" - msgstr "*" - - #. Convert '(nil)' weights to 'regular', since it looks nicer. --#: gtk/gtkfontsel.c:1215 -+#: gtk/gtkfontsel.c:1 - msgid "(nil)" - msgstr "(pusty)" - --#: gtk/gtkfontsel.c:1215 -+#: gtk/gtkfontsel.c:1 - msgid "regular" - msgstr "zwyk³e" - --#: gtk/gtkfontsel.c:1220 gtk/gtkfontsel.c:1972 -+#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1 - msgid "italic" - msgstr "italic" - --#: gtk/gtkfontsel.c:1221 gtk/gtkfontsel.c:1973 -+#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1 - msgid "oblique" - msgstr "pochylona" - --#: gtk/gtkfontsel.c:1222 gtk/gtkfontsel.c:1974 -+#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1 - msgid "reverse italic" - msgstr "odwrócony italic" - --#: gtk/gtkfontsel.c:1223 gtk/gtkfontsel.c:1975 -+#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1 - msgid "reverse oblique" - msgstr "odwrotnie pochylona" - --#: gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1976 -+#: gtk/gtkfontsel.c:1 gtk/gtkfontsel.c:1 - msgid "other" - msgstr "inne" - --#: gtk/gtkfontsel.c:1231 -+#: gtk/gtkfontsel.c:1 - msgid "[M]" - msgstr "[M]" - --#: gtk/gtkfontsel.c:1232 -+#: gtk/gtkfontsel.c:1 - msgid "[C]" - msgstr "[C]" - --#: gtk/gtkfontsel.c:1792 -+#: gtk/gtkfontsel.c:1 - msgid "The selected font is not available." - msgstr "Wybrana czcionka nie jest dostêpna." - --#: gtk/gtkfontsel.c:1798 -+#: gtk/gtkfontsel.c:1 - msgid "The selected font is not a valid font." - msgstr "Wybrana czcionka nie jest poprawna." - --#: gtk/gtkfontsel.c:1856 -+#: gtk/gtkfontsel.c:1 - msgid "This is a 2-byte font and may not be displayed correctly." - msgstr "Ta 2-bajtowa czcionka mo¿e nie byæ wy¶wietlana poprawnie." - --#: gtk/gtkfontsel.c:1960 gtk/gtkinputdialog.c:607 -+#: gtk/gtkfontsel.c:1 gtk/gtkinputdialog.c:1 - msgid "(unknown)" - msgstr "(nieznane)" - --#: gtk/gtkfontsel.c:1971 -+#: gtk/gtkfontsel.c:1 - msgid "roman" - msgstr "roman" - --#: gtk/gtkfontsel.c:1983 -+#: gtk/gtkfontsel.c:1 - msgid "proportional" - msgstr "proporcjonalne" - --#: gtk/gtkfontsel.c:1984 -+#: gtk/gtkfontsel.c:1 - msgid "monospaced" - msgstr "równomierne" - --#: gtk/gtkfontsel.c:1985 -+#: gtk/gtkfontsel.c:1 - msgid "char cell" - msgstr "rozmiaru znaku" - --#: gtk/gtkfontsel.c:2185 -+#: gtk/gtkfontsel.c:1 - msgid "Font: (Filter Applied)" - msgstr "Czcionka: (z zastosowaniem filtra)" - --#: gtk/gtkfontsel.c:2661 -+#: gtk/gtkfontsel.c:1 - msgid "MAX_FONTS exceeded. Some fonts may be missing." - msgstr "Przekroczono warto¶æ MAX_FONTS. Mo¿e brakowaæ pewnych czcionek." - --#: gtk/gtkfontsel.c:3508 -+#: gtk/gtkfontsel.c:1 - msgid "Apply" - msgstr "Zastosuj" - --#: gtk/gtkfontsel.c:3530 -+#: gtk/gtkfontsel.c:1 - msgid "Font Selection" - msgstr "Wybór czcionki" - --#: gtk/gtkgamma.c:396 -+#: gtk/gtkgamma.c:1 - msgid "Gamma" - msgstr "Gamma" - --#: gtk/gtkgamma.c:403 -+#: gtk/gtkgamma.c:1 - msgid "Gamma value" - msgstr "Warto¶æ gamma" - - #. shell and main vbox --#: gtk/gtkinputdialog.c:200 -+#: gtk/gtkinputdialog.c:1 - msgid "Input" - msgstr "Wej¶cie" - --#: gtk/gtkinputdialog.c:208 -+#: gtk/gtkinputdialog.c:1 - msgid "No input devices" - msgstr "Brak urz±dzeñ wej¶ciowych" - --#: gtk/gtkinputdialog.c:237 -+#: gtk/gtkinputdialog.c:1 - msgid "Device:" - msgstr "Urz±dzenie:" - --#: gtk/gtkinputdialog.c:253 -+#: gtk/gtkinputdialog.c:1 - msgid "Disabled" - msgstr "Wy³±czone" - --#: gtk/gtkinputdialog.c:261 -+#: gtk/gtkinputdialog.c:1 - msgid "Screen" - msgstr "Ekran" - --#: gtk/gtkinputdialog.c:269 -+#: gtk/gtkinputdialog.c:1 - msgid "Window" - msgstr "Okno" - --#: gtk/gtkinputdialog.c:277 -+#: gtk/gtkinputdialog.c:1 - msgid "Mode: " - msgstr "Tryb: " - - #. The axis listbox --#: gtk/gtkinputdialog.c:307 -+#: gtk/gtkinputdialog.c:1 - msgid "Axes" - msgstr "Osie" - - #. Keys listbox --#: gtk/gtkinputdialog.c:323 -+#: gtk/gtkinputdialog.c:1 - msgid "Keys" - msgstr "Klawisze" - - #. We create the save button in any case, so that clients can - #. connect to it, without paying attention to whether it exits --#: gtk/gtkinputdialog.c:345 -+#: gtk/gtkinputdialog.c:1 - msgid "Save" - msgstr "Zapisz" - --#: gtk/gtkinputdialog.c:500 -+#: gtk/gtkinputdialog.c:1 - msgid "X" - msgstr "X" - --#: gtk/gtkinputdialog.c:501 -+#: gtk/gtkinputdialog.c:1 - msgid "Y" - msgstr "Y" - --#: gtk/gtkinputdialog.c:502 -+#: gtk/gtkinputdialog.c:1 - msgid "Pressure" - msgstr "Nacisk" - --#: gtk/gtkinputdialog.c:503 -+#: gtk/gtkinputdialog.c:1 - msgid "X Tilt" - msgstr "Nachylenie poziome" - --#: gtk/gtkinputdialog.c:504 -+#: gtk/gtkinputdialog.c:1 - msgid "Y Tilt" - msgstr "Nachylenie pionowe" - --#: gtk/gtkinputdialog.c:544 -+#: gtk/gtkinputdialog.c:1 - msgid "none" - msgstr "brak" - --#: gtk/gtkinputdialog.c:578 gtk/gtkinputdialog.c:614 -+#: gtk/gtkinputdialog.c:1 gtk/gtkinputdialog.c:1 - msgid "(disabled)" --msgstr "(wy³±czone)" -+msgstr "(nieaktywne)" - - #. and clear button --#: gtk/gtkinputdialog.c:692 -+#: gtk/gtkinputdialog.c:1 - msgid "clear" - msgstr "wyczy¶æ" - --#: gtk/gtknotebook.c:2059 gtk/gtknotebook.c:4131 -+#: gtk/gtknotebook.c:1 gtk/gtknotebook.c:1 - #, c-format - msgid "Page %u" - msgstr "Strona %u" - --#: gtk/gtkrc.c:1703 -+#: gtk/gtkrc.c:1 - #, c-format - msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" --msgstr "Nie mo¿na odnale¼æ pliku z obrazem na ¶cie¿ce: \"%s\" wiersz %d" -+msgstr "Nie mo¿na odnale¼æ pliku z obrazem pod pixmap_path: \"%s\" wiersz %d" - --#: gtk/gtkrc.c:1706 -+#: gtk/gtkrc.c:1 - #, c-format - msgid "Unable to locate image file in pixmap_path: \"%s\"" --msgstr "Nie mo¿na odnale¼æ pliku z obrazem na ¶cie¿ce: \"%s\"" -+msgstr "Nie mo¿na odnale¼æ pliku z obrazem pod pixmap_path: \"%s\"" - --#: gtk/gtkthemes.c:79 -+#: gtk/gtkthemes.c:1 - #, c-format - msgid "Unable to locate loadable module in module_path: \"%s\"," --msgstr "Nie mo¿na odnale¼æ modu³u ³adowalnego na ¶cie¿ce: \"%s\"," -+msgstr "Nie mo¿na odnale¼æ modu³u ³adowalnego pod module_path: \"%s\"," - --#: gtk/gtktipsquery.c:180 -+#: gtk/gtktipsquery.c:1 - msgid "--- No Tip ---" - msgstr "--- Brak podpowiedzi ---" -Index: po/sl.po -=================================================================== -RCS file: /cvs/gnome/gtk+/po/sl.po,v -retrieving revision 1.1.2.27 -retrieving revision 1.1.2.28 -diff -u -r1.1.2.27 -r1.1.2.28 ---- po/sl.po 2001/04/02 03:51:01 1.1.2.27 -+++ po/sl.po 2001/05/02 02:22:12 1.1.2.28 -@@ -4,7 +4,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: GTK+ 1.2.8\n" --"POT-Creation-Date: 2001-03-28 16:12-0500\n" -+"POT-Creation-Date: 2000-05-19 07:11+0200\n" - "PO-Revision-Date: 2000-06-21 19:45+0200\n" - "Last-Translator: Miha Tom¹iè <miha.tomsic@guest.arnes.si>\n" - "Language-Team: slovenian <sl@li.org>\n" -@@ -41,14 +41,14 @@ - msgstr "Neprosojnost:" - - #. The OK button --#: gtk/gtkcolorsel.c:1727 gtk/gtkfilesel.c:481 gtk/gtkfontsel.c:3501 -+#: gtk/gtkcolorsel.c:1727 gtk/gtkfilesel.c:469 gtk/gtkfontsel.c:3492 - #: gtk/gtkgamma.c:416 - msgid "OK" - msgstr "Potrdi" - - #. The Cancel button --#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:488 gtk/gtkfilesel.c:868 --#: gtk/gtkfilesel.c:968 gtk/gtkfilesel.c:1083 gtk/gtkfontsel.c:3514 -+#: gtk/gtkcolorsel.c:1733 gtk/gtkfilesel.c:476 gtk/gtkfilesel.c:856 -+#: gtk/gtkfilesel.c:956 gtk/gtkfilesel.c:1071 gtk/gtkfontsel.c:3505 - #: gtk/gtkgamma.c:424 - msgid "Cancel" - msgstr "Preklièi" -@@ -58,29 +58,29 @@ - msgstr "Pomoè" - - #. The directories clist --#: gtk/gtkfilesel.c:430 -+#: gtk/gtkfilesel.c:418 - msgid "Directories" - msgstr "Imeniki" - - #. The files clist --#: gtk/gtkfilesel.c:449 -+#: gtk/gtkfilesel.c:437 - msgid "Files" - msgstr "Datoteke" - --#: gtk/gtkfilesel.c:519 gtk/gtkfilesel.c:1478 -+#: gtk/gtkfilesel.c:507 gtk/gtkfilesel.c:1466 - #, c-format - msgid "Directory unreadable: %s" - msgstr "Neberljiv imenik: %s" - --#: gtk/gtkfilesel.c:551 -+#: gtk/gtkfilesel.c:539 - msgid "Create Dir" - msgstr "Ustvari imenik" - --#: gtk/gtkfilesel.c:562 gtk/gtkfilesel.c:937 -+#: gtk/gtkfilesel.c:550 gtk/gtkfilesel.c:925 - msgid "Delete File" - msgstr "Zbri¹i datoteko" - --#: gtk/gtkfilesel.c:573 gtk/gtkfilesel.c:1041 -+#: gtk/gtkfilesel.c:561 gtk/gtkfilesel.c:1029 - msgid "Rename File" - msgstr "Preimenuj datoteko" - -@@ -89,39 +89,39 @@ - #. (GtkSignalFunc) gtk_file_selection_fileop_destroy, - #. (gpointer) fs); - #. --#: gtk/gtkfilesel.c:734 -+#: gtk/gtkfilesel.c:722 - msgid "Error" - msgstr "Napaka" - - #. close button --#: gtk/gtkfilesel.c:757 gtk/gtkinputdialog.c:354 -+#: gtk/gtkfilesel.c:745 gtk/gtkinputdialog.c:354 - msgid "Close" - msgstr "Zapri" - --#: gtk/gtkfilesel.c:832 -+#: gtk/gtkfilesel.c:820 - msgid "Create Directory" - msgstr "Ustvari imenik" - --#: gtk/gtkfilesel.c:846 -+#: gtk/gtkfilesel.c:834 - msgid "Directory name:" - msgstr "Ime imenika:" - - #. buttons --#: gtk/gtkfilesel.c:859 -+#: gtk/gtkfilesel.c:847 - msgid "Create" - msgstr "Ustvari" - - #. buttons --#: gtk/gtkfilesel.c:959 -+#: gtk/gtkfilesel.c:947 - msgid "Delete" - msgstr "Zbri¹i" - - #. buttons --#: gtk/gtkfilesel.c:1074 -+#: gtk/gtkfilesel.c:1062 - msgid "Rename" - msgstr "Preimenuj" - --#: gtk/gtkfilesel.c:1457 -+#: gtk/gtkfilesel.c:1445 - msgid "Selection: " - msgstr "Izbira: " - -@@ -195,7 +195,7 @@ - msgid "Font" - msgstr "Pisava" - --#: gtk/gtkfontsel.c:504 gtk/gtkfontsel.c:2180 gtk/gtkfontsel.c:2410 -+#: gtk/gtkfontsel.c:504 gtk/gtkfontsel.c:2181 gtk/gtkfontsel.c:2411 - msgid "Font:" - msgstr "Pisava:" - -@@ -278,23 +278,23 @@ - msgid "regular" - msgstr "navadno" - --#: gtk/gtkfontsel.c:1220 gtk/gtkfontsel.c:1972 -+#: gtk/gtkfontsel.c:1220 gtk/gtkfontsel.c:1973 - msgid "italic" - msgstr "kurzivna" - --#: gtk/gtkfontsel.c:1221 gtk/gtkfontsel.c:1973 -+#: gtk/gtkfontsel.c:1221 gtk/gtkfontsel.c:1974 - msgid "oblique" - msgstr "nagnjena" - --#: gtk/gtkfontsel.c:1222 gtk/gtkfontsel.c:1974 -+#: gtk/gtkfontsel.c:1222 gtk/gtkfontsel.c:1975 - msgid "reverse italic" - msgstr "obratno kurzivna" - --#: gtk/gtkfontsel.c:1223 gtk/gtkfontsel.c:1975 -+#: gtk/gtkfontsel.c:1223 gtk/gtkfontsel.c:1976 - msgid "reverse oblique" - msgstr "obratno nagnjena" - --#: gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1976 -+#: gtk/gtkfontsel.c:1224 gtk/gtkfontsel.c:1977 - msgid "other" - msgstr "ostalo" - -@@ -306,51 +306,51 @@ - msgid "[C]" - msgstr "[C]" - --#: gtk/gtkfontsel.c:1792 -+#: gtk/gtkfontsel.c:1793 - msgid "The selected font is not available." - msgstr "Izbrana pisava ni dostopna." - --#: gtk/gtkfontsel.c:1798 -+#: gtk/gtkfontsel.c:1799 - msgid "The selected font is not a valid font." - msgstr "Izbrana pisava je popaèena." - --#: gtk/gtkfontsel.c:1856 -+#: gtk/gtkfontsel.c:1857 - msgid "This is a 2-byte font and may not be displayed correctly." - msgstr "Ta pisava uporablja dvobajtni zapis in morda ne bo prikazana pravilno." - --#: gtk/gtkfontsel.c:1960 gtk/gtkinputdialog.c:607 -+#: gtk/gtkfontsel.c:1961 gtk/gtkinputdialog.c:607 - msgid "(unknown)" - msgstr "(neznano)" - --#: gtk/gtkfontsel.c:1971 -+#: gtk/gtkfontsel.c:1972 - msgid "roman" - msgstr "pokonèna" - --#: gtk/gtkfontsel.c:1983 -+#: gtk/gtkfontsel.c:1984 - msgid "proportional" - msgstr "proporcionalen" - --#: gtk/gtkfontsel.c:1984 -+#: gtk/gtkfontsel.c:1985 - msgid "monospaced" - msgstr "enakokoraèen" - --#: gtk/gtkfontsel.c:1985 -+#: gtk/gtkfontsel.c:1986 - msgid "char cell" - msgstr "celica znaka" - --#: gtk/gtkfontsel.c:2185 -+#: gtk/gtkfontsel.c:2186 - msgid "Font: (Filter Applied)" - msgstr "Pisava: (z uporabo filtra)" - --#: gtk/gtkfontsel.c:2661 -+#: gtk/gtkfontsel.c:2662 - msgid "MAX_FONTS exceeded. Some fonts may be missing." - msgstr "MAX_FONTS prese¾en. Nekatere pisave utegnejo manjkati." - --#: gtk/gtkfontsel.c:3508 -+#: gtk/gtkfontsel.c:3499 - msgid "Apply" - msgstr "Uporabi" - --#: gtk/gtkfontsel.c:3530 -+#: gtk/gtkfontsel.c:3521 - msgid "Font Selection" - msgstr "Izbor pisav" - -@@ -445,12 +445,12 @@ - msgid "Page %u" - msgstr "%u. stran" - --#: gtk/gtkrc.c:1703 -+#: gtk/gtkrc.c:1702 - #, c-format - msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" - msgstr "Ne najdem datoteke s sliko v poti pixmap_path: \"%s\" vrstica %d" - --#: gtk/gtkrc.c:1706 -+#: gtk/gtkrc.c:1705 - #, c-format - msgid "Unable to locate image file in pixmap_path: \"%s\"" - msgstr "Ne najdem datoteke s sliko v poti pixmap_path: \"%s\"" -Index: po/zh_CN.GB2312.po -=================================================================== -RCS file: /cvs/gnome/gtk+/po/Attic/zh_CN.GB2312.po,v -retrieving revision 1.5.4.4 -retrieving revision 1.5.4.5 -diff -u -r1.5.4.4 -r1.5.4.5 ---- po/zh_CN.GB2312.po 2001/04/02 03:51:01 1.5.4.4 -+++ po/zh_CN.GB2312.po 2001/08/14 08:03:50 1.5.4.5 -@@ -1,8 +1,12 @@ -+# simplified Chinese translation for gtk+ -+# Copyright (C) 1999-2001 Free Software Foundation, Inc. -+# Wu Yulun <migr@operamail.com>, 1999. -+# - msgid "" - msgstr "" --"Project-Id-Version: gtk+ 1.1.7 \n" -+"Project-Id-Version: gtk+ 1.2.10 \n" - "POT-Creation-Date: 2001-03-28 16:12-0500\n" --"PO-Revision-Date: 1999-01-31\n" -+"PO-Revision-Date: 2001-08-14 15:59+0800\n" - "Last-Translator: Wu Yulun <migr@operamail.com>\n" - "Language-Team: Chinese <zh@li.org>\n" - "MIME-Version: 1.0\n" -@@ -269,7 +273,7 @@ - #. Convert '(nil)' weights to 'regular', since it looks nicer. - #: gtk/gtkfontsel.c:1215 - msgid "(nil)" --msgstr "" -+msgstr "(ÎÞ)" - - #: gtk/gtkfontsel.c:1215 - msgid "regular" -@@ -297,11 +301,11 @@ - - #: gtk/gtkfontsel.c:1231 - msgid "[M]" --msgstr "" -+msgstr "[M]" - - #: gtk/gtkfontsel.c:1232 - msgid "[C]" --msgstr "" -+msgstr "[C]" - - #: gtk/gtkfontsel.c:1792 - msgid "The selected font is not available." -@@ -406,11 +410,11 @@ - - #: gtk/gtkinputdialog.c:500 - msgid "X" --msgstr "" -+msgstr "X" - - #: gtk/gtkinputdialog.c:501 - msgid "Y" --msgstr "" -+msgstr "Y" - - #: gtk/gtkinputdialog.c:502 - msgid "Pressure" -Index: po/zh_TW.Big5.po -=================================================================== -RCS file: /cvs/gnome/gtk+/po/Attic/zh_TW.Big5.po,v -retrieving revision 1.1.2.19 -retrieving revision 1.1.2.20 -diff -u -r1.1.2.19 -r1.1.2.20 ---- po/zh_TW.Big5.po 2001/04/02 03:51:01 1.1.2.19 -+++ po/zh_TW.Big5.po 2001/08/14 08:03:50 1.1.2.20 -@@ -1,44 +1,45 @@ --# SOME DESCRIPTIVE TITLE. --# Copyright (C) YEAR Free Software Foundation, Inc. -+# traditional Chinese translation for gtk+ -+# Copyright (C) 1999-2001 Free Software Foundation, Inc. - # ¨¯¥ß¤¯ <hsin@med.cgu.edu.tw>, 1999. -+# - msgid "" - msgstr "" --"Project-Id-Version: gtk+ 1.1.7 \n" --"POT-Creation-Date: 2001-03-28 16:12-0500\n" --"PO-Revision-Date: 1999-01-31 19:33+0800\n" --"Last-Translator: ¨¯¥ß¤¯ <hsin@med.cgu.edu.tw>\n" --"Language-Team: Chinese <zh@li.org>\n" -+"Project-Id-Version: gtk+ 1.2.10 \n" -+"POT-Creation-Date: 2001-08-14 15:40+0800\n" -+"PO-Revision-Date: 2001-08-14 15:53+0800\n" -+"Last-Translator: Abel Cheung <maddog@linux.org.hk>\n" -+"Language-Team: traditional Chinese <zh-l10n@linux.org.hk>\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=big5\n" - "Content-Transfer-Encoding: 8bit\n" - - #: gtk/gtkcolorsel.c:221 - msgid "Hue:" --msgstr "¦â¬Û:" -+msgstr "¦â¬Û¡G" - - #: gtk/gtkcolorsel.c:222 - msgid "Saturation:" --msgstr "±m«×:" -+msgstr "±m«×¡G" - - #: gtk/gtkcolorsel.c:223 - msgid "Value:" --msgstr "©ú«×:" -+msgstr "©ú«×¡G" - - #: gtk/gtkcolorsel.c:224 - msgid "Red:" --msgstr "¬õ:" -+msgstr "¬õ¡G" - - #: gtk/gtkcolorsel.c:225 - msgid "Green:" --msgstr "ºñ:" -+msgstr "ºñ¡G" - - #: gtk/gtkcolorsel.c:226 - msgid "Blue:" --msgstr "ÂÅ:" -+msgstr "ÂÅ¡G" - - #: gtk/gtkcolorsel.c:227 - msgid "Opacity:" --msgstr "¤£³z©ú«×:" -+msgstr "¤£³z©ú«×¡G" - - #. The OK button - #: gtk/gtkcolorsel.c:1727 gtk/gtkfilesel.c:481 gtk/gtkfontsel.c:3501 -@@ -55,7 +56,7 @@ - - #: gtk/gtkcolorsel.c:1738 - msgid "Help" --msgstr "¨D§U" -+msgstr "»¡©ú" - - #. The directories clist - #: gtk/gtkfilesel.c:430 -@@ -70,11 +71,11 @@ - #: gtk/gtkfilesel.c:519 gtk/gtkfilesel.c:1478 - #, c-format - msgid "Directory unreadable: %s" --msgstr "µLªkŪ¨ú¥Ø¿ý: %s" -+msgstr "µLªkŪ¨ú¥Ø¿ý¡G%s" - - #: gtk/gtkfilesel.c:551 - msgid "Create Dir" --msgstr "·s¼W¥Ø¿ý" -+msgstr "«Ø¥ß¥Ø¿ý" - - #: gtk/gtkfilesel.c:562 gtk/gtkfilesel.c:937 - msgid "Delete File" -@@ -82,7 +83,7 @@ - - #: gtk/gtkfilesel.c:573 gtk/gtkfilesel.c:1041 - msgid "Rename File" --msgstr "«·s©R¦W" -+msgstr "§ó§ïÀɦW" - - #. - #. gtk_signal_connect (GTK_OBJECT (dialog), "destroy", -@@ -100,16 +101,16 @@ - - #: gtk/gtkfilesel.c:832 - msgid "Create Directory" --msgstr "·s¼W¥Ø¿ý" -+msgstr "«Ø¥ß¥Ø¿ý" - - #: gtk/gtkfilesel.c:846 - msgid "Directory name:" --msgstr "¥Ø¿ý¦WºÙ:" -+msgstr "¥Ø¿ý¦WºÙ¡G" - - #. buttons - #: gtk/gtkfilesel.c:859 - msgid "Create" --msgstr "·s¼W" -+msgstr "«Ø¥ß" - - #. buttons - #: gtk/gtkfilesel.c:959 -@@ -119,69 +120,69 @@ - #. buttons - #: gtk/gtkfilesel.c:1074 - msgid "Rename" --msgstr "§ó·s" -+msgstr "§ï¦W" - - #: gtk/gtkfilesel.c:1457 - msgid "Selection: " --msgstr "¦r«¬¿ï¶µ: " -+msgstr "¿ï¾Ü¡G" - - #: gtk/gtkfontsel.c:210 - msgid "Foundry:" --msgstr "´£¨Ñ:" -+msgstr "´£¨Ñ¡G" - - #: gtk/gtkfontsel.c:211 - msgid "Family:" --msgstr "¦rÅé:" -+msgstr "¦rÅé¡G" - - #: gtk/gtkfontsel.c:212 - msgid "Weight:" --msgstr "¤j¤p:" -+msgstr "¤j¤p¡G" - - #: gtk/gtkfontsel.c:213 - msgid "Slant:" --msgstr "±×Åé:" -+msgstr "±×Åé¡G" - - #: gtk/gtkfontsel.c:214 - msgid "Set Width:" --msgstr "¼e«×:" -+msgstr "¼e«×¡G" - - #: gtk/gtkfontsel.c:215 - msgid "Add Style:" --msgstr "¼W¥[§Î¦¡:" -+msgstr "¼W¥[´Ú¦¡¡G" - - #: gtk/gtkfontsel.c:216 - msgid "Pixel Size:" --msgstr "¹³¯À¤j¤p:" -+msgstr "¹³¯À¤j¤p¡G" - - #: gtk/gtkfontsel.c:217 - msgid "Point Size:" --msgstr "ÂI°}¤j¤p:" -+msgstr "ÂI°}¤j¤p¡G" - - #: gtk/gtkfontsel.c:218 - msgid "Resolution X:" --msgstr "X ¸ÑªR«×:" -+msgstr "X ¸ÑªR«×¡G" - - #: gtk/gtkfontsel.c:219 - msgid "Resolution Y:" --msgstr "Y ¸ÑªR«×:" -+msgstr "Y ¸ÑªR«×¡G" - - #: gtk/gtkfontsel.c:220 - msgid "Spacing:" --msgstr "¶¡¶Z:" -+msgstr "¶¡¶Z¡G" - - #: gtk/gtkfontsel.c:221 - msgid "Average Width:" --msgstr "¥§¡¼e«×:" -+msgstr "¥§¡¼e«×¡G" - - #: gtk/gtkfontsel.c:222 - msgid "Charset:" --msgstr "¦r¶°:" -+msgstr "¦r¶°¡G" - - #. Number of internationalized titles here must match number - #. of NULL initializers above - #: gtk/gtkfontsel.c:459 - msgid "Font Property" --msgstr "¦r«¬ÄÝ©Ê" -+msgstr "¦r«¬¯S©Ê" - - #: gtk/gtkfontsel.c:460 - msgid "Requested Value" -@@ -197,15 +198,15 @@ - - #: gtk/gtkfontsel.c:504 gtk/gtkfontsel.c:2180 gtk/gtkfontsel.c:2410 - msgid "Font:" --msgstr "¦r«¬:" -+msgstr "¦r«¬¡G" - - #: gtk/gtkfontsel.c:509 - msgid "Font Style:" --msgstr "¦r«¬¼Ë¦¡:" -+msgstr "¦r«¬´Ú¦¡¡G" - - #: gtk/gtkfontsel.c:514 - msgid "Size:" --msgstr "¤j¤p:" -+msgstr "¤j¤p¡G" - - #: gtk/gtkfontsel.c:646 gtk/gtkfontsel.c:868 - msgid "Reset Filter" -@@ -213,7 +214,7 @@ - - #: gtk/gtkfontsel.c:660 - msgid "Metric:" --msgstr "«×¶q:" -+msgstr "«×¶q¡G" - - #: gtk/gtkfontsel.c:664 - msgid "Points" -@@ -226,7 +227,7 @@ - #. create the text entry widget - #: gtk/gtkfontsel.c:687 - msgid "Preview:" --msgstr "¹wÄý:" -+msgstr "¹wÄý¡G" - - #: gtk/gtkfontsel.c:716 - msgid "Font Information" -@@ -234,16 +235,16 @@ - - #: gtk/gtkfontsel.c:749 - msgid "Requested Font Name:" --msgstr "n¨Dªº¦r«¬¦WºÙ:" -+msgstr "n¨Dªº¦r«¬¦WºÙ¡G" - - #: gtk/gtkfontsel.c:760 - msgid "Actual Font Name:" --msgstr "¹ê»Ú¦r«¬¦WºÙ:" -+msgstr "¹ê»Ú¦r«¬¦WºÙ¡G" - - #: gtk/gtkfontsel.c:771 - #, c-format - msgid "%i fonts available with a total of %i styles." --msgstr "¦³ %i ºØ¦r«¬¨Ñ¿ï¥Î(¦@ %i ºØ¼Ë¦¡)" -+msgstr "¦³ %i ºØ¦r«¬¥i¿ï¥Î¡A¦@ %i ºØ¼Ë¦¡¡C" - - #: gtk/gtkfontsel.c:786 - msgid "Filter" -@@ -251,7 +252,7 @@ - - #: gtk/gtkfontsel.c:799 - msgid "Font Types:" --msgstr "¦r«¬ºØÃþ:" -+msgstr "¦r«¬ºØÃþ¡G" - - #: gtk/gtkfontsel.c:807 - msgid "Bitmap" -@@ -272,7 +273,7 @@ - #. Convert '(nil)' weights to 'regular', since it looks nicer. - #: gtk/gtkfontsel.c:1215 - msgid "(nil)" --msgstr "" -+msgstr "(µL)" - - #: gtk/gtkfontsel.c:1215 - msgid "regular" -@@ -300,11 +301,11 @@ - - #: gtk/gtkfontsel.c:1231 - msgid "[M]" --msgstr "" -+msgstr "[M]" - - #: gtk/gtkfontsel.c:1232 - msgid "[C]" --msgstr "" -+msgstr "[C]" - - #: gtk/gtkfontsel.c:1792 - msgid "The selected font is not available." -@@ -328,11 +329,11 @@ - - #: gtk/gtkfontsel.c:1983 - msgid "proportional" --msgstr "¦¨¤ñ¨Òªº" -+msgstr "¦¨¤ñ¨Ò" - - #: gtk/gtkfontsel.c:1984 - msgid "monospaced" --msgstr "©w¼e«×ªº" -+msgstr "©T©w¼e«×" - - #: gtk/gtkfontsel.c:1985 - msgid "char cell" -@@ -340,11 +341,11 @@ - - #: gtk/gtkfontsel.c:2185 - msgid "Font: (Filter Applied)" --msgstr "¦r«¬: (±Ä¥Î¹LÂo¾¹)" -+msgstr "¦r«¬¡G(®M¥Î¹LÂo¾¹)" - - #: gtk/gtkfontsel.c:2661 - msgid "MAX_FONTS exceeded. Some fonts may be missing." --msgstr "¤w¶W¥X MAX_FONTS ,¥i¯à¿ò¥¢¬Y¨Ç¦r«¬¡C" -+msgstr "¤w¶W¥X MAX_FONTS¡A¥i¯à¿ò¥¢¬Y¨Ç¦r«¬¡C" - - #: gtk/gtkfontsel.c:3508 - msgid "Apply" -@@ -369,11 +370,11 @@ - - #: gtk/gtkinputdialog.c:208 - msgid "No input devices" --msgstr "¯Ê¤Ö¿é¤J¸Ë¸m" -+msgstr "¨S¦³¿é¤J¸Ë¸m" - - #: gtk/gtkinputdialog.c:237 - msgid "Device:" --msgstr "¸Ë¸m:" -+msgstr "¸Ë¸m¡G" - - #: gtk/gtkinputdialog.c:253 - msgid "Disabled" -@@ -389,7 +390,7 @@ - - #: gtk/gtkinputdialog.c:277 - msgid "Mode: " --msgstr "¼Ò¦¡:" -+msgstr "¼Ò¦¡¡G" - - #. The axis listbox - #: gtk/gtkinputdialog.c:307 -@@ -399,7 +400,7 @@ - #. Keys listbox - #: gtk/gtkinputdialog.c:323 - msgid "Keys" --msgstr "Áä¶s" -+msgstr "Áä" - - #. We create the save button in any case, so that clients can - #. connect to it, without paying attention to whether it exits -@@ -409,11 +410,11 @@ - - #: gtk/gtkinputdialog.c:500 - msgid "X" --msgstr "" -+msgstr "X" - - #: gtk/gtkinputdialog.c:501 - msgid "Y" --msgstr "" -+msgstr "Y" - - #: gtk/gtkinputdialog.c:502 - msgid "Pressure" -@@ -445,21 +446,21 @@ - msgid "Page %u" - msgstr "²Ä %u ¶" - --#: gtk/gtkrc.c:1703 -+#: gtk/gtkrc.c:1758 - #, c-format - msgid "Unable to locate image file in pixmap_path: \"%s\" line %d" --msgstr "µLªk¥Ñ pixmap_path §ä¨ì¹ÏÀÉ: \"%s\" ²Ä %d ¦æ" -+msgstr "µLªk¥Ñ pixmap_path §ä¨ì¹ÏÀÉ¡G\"%s\" ²Ä %d ¦æ" - --#: gtk/gtkrc.c:1706 -+#: gtk/gtkrc.c:1761 - #, c-format - msgid "Unable to locate image file in pixmap_path: \"%s\"" --msgstr "µLªk¥Ñ pixmap_path §ä¨ì¹ÏÀÉ: \"%s\"" -+msgstr "µLªk¥Ñ pixmap_path §ä¨ì¹ÏÀÉ¡G\"%s\"" - - #: gtk/gtkthemes.c:79 - #, c-format - msgid "Unable to locate loadable module in module_path: \"%s\"," --msgstr "µLªk¥Ñ module_path §ä¨ì¥i¸ü¤J¼Ò²Õ: \"%s\"," -+msgstr "µLªk¥Ñ module_path §ä¨ì¥i¸ü¤J¼Ò²Õ¡G\"%s\"¡A" - - #: gtk/gtktipsquery.c:180 - msgid "--- No Tip ---" --msgstr "--- ¤wµL´£¥Ü ---" -+msgstr "--- µL´£¥Ü ---" diff --git a/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild deleted file mode 100644 index 99f877f6727a..000000000000 --- a/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-1.2.10-r8.ebuild,v 1.17 2003/02/13 16:56:04 vapier Exp $ - -IUSE="nls" - -S=${WORKDIR}/${P} -DESCRIPTION="The GIMP Toolkit" -HOMEPAGE="http://www.gtk.org/" -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v1.2/${P}.tar.gz - ftp://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${P}.tar.gz - http://ftp.gnome.org/pub/GNOME/stable/sources/gtk+/${P}.tar.gz - http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2" - -DEPEND="virtual/x11 - =dev-libs/glib-1.2* - nls? ( sys-devel/gettext - dev-util/intltool )" - -SLOT="1" -LICENSE="LGPL-2.1" -KEYWORDS="x86 ppc sparc alpha" - -src_unpack() { - - unpack ${P}.tar.gz - - cd ${S}/.. - bzcat ${DISTDIR}/gtk+-1.2.10-r8-gentoo.diff.bz2 | patch -p0 - -} - -src_compile() { - - libtoolize --copy --force - - local myconf - use nls || myconf="${myconf} --disable-nls" - - if [ "${DEBUGBUILD}" ] - then - myconf="${myconf} --enable-debug=yes" - else - myconf="${myconf} --enable-debug=no" - fi - - econf \ - --sysconfdir=/etc/X11 \ - --with-xinput=xfree \ - --with-x \ - ${myconf} || die - - emake || die -} - -src_install() { - - make install DESTDIR=${D} || die - - preplib /usr - - dodoc AUTHORS COPYING ChangeLog* HACKING - dodoc NEWS* README* TODO - docinto docs - cd docs - dodoc *.txt *.gif text/* - dohtml -r html - - #install nice, clean-looking gtk+ style - insinto /usr/share/themes/Gentoo/gtk - doins ${FILESDIR}/gtkrc -} - -pkg_postinst() { - ewarn "Older versions added /etc/X11/gtk/gtkrc which changed settings for" - ewarn "all themes it seems. Please remove it manually as it will not due" - ewarn "to /env protection." - echo "" - einfo "The old gtkrc is available through the new Gentoo gtk theme." -} diff --git a/x11-libs/gtk+/gtk+-2.0.6-r3.ebuild b/x11-libs/gtk+/gtk+-2.0.6-r3.ebuild deleted file mode 100644 index 8e8b1cbabdc3..000000000000 --- a/x11-libs/gtk+/gtk+-2.0.6-r3.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.6-r3.ebuild,v 1.6 2003/02/13 16:56:16 vapier Exp $ - -IUSE="tiff doc jpeg directfb" - -inherit libtool flag-o-matic - -SLOT="2" -KEYWORDS="~x86 ~ppc sparc ~alpha" - -S=${WORKDIR}/${P} -DESCRIPTION="Gimp ToolKit + " -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2 - mirror://gentoo//${PN}-directfb-${PV}-gentoo.patch.bz2" -HOMEPAGE="http://www.gtk.org/" -LICENSE="LGPL-2.1" - -RDEPEND="virtual/x11 - >=dev-libs/glib-2.0.6-r1 - >=dev-libs/atk-1.0.3-r1 - >=x11-libs/pango-1.0.4-r1 - >=media-libs/libpng-1.2.1 - jpeg? ( >=media-libs/jpeg-6b-r2 ) - tiff? ( >=media-libs/tiff-3.5.7 ) - directfb? ( >=dev-libs/DirectFB-0.9.13 )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12.0 - doc? ( >=dev-util/gtk-doc-0.9 )" - -src_unpack() { - - unpack ${P}.tar.bz2 - cd ${S} - if use directfb - then - bzcat ${DISTDIR}/${PN}-directfb-${PV}-gentoo.patch.bz2 | patch -p1 \ - || die - fi -} - -src_compile() { - # see bug 8762 - replace-flags "-O3" "-O2" - - elibtoolize - - local myconf="" - use doc \ - && myconf="${myconf} --enable-gtk-doc" \ - || myconf="${myconf} --disable-gtk-doc" - use jpeg || myconf="${myconf} --without-libjpeg" - use tiff || myconf="${myconf} --without-libtiff" - if [ -n "$DEBUGBUILD" ]; then - myconf="${myconf} --enable-debug" - fi - - econf --with-gdktarget=x11 ${myconf} || die - -# gtk+ isn't multithread friendly due to some obscure code generation bug - make || die -} - -src_install() { - dodir /etc/gtk-2.0 - make DESTDIR=${D} \ - prefix=/usr \ - sysconfdir=/etc \ - infodir=/usr/share/info \ - mandir=/usr/share/man \ - install || die - dodoc AUTHORS COPYING ChangeLog* HACKING* INSTALL NEWS* README* TODO -} - - -pkg_postinst() { - gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules -} - diff --git a/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild b/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild deleted file mode 100644 index 28b4a5f2e84f..000000000000 --- a/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.7-r1.ebuild,v 1.6 2003/02/13 16:56:21 vapier Exp $ - -IUSE="tiff doc jpeg" - -inherit libtool flag-o-matic - -SLOT="2" -KEYWORDS="~x86 ~ppc ~sparc ~alpha" - -S=${WORKDIR}/${P} -DESCRIPTION="Gimp ToolKit + " -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2" -HOMEPAGE="http://www.gtk.org/" -LICENSE="LGPL-2.1" - -RDEPEND="virtual/x11 - >=dev-libs/glib-2.0.6 - >=dev-libs/atk-1.0.3-r1 - >=x11-libs/pango-1.0.4-r1 - >=media-libs/libpng-1.2.1 - jpeg? ( >=media-libs/jpeg-6b-r2 ) - tiff? ( >=media-libs/tiff-3.5.7 ) - directfb? ( >=dev-libs/DirectFB-0.9.13 )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12.0 - doc? ( >=dev-util/gtk-doc-0.9 - app-text/sgmltools-lite )" - -src_unpack() { - unpack ${A} - # fix a typo in gdk-pixbuf source - patch -d ${S} -p1 < ${FILESDIR}/gentoo-${P}-gdk-pixbuf.patch -} - -src_compile() { - # see bug 8762 - replace-flags "-O3" "-O2" - - elibtoolize - - local myconf="" - use doc \ - && myconf="${myconf} --enable-gtk-doc" \ - || myconf="${myconf} --disable-gtk-doc" - use jpeg || myconf="${myconf} --without-libjpeg" - use tiff || myconf="${myconf} --without-libtiff" - if [ -n "$DEBUGBUILD" ]; then - myconf="${myconf} --enable-debug" - fi - - econf --with-gdktarget=x11 ${myconf} || die - -# gtk+ isn't multithread friendly due to some obscure code generation bug - make || die -} - -src_install() { - dodir /etc/gtk-2.0 - make DESTDIR=${D} \ - prefix=/usr \ - sysconfdir=/etc \ - infodir=/usr/share/info \ - mandir=/usr/share/man \ - install || die - dodoc AUTHORS COPYING ChangeLog* HACKING* INSTALL NEWS* README* TODO -} - - -pkg_postinst() { - gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules -} - diff --git a/x11-libs/gtk+/gtk+-2.0.8-r1.ebuild b/x11-libs/gtk+/gtk+-2.0.8-r1.ebuild deleted file mode 100644 index ce7a27a930bd..000000000000 --- a/x11-libs/gtk+/gtk+-2.0.8-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.8-r1.ebuild,v 1.6 2003/02/13 16:56:27 vapier Exp $ - -inherit libtool flag-o-matic - -IUSE="tiff doc jpeg directfb" - -S=${WORKDIR}/${P} -DESCRIPTION="Gimp ToolKit + " -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2 - directfb? mirror://gentoo/${PN}-directfb-${PV}-gentoo.bz2" -HOMEPAGE="http://www.gtk.org/" - -SLOT="2" -LICENSE="LGPL-2.1" -KEYWORDS="~x86 ~ppc ~sparc ~alpha" - -RDEPEND="virtual/x11 - >=dev-libs/glib-2.0.7 - >=dev-libs/atk-1.0.3-r1 - >=x11-libs/pango-1.0.4-r1 - >=media-libs/libpng-1.2.1 - jpeg? ( >=media-libs/jpeg-6b-r2 ) - tiff? ( >=media-libs/tiff-3.5.7 )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12.0 - doc? ( >=dev-util/gtk-doc-0.9 - app-text/sgmltools-lite )" - -src_unpack() { - unpack ${A} - if use directfb - then - patch -p0 < ${PN}-directfb-${PV}-gentoo || die - fi -} - -src_compile() { - # see bug 8762 - replace-flags "-O3" "-O2" - - elibtoolize - - local myconf="" - use doc \ - && myconf="${myconf} --enable-gtk-doc" \ - || myconf="${myconf} --disable-gtk-doc" - use jpeg || myconf="${myconf} --without-libjpeg" - use tiff || myconf="${myconf} --without-libtiff" - if [ -n "$DEBUGBUILD" ]; then - myconf="${myconf} --enable-debug" - fi - - econf --with-gdktarget=x11 ${myconf} || die - -# gtk+ isn't multithread friendly due to some obscure code generation bug - make || die -} - -src_install() { - dodir /etc/gtk-2.0 - make DESTDIR=${D} \ - prefix=/usr \ - sysconfdir=/etc \ - infodir=/usr/share/info \ - mandir=/usr/share/man \ - install || die - dodoc AUTHORS COPYING ChangeLog* HACKING* INSTALL NEWS* README* TODO -} - - -pkg_postinst() { - gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules -} - diff --git a/x11-libs/gtk+/gtk+-2.0.8.ebuild b/x11-libs/gtk+/gtk+-2.0.8.ebuild deleted file mode 100644 index 426ccf6f34f8..000000000000 --- a/x11-libs/gtk+/gtk+-2.0.8.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.8.ebuild,v 1.9 2003/02/13 16:56:33 vapier Exp $ - -IUSE="tiff doc jpeg" - -inherit libtool flag-o-matic - -SLOT="2" -KEYWORDS="x86 ppc ~sparc alpha" - -S=${WORKDIR}/${P} -DESCRIPTION="Gimp ToolKit + " -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2" -HOMEPAGE="http://www.gtk.org/" -LICENSE="LGPL-2.1" - -RDEPEND="virtual/x11 - >=dev-libs/glib-2.0.7 - >=dev-libs/atk-1.0.3-r1 - >=x11-libs/pango-1.0.4-r1 - >=media-libs/libpng-1.2.1 - jpeg? ( >=media-libs/jpeg-6b-r2 ) - tiff? ( >=media-libs/tiff-3.5.7 )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12.0 - doc? ( >=dev-util/gtk-doc-0.9 - app-text/sgmltools-lite )" - -src_compile() { - # see bug 8762 - replace-flags "-O3" "-O2" - - elibtoolize - - local myconf="" - use doc \ - && myconf="${myconf} --enable-gtk-doc" \ - || myconf="${myconf} --disable-gtk-doc" - use jpeg || myconf="${myconf} --without-libjpeg" - use tiff || myconf="${myconf} --without-libtiff" - if [ -n "$DEBUGBUILD" ]; then - myconf="${myconf} --enable-debug" - fi - - econf --with-gdktarget=x11 ${myconf} || die - -# gtk+ isn't multithread friendly due to some obscure code generation bug - make || die -} - -src_install() { - dodir /etc/gtk-2.0 - make DESTDIR=${D} \ - prefix=/usr \ - sysconfdir=/etc \ - infodir=/usr/share/info \ - mandir=/usr/share/man \ - install || die - dodoc AUTHORS COPYING ChangeLog* HACKING* INSTALL NEWS* README* TODO -} - - -pkg_postinst() { - gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules -} - diff --git a/x11-libs/gtk+/gtk+-2.0.9.ebuild b/x11-libs/gtk+/gtk+-2.0.9.ebuild deleted file mode 100644 index 963580fa0682..000000000000 --- a/x11-libs/gtk+/gtk+-2.0.9.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.0.9.ebuild,v 1.9 2003/02/13 16:56:39 vapier Exp $ - -inherit eutils libtool flag-o-matic - -IUSE="tiff doc jpeg directfb" - -S="${WORKDIR}/${P}" -DESCRIPTION="Gimp ToolKit + " -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.0/${P}.tar.bz2" -HOMEPAGE="http://www.gtk.org/" - -SLOT="2" -LICENSE="LGPL-2.1" -KEYWORDS="x86 ~ppc ~sparc ~alpha" - -RDEPEND="virtual/x11 - >=dev-libs/glib-2.0.7 - >=dev-libs/atk-1.0.3-r1 - >=x11-libs/pango-1.0.4-r1 - >=media-libs/libpng-1.2.1 - jpeg? ( >=media-libs/jpeg-6b-r2 ) - tiff? ( >=media-libs/tiff-3.5.7 )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12.0 - doc? ( >=dev-util/gtk-doc-0.9 - app-text/sgmltools-lite )" - -src_unpack() { - unpack ${A} - - # Turn of --export-symbols-regex for now, since it removes - # the wrong symbols -# cd ${S}; epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch -} - -src_compile() { - # see bug 8762 - replace-flags "-O3" "-O2" - - elibtoolize - - local myconf="" - use doc \ - && myconf="${myconf} --enable-gtk-doc" \ - || myconf="${myconf} --disable-gtk-doc" - use jpeg || myconf="${myconf} --without-libjpeg" - use tiff || myconf="${myconf} --without-libtiff" - if [ -n "$DEBUGBUILD" ]; then - myconf="${myconf} --enable-debug" - fi - - econf --with-gdktarget=x11 ${myconf} || die - -# gtk+ isn't multithread friendly due to some obscure code generation bug - make || die -} - -src_install() { - dodir /etc/gtk-2.0 - make DESTDIR=${D} \ - prefix=/usr \ - sysconfdir=/etc \ - infodir=/usr/share/info \ - mandir=/usr/share/man \ - install || die - dodoc AUTHORS COPYING ChangeLog* HACKING* INSTALL NEWS* README* TODO -} - - -pkg_postinst() { - gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules -} - diff --git a/x11-libs/gtk+/gtk+-2.1.2.ebuild b/x11-libs/gtk+/gtk+-2.1.2.ebuild deleted file mode 100644 index eace2f5c2249..000000000000 --- a/x11-libs/gtk+/gtk+-2.1.2.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.1.2.ebuild,v 1.8 2003/02/13 16:56:45 vapier Exp $ - -IUSE="tiff doc jpeg directfb" - -inherit eutils libtool flag-o-matic - -SLOT="2" -KEYWORDS="~x86 ~ppc" - -S="${WORKDIR}/${P}" -DESCRIPTION="Gimp ToolKit + " -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.1/${P}.tar.bz2" -HOMEPAGE="http://www.gtk.org/" -LICENSE="LGPL-2.1" - -RDEPEND="virtual/x11 - >=dev-libs/glib-2.0.6-r1 - >=dev-libs/atk-1.0.1 - =x11-libs/pango-1.1* - >=media-libs/libpng-1.2.1 - jpeg? ( >=media-libs/jpeg-6b-r2 ) - tiff? ( >=media-libs/tiff-3.5.7 ) - directfb? ( dev-libs/DirectFB )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12.0 - doc? ( >=dev-util/gtk-doc-0.9 - app-text/sgmltools-lite )" - -src_unpack() { - unpack ${A} - - # Turn of --export-symbols-regex for now, since it removes - # the wrong symbols - cd ${S}; epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch -} - -src_compile() { - # see bug 8762 - replace-flags "-O3" "-O2" - - elibtoolize - - local myconf="" - use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc" - use jpeg || myconf="${myconf} --without-libjpeg" - use tiff || myconf="${myconf} --without-libtiff" - if [ -n "$DEBUGBUILD" ]; then - myconf="${myconf} --enable-debug" - fi - - econf --with-gdktarget=x11 ${myconf} || die - - # gtk+ isn't multithread friendly due to some obscure code generation bug - make || die -} - -src_install() { - dodir /etc/gtk-2.0 - make DESTDIR=${D} \ - prefix=/usr \ - sysconfdir=/etc \ - infodir=/usr/share/info \ - mandir=/usr/share/man \ - install || die - dodoc AUTHORS COPYING ChangeLog* HACKING* INSTALL NEWS* README* TODO -} - - -pkg_postinst() { - gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules - gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders -} - diff --git a/x11-libs/gtk+/gtk+-2.2.0.ebuild b/x11-libs/gtk+/gtk+-2.2.0.ebuild deleted file mode 100644 index 30a1e7c1493a..000000000000 --- a/x11-libs/gtk+/gtk+-2.2.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.0.ebuild,v 1.10 2003/05/29 22:09:05 lu_zero Exp $ - -inherit eutils libtool flag-o-matic - -IUSE="tiff doc jpeg" -SLOT="2" -KEYWORDS="x86 ppc alpha" - -S="${WORKDIR}/${P}" -DESCRIPTION="Gimp ToolKit + " -SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2" -HOMEPAGE="http://www.gtk.org/" -LICENSE="LGPL-2.1" - -RDEPEND="virtual/x11 - >=dev-libs/glib-2.2.0 - >=dev-libs/atk-1.2.0 - >=x11-libs/pango-1.0.1 - >=media-libs/libpng-1.2.1 - jpeg? ( >=media-libs/jpeg-6b-r2 ) - tiff? ( >=media-libs/tiff-3.5.7 )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.12.0 - doc? ( >=dev-util/gtk-doc-0.9 - app-text/sgmltools-lite )" - -src_unpack() { - unpack ${A} - - # Turn of --export-symbols-regex for now, since it removes - # the wrong symbols - cd ${S}; epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch -} - -src_compile() { - # bug 8762 - replace-flags "-O3" "-O2" - - elibtoolize - - local myconf="" - use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc" - use jpeg || myconf="${myconf} --without-libjpeg" - use tiff || myconf="${myconf} --without-libtiff" - if [ -n "$DEBUGBUILD" ]; then - myconf="${myconf} --enable-debug" - fi - - econf --with-gdktarget=x11 ${myconf} || die - - # gtk+ isn't multithread friendly due to some obscure code generation bug - make || die -} - -src_install() { - dodir /etc/gtk-2.0 - - make DESTDIR=${D} \ - prefix=/usr \ - sysconfdir=/etc \ - infodir=/usr/share/info \ - mandir=/usr/share/man \ - install || die - - dodoc AUTHORS COPYING ChangeLog* HACKING INSTALL NEWS* README* -} - -pkg_postinst() { - gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules - gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders - - einfo "For your gtk themes to work correctly after an update," - einfo "you might have to rebuild your theme engines." - einfo "Executing 'qpkg -I -nc gtk-engines | xargs emerge' should do the trick (requires gentoolkit)" -} diff --git a/x11-libs/gtk+/gtk+-2.2.0-r1.ebuild b/x11-libs/gtk+/gtk+-2.2.2.ebuild index cbe75812eb29..eb5f13dc0d2d 100644 --- a/x11-libs/gtk+/gtk+-2.2.0-r1.ebuild +++ b/x11-libs/gtk+/gtk+-2.2.2.ebuild @@ -1,23 +1,25 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.0-r1.ebuild,v 1.3 2003/02/13 16:56:51 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.2.ebuild,v 1.1 2003/06/10 13:15:35 foser Exp $ inherit eutils libtool flag-o-matic -IUSE="tiff doc jpeg" +IUSE="tiff doc jpeg debug" SLOT="2" -KEYWORDS="~x86 ~ppc ~alpha" +KEYWORDS="~x86 ~ppc ~alpha ~sparc" -S="${WORKDIR}/${P}" DESCRIPTION="Gimp ToolKit + " SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2" HOMEPAGE="http://www.gtk.org/" LICENSE="LGPL-2.1" -RDEPEND="virtual/x11 - >=dev-libs/glib-2.2.0 - >=dev-libs/atk-1.2.0 - >=x11-libs/pango-1.0.1 +# virtual/x11 +# Need this specific xfree version to get bugfree xinput support (#20407) + +RDEPEND=">=x11-base/xfree-4.3.0-r3 + >=dev-libs/glib-2.2 + >=dev-libs/atk-1.2 + >=x11-libs/pango-1.2 >=media-libs/libpng-1.2.1 jpeg? ( >=media-libs/jpeg-6b-r2 ) tiff? ( >=media-libs/tiff-3.5.7 )" @@ -25,7 +27,6 @@ RDEPEND="virtual/x11 DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.12.0 doc? ( >=dev-util/gtk-doc-0.9 )" -# app-text/sgmltools-lite )" src_unpack() { unpack ${A} @@ -35,6 +36,18 @@ src_unpack() { cd ${S}; epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch # should speed up metacity cd ${S}; epatch ${FILESDIR}/gtk+-wm.patch + # beautifying patch for disabled icons + epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch + # xft/slighthint stuff from RH + cd ${S}; epatch ${FILESDIR}/${PN}-2-xftprefs.patch + + if [ "${ARCH}" == "ppc" ] + then + einfo "Fixing endianness issue in gdkpixbuf for 24-bit and 15-bit displays" + cd ${S}; epatch ${FILESDIR}/${PN}-2.2.1-gdkpixbuf-bigendian.patch + fi + + autoconf || die } src_compile() { @@ -44,14 +57,24 @@ src_compile() { elibtoolize local myconf="" - use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc" - use jpeg || myconf="${myconf} --without-libjpeg" - use tiff || myconf="${myconf} --without-libtiff" - if [ -n "$DEBUGBUILD" ]; then - myconf="${myconf} --enable-debug" - fi + + use doc \ + && myconf="${myconf} --enable-gtk-doc" \ + || myconf="${myconf} --disable-gtk-doc" + use png \ + && myconf="${myconf} --with-libpng" \ + || myconf="${myconf} --without-libpng" + use jpeg \ + && myconf="${myconf} --with-libjpeg" \ + || myconf="${myconf} --without-libjpeg" + use tiff \ + && myconf="${myconf} --with-libtiff" \ + || myconf="${myconf} --without-libtiff" + use debug \ + && myconf="${myconf} --enable-debug" \ + || myconf="${myconf} --disable-debug" - econf --with-gdktarget=x11 ${myconf} || die + econf --with-gdktarget=x11 --with-xinput=yes ${myconf} || die # gtk+ isn't multithread friendly due to some obscure code generation bug make || die @@ -67,6 +90,10 @@ src_install() { mandir=/usr/share/man \ install || die + # Enable xft in environment as suggested by <utx@gentoo.org> + dodir /etc/env.d + echo "GDK_USE_XFT=1" >${D}/etc/env.d/50gtk2 + dodoc AUTHORS COPYING ChangeLog* HACKING INSTALL NEWS* README* } @@ -77,4 +104,10 @@ pkg_postinst() { einfo "For your gtk themes to work correctly after an update," einfo "you might have to rebuild your theme engines." einfo "Executing 'qpkg -I -nc gtk-engines | xargs emerge' should do the trick (requires gentoolkit)" + + env-update +} + +pkg_postrm() { + env-update } |