From a8ef1c04f40c6a81ecf92475f2aff7e3ca34ef98 Mon Sep 17 00:00:00 2001 From: Alex Duggan Date: Thu, 9 Jan 2003 18:44:10 +0000 Subject: Use pkg-config instead of orbit2-config. (fixes #73299) 2003-01-08 Alex Duggan * configure.in: Use pkg-config instead of orbit2-config. (fixes #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 Patch from David Bordoley --- ChangeLog | 44 +++++++++++++++++---------- configure.in | 9 ++++-- libnautilus-private/nautilus-icon-container.c | 1 - src/file-manager/fm-directory-view.c | 1 - 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b7f6b4ac..60d6e872a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2003-01-08 Alex Duggan + + * configure.in: + Use pkg-config instead of orbit2-config. (fixes #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 + Patch from David Bordoley + 2003-01-07 Alex Duggan * components/notes/Nautilus_View_notes.server.in.in: s/Nodes/Notes/ @@ -667,7 +679,7 @@ * src/nautilus-window-menus.c: remove nautilus-preferences-dialog.h from the includes -2002-11-04 Diego González +2002-11-04 Diego González * src/nautilus-window-toolbars.c: (throbber_set_throbbing): Use bonobo_pbclient_set_value_async instead of @@ -3351,7 +3363,7 @@ Thu May 30 13:14:58 2002 George Lebl * libnautilus-private/nautilus-icon-container.c (size_allocate): Don't relayout when window height changes unless we need it. - Based on a patch by Jörgen Viksell + Based on a patch by Jörgen Viksell Thu May 30 10:02:30 2002 George Lebl @@ -3499,7 +3511,7 @@ Thu May 30 10:02:30 2002 George Lebl Move disconnect_model_handlers from finalize to destroy. This fixes a problem with signals arrive after the view is destroyed. - Patch from Gustavo Giráldez + Patch from Gustavo Giráldez 2002-05-23 Alex Larsson @@ -4442,7 +4454,7 @@ Thu Apr 25 12:22:57 2002 Jonathan Blandford Now that BonoboWindow has been fixed, it is no longer necessary to create and set the UIContainer. -2002-04-22 Diego González +2002-04-22 Diego González * src/file-manager/fm-list-model.[c-h] (fm_list_model_get_sort_column_id_from_attribute): fix typo @@ -4510,7 +4522,7 @@ Tue Apr 23 16:18:05 2002 Owen Taylor * libnautilus-private/nautilus-directory-background.c: Remove deprecated usage of gnome-config. - Patch by Diego González + Patch by Diego González 2002-04-21 Alexander Larsson @@ -4619,12 +4631,12 @@ Tue Apr 23 16:18:05 2002 Owen Taylor Don't show translator credits when we don't need to. Also add myself as an author :) -2002-04-20 Diego González +2002-04-20 Diego González * src/nautilus-preferences-dialog.c: split "Windows & Desktop" into two blocks "Windows" and "Desktop & Trash". Fixes bug 72931. -2002-04-20 Diego González +2002-04-20 Diego González * libnautilus-private/nautilus-find-icon-image.c (make_full_icon_path): if the path is not partial also check that the icon exists with the @@ -4709,7 +4721,7 @@ Tue Apr 23 16:18:05 2002 Owen Taylor * src/nautilus-window.c: (nautilus_window_instance_init): Set initial title to "Nautilus". Fixes #74627. -2002-04-19 Diego González +2002-04-19 Diego González * src/nautilus-window-menus.c (forget_history_if_confirmed): use eel_create_question_dialog to show the buttons with the @@ -5527,12 +5539,12 @@ Tue Apr 23 16:18:05 2002 Owen Taylor the title is missing. This handles nice conversion to utf8. -2002-03-10 Diego González +2002-03-10 Diego González * components/music/nautilus-music-vew.c (read_id_tag): convert title, comments, artist and album to UTF-8 -2002-03-11 Diego González +2002-03-11 Diego González * components/music/nautilus-music-view.c (go_to_next_track): Fix a crash where the music view would crash after playing the @@ -6375,7 +6387,7 @@ Tue Apr 23 16:18:05 2002 Owen Taylor 2002-03-03 Alexander Larsson - Patch from Diego González . + Patch from Diego González . * libnautilus-private/nautilus-horizontal-splitter.c: (splitter_hide), (splitter_show), (splitter_is_hidden), @@ -11263,7 +11275,7 @@ Tue Nov 20 21:45:43 2001 Owen Taylor Work around gcc bug with the directory named string. Switch to use new calls in cases where the old ones are gone. -2001-10-13 Carlos Perelló Marín +2001-10-13 Carlos Perelló Marín * configure.in (ALL_LINGUAS): Added pt @@ -12603,7 +12615,7 @@ Tue Nov 20 21:45:43 2001 Owen Taylor (services_button_callback): Removed. (nautilus_window_initialize_menus_part_1): Removed eazel services. - * src/nautilus-window­toolbars.c: Rmoved header includes for eazel + * src/nautilus-window­toolbars.c: Rmoved header includes for eazel services. (set_up_toolbar_images): Services removed. @@ -13547,7 +13559,7 @@ Tue Nov 20 21:45:43 2001 Owen Taylor 2001-06-25 Ramiro Estrugo - Patch from Miguel Rodríguez Pérez + Patch from Miguel Rodríguez Pérez * libnautilus-private/nautilus-thumbnails.c (obfuscate_password): New function to look for a password in una uri and change it @@ -14188,7 +14200,7 @@ Tue Nov 20 21:45:43 2001 Owen Taylor press event. Do the work here now instead of at press time since we are more like a real button. - Rolled in change by Miguel Rodríguez Pérez to + Rolled in change by Miguel Rodríguez Pérez to fix volume mounting problems: * configure.in: Check for hasmntopt. @@ -14196,7 +14208,7 @@ Tue Nov 20 21:45:43 2001 Owen Taylor (get_removable_volumes): Fix typo (HAVE_MNTTENT_H -> HAVE_MNTENT_H). - Integrated patch by Miguel Rodríguez Pérez to + Integrated patch by Miguel Rodríguez Pérez to make Nautilus not try to preview MPEG lists: * src/file-manager/fm-icon-view.c: diff --git a/configure.in b/configure.in index 94c4e448b..80802b444 100644 --- a/configure.in +++ b/configure.in @@ -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 \ @@ -99,6 +99,11 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) dnl ========================================================================== +ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`" +AC_SUBST(ORBIT_IDL) + +dnl ========================================================================== + AC_CHECK_FUNCS(setmntent endmntent hasmntopt getmntinfo) AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h) diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index f5e0c7fba..3cb3174fe 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index f5d9c232e..e4ce7926f 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -30,7 +30,6 @@ #include #include "fm-directory-view.h" -#include "fm-desktop-icon-view.h" #include "fm-error-reporting.h" #include "fm-properties-window.h" #include -- cgit v1.2.1