Commit 09b3bf22 authored by Ramiro Estrugo's avatar Ramiro Estrugo

Split libnautilus into two pieces.

libnautilus now only contains the view interfaces needed by nautilus
components.

These are the interfaces defined in nautilus-view-component.idl.

libnautilus-extensions containes the remainder of the stuff.

Also used the cvs repository munging opportunity to do some of the
ntl-* renaming outlined in the RENAIMING file.
parent dd08346b
2000-04-14 Ramiro Estrugo <ramiro@eazel.com>
Split libnautilus into two pieces.
libnautilus now only contains the view interfaces needed by nautilus
components.
These are the interfaces defined in nautilus-view-component.idl.
libnautilus-extensions containes the remainder of the stuff.
Also used the cvs repository munging opportunity to do some of the
ntl-* renaming outlined in the RENAIMING file.
* libnautilus/bonobo-stream-vfs.c
libnautilus/bonobo-stream-vfs.h,
libnautilus/gtkscrollframe.c,
libnautilus/gtkscrollframe.h,
libnautilus/nautilus-alloc.h,
libnautilus/nautilus-background-canvas-group.c,
libnautilus/nautilus-background-canvas-group.h,
libnautilus/nautilus-background.c,
libnautilus/nautilus-background.h,
libnautilus/nautilus-bonobo-extensions.c,
libnautilus/nautilus-bonobo-extensions.h,
libnautilus/nautilus-bookmark.c,
libnautilus/nautilus-bookmark.h,
libnautilus/nautilus-debug.c,
libnautilus/nautilus-debug.h,
libnautilus/nautilus-default-file-icon.c,
libnautilus/nautilus-default-file-icon.h,
libnautilus/nautilus-directory-background.c,
libnautilus/nautilus-directory-background.h,
libnautilus/nautilus-directory-private.h,
libnautilus/nautilus-directory.c,
libnautilus/nautilus-directory.h,
libnautilus/nautilus-file-private.h,
libnautilus/nautilus-file-utilities.c,
libnautilus/nautilus-file-utilities.h,
libnautilus/nautilus-file.c,
libnautilus/nautilus-file.h,
libnautilus/nautilus-gdk-extensions.c,
libnautilus/nautilus-gdk-extensions.h,
libnautilus/nautilus-gdk-pixbuf-extensions.c,
libnautilus/nautilus-gdk-pixbuf-extensions.h,
libnautilus/nautilus-glib-extensions.c,
libnautilus/nautilus-glib-extensions.h,
libnautilus/nautilus-global-preferences.c,
libnautilus/nautilus-global-preferences.h,
libnautilus/nautilus-gnome-extensions.c,
libnautilus/nautilus-gnome-extensions.h,
libnautilus/nautilus-graphic-effects.c,
libnautilus/nautilus-graphic-effects.h,
libnautilus/nautilus-gtk-extensions.c,
libnautilus/nautilus-gtk-extensions.h,
libnautilus/nautilus-gtk-macros.h,
libnautilus/nautilus-icon-canvas-item.c,
libnautilus/nautilus-icon-canvas-item.h,
libnautilus/nautilus-icon-container.c,
libnautilus/nautilus-icon-container.h,
libnautilus/nautilus-icon-dnd.c,
libnautilus/nautilus-icon-dnd.h,
libnautilus/nautilus-icon-factory.c,
libnautilus/nautilus-icon-factory.h,
libnautilus/nautilus-icon-grid.c,
libnautilus/nautilus-icon-grid.h,
libnautilus/nautilus-icon-private.h,
libnautilus/nautilus-lib-self-check-functions.c,
libnautilus/nautilus-lib-self-check-functions.h,
libnautilus/nautilus-list-column-title.c,
libnautilus/nautilus-list-column-title.h,
libnautilus/nautilus-list.c,
libnautilus/nautilus-list.h,
libnautilus/nautilus-metadata.h,
libnautilus/nautilus-mime-type.c,
libnautilus/nautilus-mime-type.h,
libnautilus/nautilus-self-checks.c,
libnautilus/nautilus-self-checks.h,
libnautilus/nautilus-string-list.c,
libnautilus/nautilus-string-list.h,
libnautilus/nautilus-string.c,
libnautilus/nautilus-string.h,
libnautilus/nautilus-xml-extensions.c,
libnautilus/nautilus-xml-extensions.h: moved to
libnautilus-extensions.
libnautilus/ntl-content-view-frame.c,
libnautilus/ntl-content-view-frame.h,
libnautilus/ntl-meta-view-frame.c,
libnautilus/ntl-meta-view-frame.h,
libnautilus/ntl-view-frame.c,
libnautilus/ntl-view-frame.h: moved to
libnautilus-extensions and renamed from "ntl-*" to "nautilus-*"
* Makefile.am,
configure.in: added libnautilus-extensions to the build.
* libnautilus/.cvsignore,
libnautilus/Makefile.am,
libnautilus/libnautilus.h,
libnautilus/nautilus-content-view-frame.c,
libnautilus/nautilus-content-view-frame.h,
libnautilus/nautilus-meta-view-frame.c,
libnautilus/nautilus-meta-view-frame.h,
libnautilus/nautilus-view-frame-private.h,
libnautilus/nautilus-view-frame.c,
libnautilus/nautilus-view-frame.h,
libnautilus/nautilus-zoomable.c: Updated for libnautilus ->
libnautilus-extensions changes.
* libnautilus-extensions/Makefile.am,
libnautilus-extensions/nautilus-global-preferences.c,
libnautilus-extensions/nautilus-global-preferences.h,
libnautilus-extensions/nautilus-icon-factory.h: Updated for libnautilus ->
libnautilus-extensions changes.
* nautilus-widgets/nautilus-preferences-box.c,
nautilus-widgets/nautilus-preferences-dialog.c,
nautilus-widgets/nautilus-preferences-group.c,
nautilus-widgets/nautilus-preferences-item.c,
nautilus-widgets/nautilus-preferences-pane.c,
nautilus-widgets/nautilus-preferences.c,
nautilus-widgets/nautilus-radio-button-group.c: Updated for libnautilus ->
libnautilus-extensions changes.
* src/Makefile.am,
src/nautilus-bookmark-list.c,
src/nautilus-bookmark-list.h,
src/nautilus-bookmarks-window.c,
src/nautilus-index-tabs.c,
src/nautilus-index-title.c,
src/nautilus-location-bar.c,
src/nautilus-signaller.c,
src/nautilus-window-menus.c,
src/nautilus-window-toolbars.c,
src/nautilus-zoom-control.c,
src/ntl-app.c,
src/ntl-index-panel.c,
src/ntl-main.c,
src/ntl-meta-view.c,
src/ntl-uri-map.c,
src/ntl-uri-map.h,
src/ntl-view-bonobo-subdoc.c,
src/ntl-view.c,
src/ntl-window-msgs.c,
src/ntl-window-state.c,
src/ntl-window.c,
src/ntl-window.h: Updated for libnautilus ->
libnautilus-extensions changes.
* src/file-manager/fm-directory-view.c,
src/file-manager/fm-directory-view.h,
src/file-manager/fm-icon-text-window.c,
src/file-manager/fm-icon-view.c,
src/file-manager/fm-list-view.c,
src/file-manager/fm-properties-window.c,
src/file-manager/fm-properties-window.h: Updated for libnautilus ->
libnautilus-extensions changes.
* components/history/Makefile.am,
components/history/ntl-history-view.c,
components/html/Makefile.am,
components/html/ntl-web-browser.c,
components/music/Makefile.am,
components/music/nautilus-music-view.c,
components/music/nautilus-music-view.h,
components/notes/Makefile.am,
components/notes/ntl-notes.c,
components/rpmview/Makefile.am,
components/rpmview/nautilus-rpm-view.c,
components/rpmview/nautilus-rpm-view.h,
components/sample/Makefile.am,
components/sample/nautilus-sample-content-view.c,
components/sample/nautilus-sample-content-view.h,
components/services/startup/Makefile.am,
components/services/startup/eazel-register.c,
components/services/startup/nautilus-service-startup-view.c,
components/services/startup/nautilus-service-startup-view.h:
Updated components for libnautilus -> libnautilus-extensions changes.
2000-04-14 Fatih Demir <kabalak@gmx.net>
* configure.in : Added tr to ALL_LINGUAS .
......
......@@ -3,6 +3,7 @@ NULL=
SUBDIRS =\
librsvg \
libnautilus \
libnautilus-extensions \
nautilus-widgets \
src \
components \
......
......@@ -5,6 +5,7 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GNOMEUI_CFLAGS) $(BONOBO_CFLAGS) $(
LDADD=\
$(top_builddir)/nautilus-widgets/libnautilus-widgets.la \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS)
......
......@@ -28,8 +28,8 @@
#include "config.h"
#include <libnautilus/libnautilus.h>
#include <libnautilus/nautilus-bookmark.h>
#include <libnautilus/nautilus-icon-factory.h>
#include <libnautilus-extensions/nautilus-bookmark.h>
#include <libnautilus-extensions/nautilus-icon-factory.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomevfs/gnome-vfs-init.h>
#include <libgnorba/gnorba.h>
......
......@@ -28,8 +28,8 @@
#include "config.h"
#include <libnautilus/libnautilus.h>
#include <libnautilus/nautilus-bookmark.h>
#include <libnautilus/nautilus-icon-factory.h>
#include <libnautilus-extensions/nautilus-bookmark.h>
#include <libnautilus-extensions/nautilus-icon-factory.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomevfs/gnome-vfs-init.h>
#include <libgnorba/gnorba.h>
......
......@@ -31,6 +31,7 @@ ntl_web_browser_SOURCES = \
ntl_web_browser_LDFLAGS = \
$(top_builddir)/nautilus-widgets/libnautilus-widgets.la \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/librsvg/librsvg.la \
$(GTKHTML_LIBS) \
$(BONOBO_LIBS) \
......
......@@ -26,7 +26,7 @@
#include <gtkhtml/gtkhtml.h>
#include <libgnorba/gnorba.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libnautilus/nautilus-debug.h>
#include <libnautilus-extensions/nautilus-debug.h>
typedef struct {
NautilusViewFrame *view_frame;
......
......@@ -25,6 +25,7 @@ nautilus_music_view_SOURCES = \
nautilus_music_view_LDFLAGS = \
$(top_builddir)/nautilus-widgets/libnautilus-widgets.la \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
......
......@@ -32,14 +32,14 @@
#include <dirent.h>
#include <libnautilus/libnautilus.h>
#include <libnautilus/nautilus-background.h>
#include <libnautilus/nautilus-directory-background.h>
#include <libnautilus/nautilus-file.h>
#include <libnautilus/nautilus-file-utilities.h>
#include <libnautilus/nautilus-glib-extensions.h>
#include <libnautilus/nautilus-gtk-macros.h>
#include <libnautilus/nautilus-metadata.h>
#include <libnautilus/nautilus-string.h>
#include <libnautilus-extensions/nautilus-background.h>
#include <libnautilus-extensions/nautilus-directory-background.h>
#include <libnautilus-extensions/nautilus-file.h>
#include <libnautilus-extensions/nautilus-file-utilities.h>
#include <libnautilus-extensions/nautilus-glib-extensions.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-metadata.h>
#include <libnautilus-extensions/nautilus-string.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtksignal.h>
#include <gnome.h>
......
......@@ -25,7 +25,7 @@
#ifndef NAUTILUS_MUSIC_VIEW_H
#define NAUTILUS_MUSIC_VIEW_H
#include <libnautilus/ntl-content-view-frame.h>
#include <libnautilus/nautilus-content-view-frame.h>
#include <gtk/gtkeventbox.h>
......
......@@ -5,6 +5,7 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GNOMEUI_CFLAGS) $(BONOBO_CFLAGS) $(
LDADD=\
$(top_builddir)/nautilus-widgets/libnautilus-widgets.la \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS)
......
......@@ -28,15 +28,15 @@
#include <config.h>
#include <libnautilus/libnautilus.h>
#include <libnautilus/nautilus-metadata.h>
#include <libnautilus-extensions/nautilus-metadata.h>
#include <gnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libgnorba/gnorba.h>
#include <limits.h>
#include <ctype.h>
#include <libnautilus/nautilus-background.h>
#include <libnautilus/nautilus-file.h>
#include <libnautilus/nautilus-debug.h>
#include <libnautilus-extensions/nautilus-background.h>
#include <libnautilus-extensions/nautilus-file.h>
#include <libnautilus-extensions/nautilus-debug.h>
#define NOTES_DEFAULT_BACKGROUND_COLOR "rgb:FFFF/FFFF/BBBB"
......
......@@ -28,15 +28,15 @@
#include <config.h>
#include <libnautilus/libnautilus.h>
#include <libnautilus/nautilus-metadata.h>
#include <libnautilus-extensions/nautilus-metadata.h>
#include <gnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libgnorba/gnorba.h>
#include <limits.h>
#include <ctype.h>
#include <libnautilus/nautilus-background.h>
#include <libnautilus/nautilus-file.h>
#include <libnautilus/nautilus-debug.h>
#include <libnautilus-extensions/nautilus-background.h>
#include <libnautilus-extensions/nautilus-file.h>
#include <libnautilus-extensions/nautilus-debug.h>
#define NOTES_DEFAULT_BACKGROUND_COLOR "rgb:FFFF/FFFF/BBBB"
......
......@@ -26,6 +26,7 @@ nautilus_rpm_view_SOURCES = \
nautilus_rpm_view_LDFLAGS = \
$(top_builddir)/nautilus-widgets/libnautilus-widgets.la \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
......
......@@ -35,13 +35,13 @@
#include <rpm/rpmlib.h>
#include <libnautilus/libnautilus.h>
#include <libnautilus/nautilus-background.h>
#include <libnautilus/nautilus-file.h>
#include <libnautilus/nautilus-file-utilities.h>
#include <libnautilus/nautilus-glib-extensions.h>
#include <libnautilus/nautilus-gtk-macros.h>
#include <libnautilus/nautilus-metadata.h>
#include <libnautilus/nautilus-string.h>
#include <libnautilus-extensions/nautilus-background.h>
#include <libnautilus-extensions/nautilus-file.h>
#include <libnautilus-extensions/nautilus-file-utilities.h>
#include <libnautilus-extensions/nautilus-glib-extensions.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-metadata.h>
#include <libnautilus-extensions/nautilus-string.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtksignal.h>
#include <gnome.h>
......
......@@ -25,7 +25,7 @@
#ifndef NAUTILUS_RPM_VIEW_H
#define NAUTILUS_RPM_VIEW_H
#include <libnautilus/ntl-content-view-frame.h>
#include <libnautilus/nautilus-content-view-frame.h>
#include <gtk/gtkeventbox.h>
......
......@@ -24,6 +24,7 @@ nautilus_sample_content_view_SOURCES = \
nautilus_sample_content_view_LDFLAGS = \
$(top_builddir)/nautilus-widgets/libnautilus-widgets.la \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
......
......@@ -35,7 +35,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-stock.h>
#include <libnautilus/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
/* A NautilusContentViewFrame's private information. */
struct NautilusSampleContentViewDetails {
......
......@@ -29,7 +29,7 @@
#ifndef NAUTILUS_SAMPLE_CONTENT_VIEW_H
#define NAUTILUS_SAMPLE_CONTENT_VIEW_H
#include <libnautilus/ntl-content-view-frame.h>
#include <libnautilus/nautilus-content-view-frame.h>
#include <gtk/gtklabel.h>
typedef struct NautilusSampleContentView NautilusSampleContentView;
......
......@@ -28,6 +28,7 @@ nautilus_service_startup_view_SOURCES = \
nautilus_service_startup_view_LDFLAGS = \
$(top_builddir)/nautilus-widgets/libnautilus-widgets.la \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
......
......@@ -34,7 +34,7 @@
#include <gnome-xml/entities.h>
#include <gnome-xml/parser.h>
#include <gnome-xml/tree.h>
#include <libnautilus/nautilus-string.h>
#include <libnautilus-extensions/nautilus-string.h>
#include "eazel-register.h"
void add_package_info(xmlDoc* configuration_metafile);
......
......@@ -34,12 +34,12 @@
#include <unistd.h>
#include <gnome-xml/tree.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <libnautilus/nautilus-background.h>
#include <libnautilus/nautilus-gtk-macros.h>
#include <libnautilus/nautilus-glib-extensions.h>
#include <libnautilus/nautilus-global-preferences.h>
#include <libnautilus/nautilus-file-utilities.h>
#include <libnautilus/nautilus-string.h>
#include <libnautilus-extensions/nautilus-background.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-glib-extensions.h>
#include <libnautilus-extensions/nautilus-global-preferences.h>
#include <libnautilus-extensions/nautilus-file-utilities.h>
#include <libnautilus-extensions/nautilus-string.h>
#include <stdio.h>
......
......@@ -28,7 +28,7 @@
#ifndef NAUTILUS_SERVICE_STARTUP_VIEW_H
#define NAUTILUS_SERVICE_STARTUP_VIEW_H
#include <libnautilus/ntl-content-view-frame.h>
#include <libnautilus/nautilus-content-view-frame.h>
#include <gtk/gtk.h>
typedef struct _NautilusServicesContentView NautilusServicesContentView;
......
......@@ -154,6 +154,7 @@ data/top/Makefile
idl/Makefile
librsvg/Makefile
libnautilus/Makefile
libnautilus-extensions/Makefile
nautilus-widgets/Makefile
src/Makefile
src/file-manager/Makefile
......
NULL=
lib_LTLIBRARIES=libnautilus.la
lib_LTLIBRARIES=libnautilus-extensions.la
INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(GNOME_CFLAGS) \
......@@ -12,7 +12,7 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(WERROR) \
-D_REENTRANT
libnautilus_la_LDFLAGS=\
libnautilus_extensions_la_LDFLAGS=\
$(GNOME_LIBS) \
$(GNORBA_LIBS) \
$(BONOBO_LIBS) \
......@@ -21,15 +21,14 @@ libnautilus_la_LDFLAGS=\
$(XML_LIBS) \
$(LIBPNG)
nautilus_view_component_idl_sources=nautilus-view-component-stubs.c nautilus-view-component-skels.c nautilus-view-component.h nautilus-view-component-common.c
fsextension_idl_sources=fsextension-stubs.c fsextension-skels.c fsextension-common.c fsextension.h
BUILT_SOURCES=$(nautilus_view_component_idl_sources)
BUILT_SOURCES=$(fsextension_idl_sources)
libnautilusincludedir=$(includedir)/libnautilus
libnautilusinclude_HEADERS= \
libnautilus_extensionsincludedir=$(includedir)/libnautilus
libnautilus_extensionsinclude_HEADERS= \
bonobo-stream-vfs.h \
gtkscrollframe.h \
libnautilus.h \
libnautilus-extensions.h \
nautilus-alloc.h \
nautilus-background.h \
nautilus-bonobo-extensions.h \
......@@ -56,14 +55,9 @@ libnautilusinclude_HEADERS= \
nautilus-string-list.h \
nautilus-string.h \
nautilus-xml-extensions.h \
nautilus-zoomable.h \
nautilus-view-component.h \
ntl-content-view-frame.h \
ntl-meta-view-frame.h \
ntl-view-frame.h \
$(NULL)
libnautilus_la_SOURCES=$(nautilus_view_component_idl_sources) \
libnautilus_extensions_la_SOURCES = \
bonobo-stream-vfs.c \
gtkscrollframe.c \
nautilus-background-canvas-group.c \
......@@ -97,24 +91,15 @@ libnautilus_la_SOURCES=$(nautilus_view_component_idl_sources) \
nautilus-string-list.c \
nautilus-string.c \
nautilus-xml-extensions.c \
nautilus-zoomable.c \
ntl-content-view-frame.c \
ntl-meta-view-frame.c \
ntl-view-frame.c \
$(fsextension_idl_sources) \
$(NULL)
$(nautilus_view_component_idl_sources): nautilus_view_component_idl_stamp
$(fsextension_idl_sources): fsextension_idl_stamp
nautilus_view_component_idl_stamp: nautilus-view-component.idl
orbit-idl `gnome-config --cflags idl` nautilus-view-component.idl
touch nautilus_view_component_idl_stamp
fsextension_idl_stamp: $(top_srcdir)/idl/fsextension.idl
orbit-idl `gnome-config --cflags idl` $(top_srcdir)/idl/fsextension.idl
touch fsextension_idl_stamp
CLEANFILES=nautilus_view_component_idl_stamp fsextension_idl_stamp
CLEANFILES = fsextension_idl_stamp
EXTRA_DIST = nautilus-view-component.idl
#EXTRA_DIST =
......@@ -24,17 +24,13 @@
*
*/
/* libnautilus.h: Main library header file */
/* libnautilus-extensions.h: Main library header file */
#ifndef LIBNAUTILUS_H
#define LIBNAUTILUS_H
#ifndef LIBNAUTILUS_EXTENSIONS_H
#define LIBNAUTILUS_EXTENSIONS_H
#include <bonobo.h>
#include <libnautilus/nautilus.h>
#include <libnautilus/nautilus-alloc.h>
#include <libnautilus/nautilus-directory.h>
#include <libnautilus/ntl-view-frame.h>
#include <libnautilus/ntl-meta-view-frame.h>
#include <libnautilus/ntl-content-view-frame.h>
#endif /* LIBNAUTILUS_H */
#endif /* LIBNAUTILUS_EXTENSIONS_H */
......@@ -28,7 +28,7 @@
#include <nautilus-widgets/nautilus-preferences-group.h>
#include <nautilus-widgets/nautilus-preferences-item.h>
#include <nautilus-widgets/nautilus-preferences-dialog.h>
#include <libnautilus/nautilus-glib-extensions.h>
#include <libnautilus-extensions/nautilus-glib-extensions.h>
/*
* Constants
......
......@@ -27,7 +27,7 @@
#include <gnome.h>
#include <nautilus-widgets/nautilus-preferences.h>
#include <libnautilus/nautilus-string-list.h>
#include <libnautilus-extensions/nautilus-string-list.h>
BEGIN_GNOME_DECLS
......
......@@ -27,7 +27,7 @@
#define NAUTILUS_ICON_FACTORY_H
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libnautilus/nautilus-file.h>
#include <libnautilus-extensions/nautilus-file.h>
#include <gtk/gtkobject.h>
#include <libart_lgpl/art_rect.h>
......
......@@ -24,7 +24,7 @@
#include <nautilus-widgets/nautilus-preferences-box.h>
#include <libnautilus/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
#include <gtk/gtkclist.h>
......
......@@ -23,7 +23,7 @@
*/
#include <nautilus-widgets/nautilus-preferences-dialog.h>
#include <libnautilus/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
/* #include "caption-table.h" */
......
......@@ -27,7 +27,7 @@
#include <gnome.h>
#include <gtk/gtkradiobutton.h>
#include <gtk/gtksignal.h>
#include <libnautilus/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
/* Signals */
typedef enum
......
......@@ -24,7 +24,7 @@
#include "nautilus-preferences-item.h"
#include "nautilus-preferences.h"
#include <libnautilus/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
#include <gtk/gtkcheckbutton.h>
#include <nautilus-widgets/nautilus-radio-button-group.h>
......
......@@ -24,7 +24,7 @@
#include <nautilus-widgets/nautilus-preferences-pane.h>
#include <libnautilus/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkframe.h>
......
......@@ -26,7 +26,7 @@
#include "nautilus-preferences.h"
#include <libgnome/gnome-config.h>
#include <libnautilus/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
static const char PREFERENCES_GLOBAL_DOMAIN[] = "Nautilus::Global";
......
......@@ -26,7 +26,7 @@
#include <gtk/gtkradiobutton.h>
#include <gtk/gtksignal.h>
#include <libnautilus/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>