Another small patch
- From: Dave Bordoley <bordoley msu edu>
- To: nautilus-list gnome org
- Subject: Another small patch
- Date: 07 Jan 2003 13:16:20 -0500
1. Use pkg-config instead of orbit2-config in configure.in
2. Remove unnecessary include of "libnautilus/nautilus-clipboard.h" in
"libnautilus-private/nautilus-icon-container.c"
Index: nautilus/ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5646
diff -u -p -r1.5646 ChangeLog
--- nautilus/ChangeLog 7 Jan 2003 15:35:02 -0000 1.5646
+++ nautilus/ChangeLog 7 Jan 2003 18:06:03 -0000
@@ -1,3 +1,11 @@
+2003-01-07 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
+
2003-01-07 Alexander Larsson <alexl redhat com>
* libnautilus-private/nautilus-file.c (nautilus_file_get_activation_uri):
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 7 Jan 2003 18:06:05 -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_REQUIRE=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 \
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 7 Jan 2003 18:06:50 -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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]