On 03.16, Andrew Morton wrote:
> "J.A. Magallon" <[EMAIL PROTECTED]> wrote:
> >
> > On 03.16, Andrew Morton wrote:
> > >
> > >
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm4/
> > >
> > ...
> > >
> > > +revert-gconfig-changes.patch
> > >
> > > Back out a recent change which broke gconfig.
> > >
> >
> > What was broken ?
>
> hm. I emailed you twice, and had a feeling that things weren't getting
> through.
>
> The patch caused those little pixmap buttons across the top of the main
> window to vanish when using gtk+-1.2.10-28.1. See
> http://www.zip.com.au/~akpm/linux/patches/stuff/x.jpg.
>
> I now note that scripts/kconfig/gconf.c doesn't compile at all with the
> above backout patch. Drat.
>
This is enough to make it compile:
diff -ruN linux-2.6.11-mm4/scripts/kconfig/gconf.c
linux-2.6.11-mm4-gconf/scripts/kconfig/gconf.c
--- linux-2.6.11-mm4/scripts/kconfig/gconf.c 2005-03-16 23:45:56.000000000
+0100
+++ linux-2.6.11-mm4-gconf/scripts/kconfig/gconf.c 2005-03-16
23:48:25.000000000 +0100
@@ -11,6 +11,7 @@
#endif
#include "lkc.h"
+#include "images.c"
#include <glade/glade.h>
#include <gtk/gtk.h>
@@ -1171,42 +1172,6 @@
}
-/* Conf management */
-
-static const char *xpm_menu[] = {
-"12 12 2 1",
-" c white",
-". c black",
-" ",
-" ",
-" . ",
-" .. ",
-" ... ",
-" .... ",
-" ..... ",
-" .... ",
-" ... ",
-" .. ",
-" . ",
-" "};
-
-static const char *xpm_void[] = {
-"12 12 2 1",
-" c white",
-". c black",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
-
/* Fill a row of strings */
static gchar **fill_row(struct menu *menu)
{
--
J.A. Magallon <jamagallon()able!es> \ Software is like sex:
werewolf!able!es \ It's better when it's free
Mandrakelinux release 10.2 (Cooker) for i586
Linux 2.6.11-jam5 (gcc 3.4.3 (Mandrakelinux 10.2 3.4.3-6mdk)) #1
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
