Re: Another small patch (New Patch Included)

[Dave Bordoley <bordoley msu edu>]

Ok fixed up this patch, second time is the charm:

from the changelog:

* configure.in
+       Use pkg-config instead of orbit2-config. (bug #73299)
+
+       * libnautilus-private/nautilus-icon-container.c
+       Remove unneccessary include of libnautilus/nautilus-clipboard.h
+
+       * src/file-manager/fm-directory-view.c
+       Remove unnecessary include of fm-desktop-icon-view.h

dave

Index: nautilus//ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5647
diff -u -p -r1.5647 ChangeLog
--- nautilus//ChangeLog 7 Jan 2003 21:17:33 -0000       1.5647
+++ nautilus//ChangeLog 8 Jan 2003 14:38:56 -0000
@@ -1,3 +1,14 @@
+2003-01-08  David Bordoley <bordoley msu edu>
+
+       * configure.in
+       Use pkg-config instead of orbit2-config. (bug #73299)
+
+       * libnautilus-private/nautilus-icon-container.c
+       Remove unneccessary include of libnautilus/nautilus-clipboard.h
+
+       * src/file-manager/fm-directory-view.c
+       Remove unnecessary include of fm-desktop-icon-view.h
+
 2003-01-07  Alex Duggan  <aldug gnome org>
 
        * components/notes/Nautilus_View_notes.server.in.in: s/Nodes/Notes/
Index: nautilus//configure.in
===================================================================
RCS file: /cvs/gnome/nautilus/configure.in,v
retrieving revision 1.493
diff -u -p -r1.493 configure.in
--- nautilus//configure.in      7 Jan 2003 07:16:38 -0000       1.493
+++ nautilus//configure.in      8 Jan 2003 14:38:59 -0000
@@ -13,6 +13,7 @@ GNOME_DESKTOP_REQUIRED=2.1.0
 GNOME_REQUIRED=2.1.1
 GNOME_UI_REQUIRED=2.1.1
 GNOME_VFS_REQUIRED=2.1.5
+ORBIT_REQUIRED=2.4.0
 PANGO_REQUIRED=1.1.2
 GTK_REQUIRED=2.1.1
 MEDUSA_REQUIRED=0.5.1
@@ -44,8 +45,6 @@ AC_PROG_MAKE_SET
 AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
 
-AM_PATH_ORBIT2
-
 PKG_CHECK_MODULES(ALL, \
        esound >= $ESOUND_REQUIRED \
        bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED \
@@ -53,6 +52,7 @@ PKG_CHECK_MODULES(ALL, \
        glib-2.0 >= $GLIB_REQUIRED \
        gnome-desktop-2.0 >= $GNOME_DESKTOP_REQUIRED \
        gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED \
+       ORBit-2.0 >= $ORBIT_REQUIRED\
        pango >= $PANGO_REQUIRED \
        gtk+-2.0 >= $GTK_REQUIRED \
        libart-2.0 >= $ART_REQUIRED \
@@ -96,6 +96,11 @@ AM_CONDITIONAL(ENABLE_PROFILER, test "x$
 dnl ==========================================================================
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+
+dnl ==========================================================================
+
+ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
+AC_SUBST(ORBIT_IDL)
 
 dnl ==========================================================================
 
Index: nautilus//libnautilus-private/nautilus-icon-container.c
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-icon-container.c,v
retrieving revision 1.313
diff -u -p -r1.313 nautilus-icon-container.c
--- nautilus//libnautilus-private/nautilus-icon-container.c     12 Dec 2002 15:17:42 -0000      1.313
+++ nautilus//libnautilus-private/nautilus-icon-container.c     8 Jan 2003 14:39:48 -0000
@@ -49,7 +49,6 @@
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-macros.h>
-#include <libnautilus/nautilus-clipboard.h>
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
Index: nautilus//src/file-manager/fm-directory-view.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v
retrieving revision 1.559
diff -u -p -r1.559 fm-directory-view.c
--- nautilus//src/file-manager/fm-directory-view.c      19 Dec 2002 19:56:37 -0000      1.559
+++ nautilus//src/file-manager/fm-directory-view.c      8 Jan 2003 14:41:03 -0000
@@ -30,7 +30,6 @@
 #include <config.h>
 #include "fm-directory-view.h"
 
-#include "fm-desktop-icon-view.h"
 #include "fm-error-reporting.h"
 #include "fm-properties-window.h"
 #include <libgnome/gnome-url.h>