Re: [Nautilus-list] Patches for minor build errors

[Owen Taylor <otaylor redhat com>]

George Karabin <gkarabin pobox com> writes:

> <gobject/gobject.h> is now generating errors if included by nautilus.
> It's a #error, saying that you should use <glib-object.h> instead.
> Making this change to 2 files gets nautilus building (against the
> anoncvs server that I'm building vicious-build-scripts with, anyway).

I've committed something to this effect now. (Just removed the
second include rather than fixing it, since glib-object.h is
going to be pulled in by any GTK+ header.

Thanks!
                                        Owen

> Here are the 2 one-liner patches:
> 
> Index: nautilus-undo-private.h
> ===================================================================
> RCS file: /cvs/gnome/nautilus/libnautilus/nautilus-undo-private.h,v
> retrieving revision 1.3
> diff -u -p -r1.3 nautilus-undo-private.h
> --- nautilus-undo-private.h	2001/11/06 18:40:04	1.3
> +++ nautilus-undo-private.h	2001/11/25 21:50:32
> @@ -26,7 +26,7 @@
>  #define NAUTILUS_UNDO_PRIVATE_H
>  
>  #include <libnautilus/nautilus-distributed-undo.h>
> -#include <gobject/gobject.h>
> +#include <glib-object.h>
>  
>  Nautilus_Undo_Manager nautilus_undo_get_undo_manager   
> (GObject               *attached_object);
>  void                  nautilus_undo_attach_undo_manager
> (GObject               *object,
> 
> 
> Index: nautilus-sample-content-view.c
> ===================================================================
> RCS file:
> /cvs/gnome/nautilus/components/sample/nautilus-sample-content-view.c,vretrieving revision 1.32
> diff -u -p -r1.32 nautilus-sample-content-view.c
> --- nautilus-sample-content-view.c	2001/11/13 01:22:26	1.32
> +++ nautilus-sample-content-view.c	2001/11/25 21:51:52
> @@ -36,7 +36,7 @@
>  #include "nautilus-sample-content-view.h"
>  
>  #include <bonobo/bonobo-i18n.h>
> -#include <gobject/gsignal.h>
> +#include <glib-object.h>
>  #include <gtk/gtklabel.h>
>  #include <libgnome/gnome-macros.h>
>  #include <string.h>