--- src/collection.c.orig	Mon Dec 20 08:16:25 2004

+++ src/collection.c	Sat Dec 25 23:01:11 2004

@@ -713,8 +713,8 @@

             guchar *base;

             guchar *ptr;

             guchar *end;

-        };

-    };

+        } s;

+    } u;

 };

 static void free_buffer(struct coll_src *source, guchar * buffer)

@@ -730,16 +730,16 @@

     if (source->is_file) {

         data = g_new(guchar, length);

-        if (fread(data, 1, length, source->file) != length) {

+        if (fread(data, 1, length, source->u.file) != length) {

             g_free(data);

             return NULL;

         }

     } else {

-        if (source->ptr + length > source->end)

+        if (source->u.s.ptr + length > source->u.s.end)

             return NULL;

-        data = source->ptr;

-        source->ptr += length;

+        data = source->u.s.ptr;

+        source->u.s.ptr += length;

     }

     if (is_string && data[length - 1] != '\0') {

@@ -753,12 +753,12 @@

 static gint read_char(struct coll_src *source)

 {

     if (source->is_file)

-        return fgetc(source->file);

+        return fgetc(source->u.file);

-    if (source->ptr >= source->end)

+    if (source->u.s.ptr >= source->u.s.end)

         return EOF;

-    return *(source->ptr++);

+    return *(source->u.s.ptr++);

 }

 static GdkPixbufDestroyNotify destroy_func(struct coll_src *source)

@@ -930,22 +930,22 @@

         goto no_mmap;

     }

-    source->base = mmap(NULL, length, PROT_READ, MAP_PRIVATE, fileno(file), 0);

-    if (source->base == MAP_FAILED) {

+    source->u.s.base = mmap(NULL, length, PROT_READ, MAP_PRIVATE, fileno(file), 0);

+    if (source->u.s.base == MAP_FAILED) {

         perror("mmap");

         goto no_mmap;

     }

     source->is_file = FALSE;

-    source->ptr = source->base;

-    source->end = source->base + length;

+    source->u.s.ptr = source->u.s.base;

+    source->u.s.end = source->u.s.base + length;

     goto ok;

   no_mmap:

     fseeko(file, 0, SEEK_SET);

     source->is_file = TRUE;

-    source->file = file;

+    source->u.file = file;

   ok:

     return source;

@@ -954,7 +954,7 @@

 static void destroy_source(struct coll_src *source, gboolean ok)

 {

     if (ok == FALSE && source->is_file == FALSE)

-        if (munmap(source->base, source->end - source->base) < 0)

+        if (munmap(source->u.s.base, source->u.s.end - source->u.s.base) < 0)

             perror("munmap");

 }

--- src/options.c.orig	Mon Dec 20 08:24:26 2004

+++ src/options.c	Sat Dec 25 23:10:14 2004

@@ -199,12 +199,15 @@

 static gboolean on_read_config_realize(GtkLabel * widget)

 {

-    const gchar *filename = get_read_config_file();

+    const gchar *filename;

+    gchar *text;

+

+    filename = get_read_config_file();

     if (filename == NULL)

         filename = _("NONE");

-    gchar *text =

+    text =

         g_strdup_printf(_("This configuration file has been read: %s"),

                         filename);

@@ -216,12 +219,15 @@

 static gboolean on_write_config_realize(GtkLabel * widget)

 {

-    const gchar *filename = get_write_config_file();

+    const gchar *filename;

+    gchar *text;

+

+    filename = get_write_config_file();

     if (filename == NULL)

         filename = _("NONE");

-    gchar *text =

+    text =

         g_strdup_printf(_("This configuration file will be written: %s"),

                         filename);