diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-10-24 17:23:35 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-10-24 17:23:35 +0000 |
| commit | ce7e34aada50f73c8324e813316f0854a5293369 (patch) | |
| tree | 0fb97cf3fd6bc0fa7f26edb6d21dfbd065560d0e | |
| parent | 00ee7d7b5dcf01bbb60bfb3dba1fd87f663a30b7 (diff) | |
| download | nautilus-ce7e34aada50f73c8324e813316f0854a5293369.tar.gz | |
First baby steps at compiling under gnome 2.
49 files changed, 274 insertions, 613 deletions
diff --git a/.cvsignore b/.cvsignore index 04597e8ef..ffb660942 100644 --- a/.cvsignore +++ b/.cvsignore @@ -25,9 +25,9 @@ obj po stamp-h stamp-h.in -xml-i18n-extract -xml-i18n-extract.in -xml-i18n-merge -xml-i18n-merge.in -xml-i18n-update -xml-i18n-update.in +intltool-extract +intltool-extract.in +intltool-merge +intltool-merge.in +intltool-update +intltool-update.in @@ -1,3 +1,8 @@ +2001-10-24 Darin Adler <darin@bentspoon.com> + + * Lots of files: + First baby steps at compiling under GNOME 2. + 2001-10-24 Anders Carlsson <andersca@gnu.org> * libnautilus-private/nautilus-file.c diff --git a/Makefile.am b/Makefile.am index 3490e5fa0..cf08d1baa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.shared -@XML_I18N_MERGE_DESKTOP_RULE@ +@INTLTOOL_DESKTOP_RULE@ DESKTOP_IN_FILES=nautilus.desktop.in nautilus-help.desktop.in DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop) @@ -12,19 +12,22 @@ endif SUBDIRS = \ data \ icons \ - cut-n-paste-code \ libnautilus \ libnautilus-adapter \ libnautilus-private \ - helper-utilities \ - helper-scripts \ src \ + po \ + $(NULL) + +XXX = \ + cut-n-paste-code \ components \ + helper-utilities \ + helper-scripts \ $(APPLETS_SUBDIRS) \ test \ user-guide \ help \ - po \ omf-install \ $(NULL) @@ -43,16 +46,15 @@ EXTRA_DIST= \ nautilus-launch-icon.png \ gnome-starthere-96.png \ gnome-starthere.png \ - nautilusConf.sh.in \ - nautilus-config.in \ ChangeLog-20000414 \ ChangeLog-20000625 \ ChangeLog-20000831 \ ChangeLog-20001018 \ - xml-i18n-extract.in \ - xml-i18n-merge.in \ - xml-i18n-update.in \ + intltool-extract.in \ + intltool-merge.in \ + intltool-update.in \ Makefile.shared \ + add-include-prefix \ $(DESKTOP_IN_FILES) \ $(DESKTOP_FILES) \ $(NULL) diff --git a/add-include-prefix b/add-include-prefix new file mode 100755 index 000000000..f21fc5f5f --- /dev/null +++ b/add-include-prefix @@ -0,0 +1 @@ +sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//' diff --git a/applets/launcher/Makefile.am b/applets/launcher/Makefile.am index 0898a7829..ec95c391a 100644 --- a/applets/launcher/Makefile.am +++ b/applets/launcher/Makefile.am @@ -5,7 +5,6 @@ INCLUDES =\ -DDATADIR=\""$(datadir)"\" \ -DBINDIR=\""$(bindir)"\" \ -I$(top_srcdir) \ - $(APPLETS_CFLAGS) \ $(NAUTILUS_PRIVATE_CFLAGS) \ $(NULL) @@ -18,7 +17,6 @@ nautilus_launcher_applet_SOURCES =\ nautilus_launcher_applet_LDADD = \ $(top_builddir)/libnautilus/libnautilus.la \ $(top_builddir)/libnautilus-private/libnautilus-private.la \ - $(APPLETS_LIBS) \ $(NAUTILUS_PRIVATE_LIBS) \ $(NULL) diff --git a/applets/preferences-applet/Makefile.am b/applets/preferences-applet/Makefile.am index 51b241d7e..37d385ecd 100644 --- a/applets/preferences-applet/Makefile.am +++ b/applets/preferences-applet/Makefile.am @@ -5,7 +5,6 @@ INCLUDES =\ -DDATADIR=\""$(datadir)"\" \ -DBINDIR=\""$(bindir)"\" \ -I$(top_srcdir) \ - $(APPLETS_CFLAGS) \ $(NAUTILUS_PRIVATE_CFLAGS) \ $(NULL) @@ -18,7 +17,6 @@ nautilus_preferences_applet_SOURCES =\ nautilus_preferences_applet_LDADD = \ $(top_builddir)/libnautilus/libnautilus.la \ $(top_builddir)/libnautilus-private/libnautilus-private.la \ - $(APPLETS_LIBS) \ $(NAUTILUS_PRIVATE_LIBS) \ $(NULL) diff --git a/autogen.sh b/autogen.sh index ff86ffa22..11fbf2f0a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,104 +4,18 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -ORIGDIR=`pwd` -cd $srcdir - -PROJECT=nautilus -TEST_TYPE=-f -FILE=src/Makefile.am - -DIE=0 - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $PROJECT." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(libtool --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have libtool installed to compile $PROJECT." - echo "Get ftp://alpha.gnu.org/gnu/libtool-1.0h.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 -} - -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have automake installed to compile $PROJECT." - echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 +PKG_NAME="nautilus" + +(test -f $srcdir/configure.in \ + && test -f $srcdir/README \ + && test -d $srcdir/libnautilus) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level $PKG_NAME directory" + exit 1 } -(xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have xml-i18n-tools installed to compile $PROJECT." +which gnome-autogen.sh || { + echo "You need to install gnome-common from the GNOME CVS" + exit 1 } - -if test "$DIE" -eq 1; then - exit 1 -fi - -test $TEST_TYPE $FILE || { - echo "You must run this script in the top-level $PROJECT directory" - exit 1 -} - -if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." -fi - -case $CC in -*lcc | *lcc\ *) am_opt=--include-deps;; -esac - -echo "Running gettextize... Ignore non-fatal messages." -# Hmm, we specify --force here, since otherwise things don't -# get added reliably, but we don't want to overwrite intl -# while making dist. -echo "no" | gettextize --copy --force - -echo "Running xml-i18n-toolize" -xml-i18n-toolize --copy --force --automake - -echo "Running libtoolize" -libtoolize --copy --force - -if test -z "$GNOME_INTERFACE_VERSION"; then - ACLOCAL_FLAGS="-I hack-macros $ACLOCAL_FLAGS" -fi - -aclocal $ACLOCAL_FLAGS - -# optionally feature autoheader -(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader - -automake -a $am_opt - -autoconf - -cd $ORIGDIR - -if [ "`whoami`" = "sopwith" ]; then - SOPWITH_FLAGS_HACK="--enable-fatal-warnings=no --enable-more-warnings=no" -fi - -$srcdir/configure --enable-maintainer-mode "$@" $SOPWITH_FLAGS_HACK - -rv=$? - -if [ $rv -eq 0 ] -then - echo - echo "Now type 'make' to compile $PROJECT." - exit 0 -fi - -echo -echo "There was a problem running $srcdir/configure for $PROJECT." -exit 1 +USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/components/adapter/Makefile.am b/components/adapter/Makefile.am index d896f5b9b..f14b44eed 100644 --- a/components/adapter/Makefile.am +++ b/components/adapter/Makefile.am @@ -7,14 +7,14 @@ INCLUDES = \ $(NAUTILUS_PRIVATE_CFLAGS) \ $(NULL) -oafdir = $(datadir)/oaf -oaf_in_files = \ - Nautilus_ComponentAdapterFactory_std.oaf.in \ +serverdir = $(datadir)/server +server_in_files = \ + Nautilus_ComponentAdapterFactory_std.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ bin_PROGRAMS = \ nautilus-adapter \ @@ -54,5 +54,5 @@ nautilus_adapter_LDADD = \ $(NAUTILUS_PRIVATE_LIBS) \ $(NULL) -EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) +EXTRA_DIST = $(server_in_files) $(server_DATA) diff --git a/components/adapter/bonobo-stream-vfs.h b/components/adapter/bonobo-stream-vfs.h index 36989a258..1655f5661 100644 --- a/components/adapter/bonobo-stream-vfs.h +++ b/components/adapter/bonobo-stream-vfs.h @@ -27,7 +27,7 @@ #include <bonobo/bonobo-stream.h> #include <libgnomevfs/gnome-vfs.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS struct BonoboStreamVFS; typedef struct BonoboStreamVFS BonoboStreamVFS; @@ -58,6 +58,6 @@ BonoboStream * bonobo_stream_vfs_construct (BonoboStreamVFS *stream, BonoboStream * bonobo_stream_vfs_open (const char *uri, Bonobo_Storage_OpenMode mode); -END_GNOME_DECLS +G_END_DECLS #endif /* _BONOBO_STREAM_VFS_H_ */ diff --git a/components/hardware/Makefile.am b/components/hardware/Makefile.am index 28c0997a4..a43d3d658 100644 --- a/components/hardware/Makefile.am +++ b/components/hardware/Makefile.am @@ -9,15 +9,15 @@ INCLUDES = \ $(NAUTILUS_PRIVATE_CFLAGS) \ $(NULL) -oafdir = $(datadir)/oaf +serverdir = $(datadir)/server -oaf_in_files = \ - Nautilus_View_hardware.oaf.in \ +server_in_files = \ + Nautilus_View_hardware.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ bin_PROGRAMS = \ nautilus-hardware-view @@ -33,5 +33,5 @@ nautilus_hardware_view_LDADD = \ $(NAUTILUS_PRIVATE_LIBS) \ $(NULL) -EXTRA_DIST = $(oaf_DATA) $(oaf_in_files) +EXTRA_DIST = $(server_DATA) $(server_in_files) diff --git a/components/help/Makefile.am b/components/help/Makefile.am index 7821d723d..dd23c472b 100644 --- a/components/help/Makefile.am +++ b/components/help/Makefile.am @@ -40,11 +40,11 @@ modulesdir = $(libdir)/vfs/modules libvfs_help_la_SOURCES = help-method.c help-method.h libvfs_help_la_LDFLAGS = $(module_flags) -libvfs_help_la_LIBADD = $(GLIB_LIBS) +libvfs_help_la_LIBADD = test_help_method_SOURCES = test-help-method.c -test_help_method_LIBASS = $(GLIB_LIBS) +test_help_method_LDADD = modulesconfdir=$(sysconfdir)/vfs/modules @@ -53,13 +53,13 @@ modulesconf_DATA = help-methods.conf hyperboladir=$(datadir)/nautilus/components/hyperbola hyperbola_DATA=topleveldocs.xml -oafdir = $(datadir)/oaf -oaf_in_files = \ - Nautilus_View_help.oaf.in \ +serverdir = $(datadir)/server +server_in_files = \ + Nautilus_View_help.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ -EXTRA_DIST=pages.map $(oaf_in_files) $(oaf_DATA) help-methods.conf topleveldocs.xml +EXTRA_DIST=pages.map $(server_in_files) $(server_DATA) help-methods.conf topleveldocs.xml diff --git a/components/help/converters/ChangeLog b/components/help/converters/ChangeLog index d9b8e0d07..12ccf35e3 100644 --- a/components/help/converters/ChangeLog +++ b/components/help/converters/ChangeLog @@ -1,3 +1,11 @@ +2001-10-24 Darin Adler <darin@bentspoon.com> + + reviewed by: <delete if not using a buddy> + + * gnome-db2html2/Makefile.am: + * gnome-db2html3/Makefile.am: + * gnome-info2html2/Makefile.am: + === nautilus 1.0.5 === 2001-09-21 Philip Langdale <philipl@mail.utexas.edu> diff --git a/components/help/converters/gnome-db2html2/Makefile.am b/components/help/converters/gnome-db2html2/Makefile.am index cce50c003..9a27f7b75 100644 --- a/components/help/converters/gnome-db2html2/Makefile.am +++ b/components/help/converters/gnome-db2html2/Makefile.am @@ -1,12 +1,9 @@ ## Process this file with automake to produce Makefile.in. INCLUDES = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(GNOMEUI_CFLAGS) \ - $(XML_CFLAGS) + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -LDADD = \ - $(GNOME_LIBS) $(XML_LIBS) +LDADD = bin_PROGRAMS = gnome-db2html2 diff --git a/components/help/converters/gnome-db2html3/Makefile.am b/components/help/converters/gnome-db2html3/Makefile.am index 913ac7662..6e8a2e2f8 100644 --- a/components/help/converters/gnome-db2html3/Makefile.am +++ b/components/help/converters/gnome-db2html3/Makefile.am @@ -2,14 +2,10 @@ SUBDIRS= docbook gnome-customization INCLUDES = \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(GNOMEUI_CFLAGS) \ -DPREFIXDIR=\""$(prefix)"\" \ - $(GNOME_DB2HTML3_FLAG) \ - $(XML2_CFLAGS) \ - $(XSLT_CFLAGS) + $(GNOME_DB2HTML3_FLAG) -LDADD = \ - $(GNOME_LIBS) $(XML2_LIBS) $(XSLT_LIBS) +LDADD = bin_PROGRAMS = gnome-db2html3 diff --git a/components/help/converters/gnome-info2html2/Makefile.am b/components/help/converters/gnome-info2html2/Makefile.am index 7ac59f7ba..2bc7984c7 100644 --- a/components/help/converters/gnome-info2html2/Makefile.am +++ b/components/help/converters/gnome-info2html2/Makefile.am @@ -1,10 +1,7 @@ ## Process this file with automake to produce Makefile.in. -INCLUDES = \ - $(GNOMEUI_CFLAGS) - -LDADD = \ - $(GNOME_LIBS) $(Z_LIBS) $(BZ_LIBS) +INCLUDES = +LDADD = bin_PROGRAMS = gnome-info2html2 diff --git a/components/history/Makefile.am b/components/history/Makefile.am index b15992397..a939cda35 100644 --- a/components/history/Makefile.am +++ b/components/history/Makefile.am @@ -16,15 +16,15 @@ LDADD=\ nautilus_history_view_SOURCES=nautilus-history-view.c -oafdir = $(datadir)/oaf +serverdir = $(datadir)/server -oaf_in_files = \ - Nautilus_View_history.oaf.in \ +server_in_files = \ + Nautilus_View_history.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ -EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) +EXTRA_DIST=$(server_DATA) $(server_in_files) diff --git a/components/image-viewer/Makefile.am b/components/image-viewer/Makefile.am index d32364fa1..9e0d3eda0 100644 --- a/components/image-viewer/Makefile.am +++ b/components/image-viewer/Makefile.am @@ -18,14 +18,14 @@ nautilus_image_view_LDADD = \ $(NAUTILUS_PRIVATE_LIBS) \ $(NULL) -oafdir = $(datadir)/oaf +serverdir = $(datadir)/server -oaf_in_files = \ - Nautilus_View_image.oaf.in \ +server_in_files = \ + Nautilus_View_image.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ -EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) +EXTRA_DIST=$(server_DATA) $(server_in_files) diff --git a/components/loser/content/Makefile.am b/components/loser/content/Makefile.am index 614977e07..1eea56d25 100644 --- a/components/loser/content/Makefile.am +++ b/components/loser/content/Makefile.am @@ -24,13 +24,13 @@ nautilus_content_loser_LDADD = \ $(NAUTILUS_PRIVATE_LIBS) \ $(NULL) -oafdir = $(datadir)/oaf +serverdir = $(datadir)/server -oaf_in_files = \ - Nautilus_View_content-loser.oaf.in \ +server_in_files = \ + Nautilus_View_content-loser.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ -EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(ui_DATA) +EXTRA_DIST=$(server_DATA) $(server_in_files) $(ui_DATA) diff --git a/components/loser/sidebar/Makefile.am b/components/loser/sidebar/Makefile.am index 1e4339958..88f4b5bd7 100644 --- a/components/loser/sidebar/Makefile.am +++ b/components/loser/sidebar/Makefile.am @@ -24,13 +24,13 @@ nautilus_sidebar_loser_LDADD = \ $(NAUTILUS_PRIVATE_LIBS) \ $(NULL) -oafdir = $(datadir)/oaf +serverdir = $(datadir)/server -oaf_in_files = \ - Nautilus_View_sidebar-loser.oaf.in \ +server_in_files = \ + Nautilus_View_sidebar-loser.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ -EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(ui_DATA) +EXTRA_DIST=$(server_DATA) $(server_in_files) $(ui_DATA) diff --git a/components/mozilla/Makefile.am b/components/mozilla/Makefile.am index fe4bbf789..f2b444372 100644 --- a/components/mozilla/Makefile.am +++ b/components/mozilla/Makefile.am @@ -47,19 +47,19 @@ nautilus_mozilla_content_view_LDFLAGS = \ $(MOZILLA_COMPONENT_RPATH_FLAGS) \ $(NULL) -oafdir = $(datadir)/oaf +serverdir = $(datadir)/server -oaf_in_files = \ - Nautilus_View_mozilla.oaf.in \ +server_in_files = \ + Nautilus_View_mozilla.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ uidir = $(datadir)/gnome/ui ui_DATA = \ nautilus-mozilla-ui.xml \ $(NULL) -EXTRA_DIST = $(oaf_DATA) $(ui_DATA) $(oaf_in_files) +EXTRA_DIST = $(server_DATA) $(ui_DATA) $(server_in_files) diff --git a/components/music/Makefile.am b/components/music/Makefile.am index 1a94466cd..6f8667d29 100644 --- a/components/music/Makefile.am +++ b/components/music/Makefile.am @@ -62,17 +62,17 @@ nautilus_music_view_LDADD = \ $(NAUTILUS_PRIVATE_LIBS) \ $(NULL) -oafdir = $(datadir)/oaf +serverdir = $(datadir)/server -oaf_in_files = \ - Nautilus_View_music.oaf.in \ +server_in_files = \ + Nautilus_View_music.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ -EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(platform_source) \ +EXTRA_DIST=$(server_DATA) $(server_in_files) $(platform_source) \ configure.c \ fileinfo.c \ getbits.c diff --git a/components/news/Makefile.am b/components/news/Makefile.am index 9bb601b54..326ee4f4e 100644 --- a/components/news/Makefile.am +++ b/components/news/Makefile.am @@ -26,17 +26,17 @@ nautiluspixmapdir = $(datadir)/pixmaps/nautilus nautiluspixmap_DATA = news_bullet.png \ changed_bullet.png -oafdir = $(datadir)/oaf -oaf_in_files = \ - Nautilus_View_news.oaf.in \ +serverdir = $(datadir)/server +server_in_files = \ + Nautilus_View_news.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ EXTRA_DIST= \ $(nautilus_DATA) \ $(nautiluspixmap_DATA) \ - $(oaf_DATA)\ - $(oaf_in_files) \ + $(server_DATA)\ + $(server_in_files) \ $(NULL) diff --git a/components/notes/Makefile.am b/components/notes/Makefile.am index d5a9754e5..4850d1b93 100644 --- a/components/notes/Makefile.am +++ b/components/notes/Makefile.am @@ -17,15 +17,15 @@ LDADD=\ nautilus_notes_SOURCES=nautilus-notes.c -oafdir = $(datadir)/oaf -oaf_in_files = \ - Nautilus_View_notes.oaf.in \ +serverdir = $(datadir)/server +server_in_files = \ + Nautilus_View_notes.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ EXTRA_DIST= \ - $(oaf_DATA)\ - $(oaf_in_files) \ + $(server_DATA)\ + $(server_in_files) \ $(NULL) diff --git a/components/sample/Makefile.am b/components/sample/Makefile.am index 4104781b9..f65a5c3ea 100644 --- a/components/sample/Makefile.am +++ b/components/sample/Makefile.am @@ -10,9 +10,7 @@ INCLUDES = \ -DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \ -I$(top_srcdir) \ -I$(top_builddir) \ - $(GNOMEUI_CFLAGS) \ - $(BONOBO_CFLAGS) \ - $(OAF_CFLAGS) + $(MODULE_CFLAGS) bin_PROGRAMS = \ nautilus-sample-content-view @@ -24,20 +22,17 @@ nautilus_sample_content_view_SOURCES = \ nautilus_sample_content_view_LDADD = \ $(top_builddir)/libnautilus/libnautilus.la \ - $(BONOBO_LIBS) \ - $(BONOBOX_LIBS) \ - $(VFS_LIBS) \ - $(OAF_LIBS) + $(MODULE_LIBS) uidir = $(datadir)/gnome/ui ui_DATA = nautilus-sample-content-view-ui.xml -oafdir = $(datadir)/oaf -oaf_in_files = \ - Nautilus_View_sample.oaf.in \ +serverdir = $(datadir)/server +server_in_files = \ + Nautilus_View_sample.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ -EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA) +EXTRA_DIST = $(server_in_files) $(server_DATA) $(ui_DATA) diff --git a/components/text/Makefile.am b/components/text/Makefile.am index 59553ca29..ffa7f6043 100644 --- a/components/text/Makefile.am +++ b/components/text/Makefile.am @@ -27,14 +27,14 @@ nautilus_text_view_LDADD = \ uidir = $(datadir)/gnome/ui ui_DATA = nautilus-text-view-ui.xml -oafdir = $(datadir)/oaf -oaf_in_files = \ - Nautilus_View_text.oaf.in \ +serverdir = $(datadir)/server +server_in_files = \ + Nautilus_View_text.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ -EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA) +EXTRA_DIST = $(server_in_files) $(server_DATA) $(ui_DATA) diff --git a/components/throbber/Makefile.am b/components/throbber/Makefile.am index ec3804579..288006751 100644 --- a/components/throbber/Makefile.am +++ b/components/throbber/Makefile.am @@ -22,15 +22,15 @@ nautilus_throbber_LDADD = \ $(NAUTILUS_PRIVATE_LIBS) \ $(NULL) -oafdir = $(datadir)/oaf -oaf_in_files = \ - Nautilus_Control_throbber.oaf.in \ +serverdir = $(datadir)/server +server_in_files = \ + Nautilus_Control_throbber.server.in \ $(NULL) -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ EXTRA_DIST = \ - $(oaf_in_files) \ - $(oaf_DATA) \ + $(server_in_files) \ + $(server_DATA) \ $(NULL) diff --git a/components/tree/Makefile.am b/components/tree/Makefile.am index 55e1dcfeb..435dde96a 100644 --- a/components/tree/Makefile.am +++ b/components/tree/Makefile.am @@ -34,11 +34,11 @@ libnautilus_tree_view_la_SOURCES = \ libmain.c \ $(NULL) -oafdir = $(datadir)/oaf -oaf_in_files = Nautilus_View_tree.oaf.in -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +serverdir = $(datadir)/server +server_in_files = Nautilus_View_tree.server.in +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ -EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) +EXTRA_DIST = $(server_in_files) $(server_DATA) diff --git a/configure.in b/configure.in index 3a226a852..dfabb5370 100644 --- a/configure.in +++ b/configure.in @@ -7,58 +7,96 @@ dnl it too, or it will never make it into the spec file! dnl dnl ========================================================================== -BONOBO_REQUIRED=1.0.9 +ART_REQUIRED=2.3.6 +BONOBO_ACTIVATION_REQUIRED=0.9.2 +BONOBO_REQUIRED=1.103 EEL_REQUIRED=1.0.2 ESOUND_REQUIRED=0.2.22 GCONF_REQUIRED=0.12 -GDK_PIXBUF_REQUIRED=0.10.0 -GLIB_REQUIRED=1.2.9 -GNOME_LIBS_REQUIRED=1.2.11 -GNOME_REQUIRED=1.2.8 -GNOME_VFS_REQUIRED=1.0.3 -GTK_REQUIRED=1.2.9 +GDK_PIXBUF_REQUIRED=1.3.9 +GLIB_REQUIRED=1.3.9 +GNOME_CANVAS_REQUIRED=1.104 +GNOME_REQUIRED=1.104 +GNOME_UI_REQUIRED=1.104 +GNOME_VFS_REQUIRED=1.1 +GTK_REQUIRED=1.3.9 IMLIB_REQUIRED=1.9.8 -LIBRSVG_REQUIRED=1.0.1 -LIBXML_REQUIRED=1.8.10 MEDUSA_REQUIRED=0.5.1 -OAF_REQUIRED=0.6.5 ORBIT_REQUIRED=0.5.7 POPT_REQUIRED=1.5 +RSVG_REQUIRED=1.1 SCROLLKEEPER_REQUIRED=0.1.4 +XML_REQUIRED=2.4.6 AC_SUBST(EEL_REQUIRED) AC_SUBST(ESOUND_REQUIRED) AC_SUBST(GNOME_VFS_REQUIRED) AC_SUBST(IMLIB_REQUIRED) -AC_SUBST(LIBRSVG_REQUIRED) -AC_SUBST(LIBXML_REQUIRED) AC_SUBST(MEDUSA_REQUIRED) AC_SUBST(ORBIT_REQUIRED) AC_SUBST(POPT_REQUIRED) +AC_SUBST(RSVG_REQUIRED) AC_SUBST(SCROLLKEEPER_REQUIRED) +AC_SUBST(XML_REQUIRED) dnl =========================================================================== AM_INIT_AUTOMAKE(nautilus, 1.0.5) AM_CONFIG_HEADER(config.h) +AM_SANITY_CHECK AM_MAINTAINER_MODE -AM_DISABLE_STATIC -AM_PROG_LIBTOOL - -AM_PROG_XML_I18N_TOOLS - -AM_SANITY_CHECK +AC_C_BIGENDIAN +AC_C_CONST +AC_ISC_POSIX AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL +AC_PROG_INTLTOOL AC_PROG_LN_S AC_PROG_MAKE_SET -AC_ISC_POSIX -AM_PATH_ESD +AM_DISABLE_STATIC +AM_PROG_LIBTOOL -AM_PATH_ORBIT +AM_PATH_ESD +AM_PATH_ORBIT2 + +GNOME_PLATFORM_GNOME_2(yes) + +PKG_CHECK_MODULES(ALL, \ + bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED \ + eel-2.0 >= $EEL_REQUIRED \ + glib-2.0 >= $GLIB_REQUIRED \ + gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + libart-2.0 >= $ART_REQUIRED \ + libbonobo-2.0 >= $BONOBO_REQUIRED \ + libbonoboui-2.0 >= $BONOBO_REQUIRED \ + libgnome-2.0 >= $GNOME_REQUIRED \ + libgnomecanvas-2.0 >= $GNOME_CANVAS_REQUIRED \ + libgnomeui-2.0 >= $GNOME_UI_REQUIRED \ + librsvg-2.0 >= $RSVG_REQUIRED \ + libxml-2.0 >= $XML_REQUIRED) + +dnl libnautilus + +LIBNAUTILUS_MODULES="\ + bonobo-activation-2.0 \ + eel-2.0 \ + glib-2.0 \ + gnome-vfs-2.0 \ + gtk+-2.0 \ + libbonobo-2.0 \ + libbonoboui-2.0" +LIBNAUTILUS_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_MODULES`" +AC_SUBST(LIBNAUTILUS_CFLAGS) +LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" +AC_SUBST(LIBNAUTILUS_LIBS) +LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`" +AC_SUBST(LIBNAUTILUS_IDL_INCLUDES) + +dnl libnautilus-private dnl ==================================== dnl = Begin profiling support @@ -333,122 +371,6 @@ AC_CHECK_HEADERS(cdda_interface.h cdda_paranoia.h, [ ]) dnl ==================================== -dnl Gnome libraries. -dnl ==================================== - -AM_PATH_GLIB($GLIB_REQUIRED,, -AC_MSG_ERROR([ -*** GLIB $GLIB_REQUIRED or better is required. The latest version of GLIB -*** is always available from ftp://ftp.gtk.org/.])) - -AC_SUBST(GLIB_REQUIRED) - -AM_PATH_GTK($GTK_REQUIRED,, -AC_MSG_ERROR([ -*** Gtk+ $GTK_REQUIRED or better is required. The latest version of GTK -*** is always available from ftp://ftp.gtk.org/.])) - -AC_SUBST(GTK_REQUIRED) - -AM_PATH_GNOME($GNOME_REQUIRED,,AC_MSG_ERROR([*** GNOME $GNOME_REQUIRED or better is required.]), vfs xml bonobo bonobox bonobox_print idl gnomeui gtk gdk_pixbuf gnomecanvaspixbuf eel librsvg) - -AC_SUBST(GNOME_REQUIRED) - -AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) -if test x$GNOME_CONFIG = xno; then - AC_MSG_ERROR(Couldn't find gnome-config. Please install the GNOME package) -fi - -NAUTILUS_VERSION_INSIST(gnome-libs, $GNOME_CONFIG --version | awk '{print $2}', >=, GNOME_LIBS_REQUIRED) - -NAUTILUS_VERSION_INSIST(bonobo, $GNOME_CONFIG --modversion bonobo | awk -F- '{print $2}', >=, BONOBO_REQUIRED) - -AC_SUBST(GNOMECANVASPIXBUF_LIBS) -AC_SUBST(GNOMECANVASPIXBUF_CFLAGS) -AC_SUBST(BONOBO_CFLAGS) -AC_SUBST(BONOBO_LIBS) -AC_SUBST(BONOBOX_CFLAGS) -AC_SUBST(BONOBOX_LIBS) -AC_SUBST(BONOBO_PRINT_CFLAGS) -AC_SUBST(BONOBO_PRINT_LIBS) -AC_SUBST(VFS_CFLAGS) -AC_SUBST(VFS_LIBS) -AC_SUBST(LIBRSVG_LIBS) -AC_SUBST(LIBRSVG_CFLAGS) -AC_SUBST(EEL_LIBS) -AC_SUBST(EEL_CFLAGS) - -dnl Rediscover CFLAGS for GTK, because gnome-config won't know -dnl all the necessary flags if GTK has been upgraded more recently than -dnl it has. See bugzilla.gnome.org bug 47315. - -AC_PATH_PROG(GTK_CONFIG,gtk-config,false) -AC_MSG_CHECKING(for gtk-config cflags) -GTK_CFLAGS=`$GTK_CONFIG --cflags` -AC_MSG_RESULT($GTK_CFLAGS) -GNOMEUI_CFLAGS="$GNOMEUI_CFLAGS $GTK_CFLAGS" -AC_SUBST(GNOMEUI_CFLAGS) - -IDL_CFLAGS="${IDL_CFLAGS} -I\$(top_srcdir) -I\$(top_builddir)" - -echo "IDL_CFLAGS: $IDL_CFLAGS" - -AC_SUBST(IDL_CFLAGS) - -AM_PATH_OAF($OAF_REQUIRED) -AC_SUBST(OAF_REQUIRED) - -AM_PATH_GCONF($GCONF_REQUIRED,,,gconf-gtk) -AC_SUBST(GCONF_REQUIRED) - -AC_PATH_PROG(XML_CONFIG,xml-config,no) -if test x$XML_CONFIG = xno; then - AC_MSG_ERROR(Couldn't find xml-config please install the gnome-xml package) -fi - -XML_VERSION="`$XML_CONFIG --version`" -case "$XML_VERSION" in - 1.*) - : - ;; - - *) - AC_ERROR(Nautilus needs gnome-xml version 1.x not $XML_VERSION) - ;; -esac - -XML_LIBS=`$XML_CONFIG --libs` -XML_CFLAGS=`$XML_CONFIG --cflags` -AC_SUBST(XML_LIBS) -AC_SUBST(XML_CFLAGS) - -#BUILD_GNOME_DB2HTML3=yes -if test x$BUILD_GNOME_DB2HTML3 = xyes; then - AC_PATH_PROG(XML2_CONFIG,xml2-config,no) - if test x$XML2_CONFIG = xno; then - AC_MSG_ERROR(Couldn't find xml2-config please install the libxml2 package) - fi - - XML2_LIBS=`$XML2_CONFIG --libs` - XML2_CFLAGS=`$XML2_CONFIG --cflags` - AC_SUBST(XML2_LIBS) - AC_SUBST(XML2_CFLAGS) - - AC_PATH_PROG(XSLT_CONFIG,xslt-config,no) - if test x$XSLT_CONFIG = xno; then - AC_MSG_ERROR(Couldn't find xslt-config please install the libxslt package) - fi - - XSLT_LIBS=`$XSLT_CONFIG --libs` - XSLT_CFLAGS=`$XSLT_CONFIG --cflags` - AC_SUBST(XSLT_LIBS) - AC_SUBST(XSLT_CFLAGS) - - GNOME_DB2HTML3_FLAG=-DUSE_GNOME_DB2HTML3 - AC_SUBST(GNOME_DB2HTML3_FLAG) -fi - -dnl ==================================== dnl = Begin tests for scrollkeeper dnl ==================================== @@ -477,47 +399,6 @@ dnl = End tests for jw dnl ==================================== dnl ==================================== -dnl = begin applet checks -dnl ==================================== -AC_MSG_CHECKING(for applets) -APPLETS_CFLAGS= -APPLETS_LIBS= -HAVE_APPLETS="no" - -gnome-config | grep applets > /dev/null 2>&1 - -if test $? -eq 0 -then - HAVE_APPLETS="yes" - APPLETS_CFLAGS=`gnome-config --cflags applets` - APPLETS_LIBS=`gnome-config --libs applets` - AC_MSG_RESULT(yes) -else - HAVE_APPLETS="no" - AC_MSG_RESULT(no) -fi - -AM_CONDITIONAL(HAVE_APPLETS, test "x$HAVE_APPLETS" = "xyes") - -AC_SUBST(HAVE_APPLETS) -AC_SUBST(APPLETS_CFLAGS) -AC_SUBST(APPLETS_LIBS) -dnl ==================================== -dnl = begin applet checks -dnl ==================================== - -dnl ==================================== -dnl = begin gdk-pixbuf checks -dnl ==================================== -AM_PATH_GDK_PIXBUF($GDK_PIXBUF_REQUIRED,, -AC_MSG_ERROR([*** gdk_pixbuf $GDK_PIXBUF_REQUIRED or better is required.])) - -AC_SUBST(GDK_PIXBUF_REQUIRED) -dnl ==================================== -dnl = end gdk-pixbuf checks -dnl ==================================== - -dnl ==================================== dnl = zlib for help converters dnl ==================================== AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz @@ -604,17 +485,17 @@ dnl ======================= dnl Checks for i18n ALL_LINGUAS="az ca cs da de el en_GB es fi fr ga gl hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sv ta tr uk zh_TW" -AM_GNOME_GETTEXT -# AM_GNOME_GETTEXT above substs $DATADIRNAME +AM_GNOME2_GETTEXT +# AM_GNOME2_GETTEXT above substs $DATADIRNAME # this is the directory where the *.{mo,gmo} files are installed gnomelocaledir='${prefix}/${DATADIRNAME}/locale' AC_SUBST(gnomelocaledir) dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_C_BIGENDIAN +dnl dnl Turn on the additional warnings last, so -Werror doesn't affect other tests. +dnl AC_ARG_ENABLE(more-warnings, [ --enable-more-warnings Maximum compiler warnings], @@ -656,52 +537,6 @@ else AC_MSG_RESULT(no) fi -dnl -dnl Define the build message (used in the Nautilus about box) -dnl CVSVERSION overrides -dnl - -NAUTILUS_BUILD_MESSAGE="" -AC_ARG_WITH(build-message, [ --with-build-message=MESSAGE Build (about box) message], NAUTILUS_BUILD_MESSAGE=$withval) - -if test -n "$is_cvs_version" -then - NAUTILUS_BUILD_MESSAGE="Development Build" -fi - -AC_DEFINE_UNQUOTED(NAUTILUS_BUILD_MESSAGE, "$NAUTILUS_BUILD_MESSAGE") - -NAUTILUS_SOURCE_DIRECTORY=`(cd $srcdir && pwd)` -AC_DEFINE_UNQUOTED(NAUTILUS_SOURCE_DIRECTORY, "$NAUTILUS_SOURCE_DIRECTORY") - -dnl -dnl Define the build timestamp if given in the environment. -dnl -if test -n "$EAZEL_BUILD_TIMESTAMP" -then - AC_DEFINE_UNQUOTED(EAZEL_BUILD_TIMESTAMP,"$EAZEL_BUILD_TIMESTAMP") -fi - -dnl Flags for libraries that Nautilus depends on -NAUTILUS_DEPENDENCY_CFLAGS="`$GNOME_CONFIG --cflags bonobo bonobox bonobox_print gnomecanvaspixbuf xml vfs eel`" -NAUTILUS_DEPENDENCY_LIBS="`$GNOME_CONFIG --libs bonobo bonobox bonobox_print gnomecanvaspixbuf xml vfs eel`" -AC_SUBST(NAUTILUS_DEPENDENCY_CFLAGS) -AC_SUBST(NAUTILUS_DEPENDENCY_LIBS) - -dnl Flags for modules that depend on Nautilus -NAUTILUS_LIBDIR='-L${libdir}' -NAUTILUS_INCLUDEDIR="-I${includedir} ${NAUTILUS_DEPENDENCY_CFLAGS}" -NAUTILUS_LIBS="-lnautilus ${NAUTILUS_DEPENDENCY_LIBS}" -AC_SUBST(NAUTILUS_LIBDIR) -AC_SUBST(NAUTILUS_INCLUDEDIR) -AC_SUBST(NAUTILUS_LIBS) - -dnl Flags for libraries that private parts of Nautilus depend on (like components) -NAUTILUS_PRIVATE_CFLAGS="${NAUTILUS_DEPENDENCY_CFLAGS}" -NAUTILUS_PRIVATE_LIBS="${NAUTILUS_DEPENDENCY_LIBS}" -AC_SUBST(NAUTILUS_PRIVATE_CFLAGS) -AC_SUBST(NAUTILUS_PRIVATE_LIBS) - AC_OUTPUT([ nautilus.spec Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 5401f4bcf..ff0e52b7f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,7 @@ NULL= -@XML_I18N_MERGE_DESKTOP_RULE@ -@XML_I18N_MERGE_DIRECTORY_RULE@ +@INTLTOOL_DESKTOP_RULE@ +@INTLTOOL_DIRECTORY_RULE@ DESKTOP_IN_FILES= favorites.desktop.in \ programs.desktop.in \ diff --git a/helper-utilities/error-dialog/Makefile.am b/helper-utilities/error-dialog/Makefile.am index 5d14881cd..c3ba05d1a 100644 --- a/helper-utilities/error-dialog/Makefile.am +++ b/helper-utilities/error-dialog/Makefile.am @@ -3,7 +3,6 @@ NULL = INCLUDES = \ -DG_LOG_DOMAIN=\"NautilusErrorDialog\" \ -I$(top_srcdir) \ - $(GNOMEUI_CFLAGS) \ -DVERSION="\"$(VERSION)\"" \ $(NULL) @@ -13,6 +12,4 @@ nautilus_error_dialog_SOURCES =\ nautilus-error-dialog.c \ $(NULL) -nautilus_error_dialog_LDADD = \ - $(GNOMEUI_LIBS) \ - $(NULL) +nautilus_error_dialog_LDADD = diff --git a/libnautilus-private/nautilus-druid-page-eazel.h b/libnautilus-private/nautilus-druid-page-eazel.h index fb33e50ca..d0e51cfd9 100644 --- a/libnautilus-private/nautilus-druid-page-eazel.h +++ b/libnautilus-private/nautilus-druid-page-eazel.h @@ -28,7 +28,7 @@ #include <libgnomeui/gnome-druid-page.h> #include <gdk-pixbuf/gdk-pixbuf.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS #define NAUTILUS_TYPE_DRUID_PAGE_EAZEL (nautilus_druid_page_eazel_get_type ()) #define NAUTILUS_DRUID_PAGE_EAZEL(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_DRUID_PAGE_EAZEL, NautilusDruidPageEazel)) @@ -95,6 +95,6 @@ void nautilus_druid_page_eazel_set_sidebar_image (NautilusDruidPageEazel * void nautilus_druid_page_eazel_set_background_image(NautilusDruidPageEazel *druid_page_eazel, GdkPixbuf *background_image); -END_GNOME_DECLS +G_END_DECLS #endif /* NAUTILUS_DRUID_PAGE_EAZEL_H */ diff --git a/libnautilus-private/nautilus-druid.h b/libnautilus-private/nautilus-druid.h index a85c14194..950035cf9 100644 --- a/libnautilus-private/nautilus-druid.h +++ b/libnautilus-private/nautilus-druid.h @@ -27,7 +27,7 @@ #include <libgnome/gnome-defs.h> #include <libgnomeui/gnome-druid.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS #define NAUTILUS_TYPE_DRUID (nautilus_druid_get_type ()) #define NAUTILUS_DRUID(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_DRUID, NautilusDruid)) @@ -52,6 +52,6 @@ struct NautilusDruidClass GtkType nautilus_druid_get_type (void); GtkWidget *nautilus_druid_new (void); -END_GNOME_DECLS +G_END_DECLS #endif /* NAUTILUS_DRUID_H */ diff --git a/libnautilus-private/nautilus-entry.h b/libnautilus-private/nautilus-entry.h index dc94d2711..c77c2f058 100644 --- a/libnautilus-private/nautilus-entry.h +++ b/libnautilus-private/nautilus-entry.h @@ -30,7 +30,7 @@ #include <libgnome/gnome-defs.h> #include <gtk/gtkentry.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS #define NAUTILUS_TYPE_ENTRY \ (nautilus_entry_get_type ()) @@ -67,6 +67,6 @@ void nautilus_entry_select_all_at_idle (NautilusEntry *entry); void nautilus_entry_set_special_tab_handling (NautilusEntry *entry, gboolean special_tab_handling); -END_GNOME_DECLS +G_END_DECLS #endif /* NAUTILUS_ENTRY_H */ diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h index e180edc9a..32c943b75 100644 --- a/libnautilus-private/nautilus-global-preferences.h +++ b/libnautilus-private/nautilus-global-preferences.h @@ -28,7 +28,7 @@ #include <eel/eel-preferences.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS /* Which theme is active */ #define NAUTILUS_PREFERENCES_THEME "preferences/theme" @@ -198,6 +198,6 @@ struct EelScalableFont *nautilus_global_preferences_get_default_smooth_bold_font void nautilus_global_preferences_set_default_folder_viewer (const char *iid); -END_GNOME_DECLS +G_END_DECLS #endif /* NAUTILUS_PREFS_GLOBAL_H */ diff --git a/libnautilus-private/nautilus-horizontal-splitter.h b/libnautilus-private/nautilus-horizontal-splitter.h index bf62163a6..30f94834a 100644 --- a/libnautilus-private/nautilus-horizontal-splitter.h +++ b/libnautilus-private/nautilus-horizontal-splitter.h @@ -28,7 +28,7 @@ #include <libgnome/gnome-defs.h> #include "e-hpaned.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS #define NAUTILUS_TYPE_HORIZONTAL_SPLITTER (nautilus_horizontal_splitter_get_type ()) #define NAUTILUS_HORIZONTAL_SPLITTER(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_HORIZONTAL_SPLITTER, NautilusHorizontalSplitter)) @@ -55,6 +55,6 @@ void nautilus_horizontal_splitter_collapse (NautilusHorizontalSplitter *split void nautilus_horizontal_splitter_expand (NautilusHorizontalSplitter *splitter); void nautilus_horizontal_splitter_toggle_position (NautilusHorizontalSplitter *splitter); -END_GNOME_DECLS +G_END_DECLS #endif /* NAUTILUS_HORIZONTAL_SPLITTER_H */ diff --git a/libnautilus-private/nautilus-icon-canvas-item.h b/libnautilus-private/nautilus-icon-canvas-item.h index 35b1cc6d5..0672cc96b 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.h +++ b/libnautilus-private/nautilus-icon-canvas-item.h @@ -31,7 +31,7 @@ #include "nautilus-icon-factory.h" #include <eel/eel-scalable-font.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS #define NAUTILUS_TYPE_ICON_CANVAS_ITEM \ (nautilus_icon_canvas_item_get_type ()) @@ -93,6 +93,6 @@ void nautilus_icon_canvas_item_set_smooth_font (NautilusIconCanv void nautilus_icon_canvas_item_set_smooth_font_size (NautilusIconCanvasItem *item, int font_size); -END_GNOME_DECLS +G_END_DECLS #endif /* NAUTILUS_ICON_CANVAS_ITEM_H */ diff --git a/libnautilus/Makefile.am b/libnautilus/Makefile.am index 1e6b40ca5..5c40bc7a6 100644 --- a/libnautilus/Makefile.am +++ b/libnautilus/Makefile.am @@ -6,7 +6,7 @@ INCLUDES=\ -I$(builddir) \ -I$(top_srcdir) \ -I$(top_builddir) \ - $(NAUTILUS_DEPENDENCY_CFLAGS) \ + $(LIBNAUTILUS_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ $(NULL) @@ -56,13 +56,13 @@ libnautilus_la_SOURCES= \ $(nautilus_view_component_idl_sources): nautilus_view_component_idl_stamp nautilus_view_component_idl_stamp: nautilus-view-component.idl - $(ORBIT_IDL) $(IDL_CFLAGS) --define=NAUTILUS_VIEW_COMPONENT_COMPILATION $(srcdir)/nautilus-view-component.idl - touch nautilus_view_component_idl_stamp + $(ORBIT_IDL) $(LIBNAUTILUS_IDL_INCLUDES) --define=NAUTILUS_VIEW_COMPONENT_COMPILATION $< + touch $@ $(nautilus_distributed_undo_idl_sources): nautilus_distributed_undo_idl_stamp nautilus_distributed_undo_idl_stamp: nautilus-distributed-undo.idl - $(ORBIT_IDL) $(IDL_CFLAGS) $(srcdir)/nautilus-distributed-undo.idl - touch nautilus_distributed_undo_idl_stamp + $(ORBIT_IDL) $(LIBNAUTILUS_IDL_INCLUDES) $< + touch $@ $(libnautilus_la_OBJECTS): nautilus_view_component_idl_stamp nautilus_distributed_undo_idl_stamp diff --git a/libnautilus/nautilus-bonobo-workarounds.c b/libnautilus/nautilus-bonobo-workarounds.c index 082ab6b4e..747897a51 100644 --- a/libnautilus/nautilus-bonobo-workarounds.c +++ b/libnautilus/nautilus-bonobo-workarounds.c @@ -79,42 +79,6 @@ typedef struct { guint destroy_handler_id; } DestroyLaterData; -POA_Bonobo_Unknown__epv * -nautilus_bonobo_object_get_epv (void) -{ - static POA_Bonobo_Unknown__epv bonobo_object_epv; - static gboolean set_up; - POA_Bonobo_Unknown__epv *epv; - - /* Make our own copy. */ - if (!set_up) { - epv = bonobo_object_get_epv (); - bonobo_object_epv = *epv; - g_free (epv); - set_up = TRUE; - } - - return &bonobo_object_epv; -} - -POA_Bonobo_Stream__epv * -nautilus_bonobo_stream_get_epv (void) -{ - static POA_Bonobo_Stream__epv bonobo_stream_epv; - static gboolean set_up; - POA_Bonobo_Stream__epv *epv; - - /* Make our own copy. */ - if (!set_up) { - epv = bonobo_stream_get_epv (); - bonobo_stream_epv = *epv; - g_free (epv); - set_up = TRUE; - } - - return &bonobo_stream_epv; -} - /* The following is the most evil function in the world. But on the * other hand, it works and prevents us from having tons of lingering * processes when Nautilus crashes. It's unsafe to call it if there @@ -245,9 +209,9 @@ nautilus_bonobo_object_force_destroy_later (BonoboObject *object) data->timeout_id = gtk_timeout_add (MINIMIZE_RACE_CONDITIONS_DELAY, destroy_later_callback, data); - data->destroy_handler_id = gtk_signal_connect - (GTK_OBJECT (object), "destroy", - destroyed_before_timeout_callback, data); + data->destroy_handler_id = g_signal_connect + (G_OBJECT (object), "destroy", + G_CALLBACK (destroyed_before_timeout_callback), data); } /* Same as bonobo_unknown_ping, but this one works. */ @@ -380,9 +344,9 @@ nautilus_bonobo_object_call_when_remote_object_disappears (BonoboObject *object, remote_check_timed_callback, data); } if (data->destroy_handler_id == 0) { - data->destroy_handler_id = gtk_signal_connect - (GTK_OBJECT (object), "destroy", - remote_check_destroy_callback, data); + data->destroy_handler_id = g_signal_connect + (G_OBJECT (object), "destroy", + G_CALLBACK (remote_check_destroy_callback), data); } gtk_object_set_data (GTK_OBJECT (object), REMOTE_CHECK_DATA_KEY, data); diff --git a/libnautilus/nautilus-clipboard.c b/libnautilus/nautilus-clipboard.c index dd29ebdce..0da902ee4 100644 --- a/libnautilus/nautilus-clipboard.c +++ b/libnautilus/nautilus-clipboard.c @@ -36,6 +36,7 @@ #include <gtk/gtkmain.h> #include <gtk/gtksignal.h> #include <gtk/gtktext.h> +#include <string.h> typedef void (* EditableFunction) (GtkEditable *editable); @@ -70,7 +71,7 @@ do_with_fake_current_event (EditableFunction function, fake_widget = gtk_invisible_new (); gtk_signal_connect_object (GTK_OBJECT (fake_widget), "client_event", - function, + G_CALLBACK (function), GTK_OBJECT (editable)); gtk_widget_realize (fake_widget); @@ -142,9 +143,11 @@ select_all (GtkEditable *editable) * passed in to set_position. */ end = -1; +#if GNOME2_CONVERSION_COMPLETE if (GTK_IS_TEXT (editable)) { end = gtk_text_get_length (GTK_TEXT (editable)); } +#endif gtk_editable_set_position (editable, end); gtk_editable_select_region (editable, 0, end); @@ -283,8 +286,7 @@ merge_in_clipboard_menu_items (GtkObject *widget_as_object, container = target_data->container; add_selection_callback = target_data->editable_shares_selection_changes; - bonobo_ui_component_set_container (ui, - container); + bonobo_ui_component_set_container (ui, container, NULL); bonobo_ui_component_freeze (ui, NULL); bonobo_ui_util_set_ui (ui, DATADIR, @@ -293,7 +295,7 @@ merge_in_clipboard_menu_items (GtkObject *widget_as_object, if (add_selection_callback) { gtk_signal_connect_after (GTK_OBJECT (widget_as_object), "selection_changed", - selection_changed_callback, target_data); + G_CALLBACK (selection_changed_callback), target_data); selection_changed_callback (GTK_WIDGET (widget_as_object), target_data); @@ -316,11 +318,11 @@ merge_out_clipboard_menu_items (GtkObject *widget_as_object, g_assert (target_data != NULL); ui = BONOBO_UI_COMPONENT (target_data->component); selection_callback_was_added = target_data->editable_shares_selection_changes; - bonobo_ui_component_unset_container (ui); + bonobo_ui_component_unset_container (ui, NULL); if (selection_callback_was_added) { gtk_signal_disconnect_by_func (GTK_OBJECT (widget_as_object), - selection_changed_callback, + G_CALLBACK (selection_changed_callback), target_data); } set_clipboard_items_are_merged_in (widget_as_object, FALSE); @@ -362,6 +364,7 @@ selection_changed_callback (GtkWidget *widget, TargetCallbackData *target_data; BonoboUIComponent *component; GtkEditable *editable; + int start, end; target_data = (TargetCallbackData *) callback_data; g_assert (target_data != NULL); @@ -369,7 +372,7 @@ selection_changed_callback (GtkWidget *widget, component = target_data->component; editable = GTK_EDITABLE (widget); - if (editable->selection_start_pos != editable->selection_end_pos) { + if (gtk_editable_get_selection_bounds (editable, &start, &end) && start != end) { set_clipboard_menu_items_sensitive (component); } else { set_clipboard_menu_items_insensitive (component); @@ -389,7 +392,7 @@ target_destroy_callback (GtkObject *object, /* Disconnect the component from the container, and then free * everything. */ - bonobo_ui_component_unset_container (target_data->component); + bonobo_ui_component_unset_container (target_data->component, NULL); bonobo_object_unref (BONOBO_OBJECT (target_data->component)); bonobo_object_release_unref (target_data->container, NULL); g_free (target_data); @@ -445,12 +448,12 @@ nautilus_clipboard_set_up_editable (GtkEditable *target, shares_selection_changes); gtk_signal_connect_after (GTK_OBJECT (target), "focus_in_event", - focus_changed_callback, target_data); + G_CALLBACK (focus_changed_callback), target_data); gtk_signal_connect_after (GTK_OBJECT (target), "focus_out_event", - focus_changed_callback, target_data); + G_CALLBACK (focus_changed_callback), target_data); gtk_signal_connect (GTK_OBJECT (target), "destroy", - target_destroy_callback, target_data); + G_CALLBACK (target_destroy_callback), target_data); /* Call the focus changed callback once to merge if the window is * already in focus. @@ -481,7 +484,7 @@ first_focus_callback (GtkWidget *widget, /* Do the rest of the setup. */ nautilus_clipboard_set_up_editable (GTK_EDITABLE (widget), - bonobo_control_get_remote_ui_container (BONOBO_CONTROL (callback_data)), + bonobo_control_get_remote_ui_container (BONOBO_CONTROL (callback_data), NULL), widget_was_set_up_with_selection_sensitivity (widget)); } @@ -504,7 +507,7 @@ nautilus_clipboard_set_up_editable_in_control (GtkEditable *target, if (GTK_WIDGET_HAS_FOCUS (target)) { nautilus_clipboard_set_up_editable (target, - bonobo_control_get_remote_ui_container (control), + bonobo_control_get_remote_ui_container (control, NULL), shares_selection_changes); return; } @@ -521,11 +524,11 @@ nautilus_clipboard_set_up_editable_in_control (GtkEditable *target, GINT_TO_POINTER (shares_selection_changes)); gtk_signal_connect (GTK_OBJECT (target), "focus_in_event", - first_focus_callback, + G_CALLBACK (first_focus_callback), control); gtk_signal_connect (GTK_OBJECT (target), "destroy", - control_destroyed_callback, + G_CALLBACK (control_destroyed_callback), control); } @@ -534,9 +537,9 @@ disconnect_set_up_in_control_handlers (GtkObject *object, gpointer callback_data) { gtk_signal_disconnect_by_func (object, - first_focus_callback, + G_CALLBACK (first_focus_callback), callback_data); gtk_signal_disconnect_by_func (object, - control_destroyed_callback, + G_CALLBACK (control_destroyed_callback), callback_data); } diff --git a/libnautilus/nautilus-idle-queue.h b/libnautilus/nautilus-idle-queue.h index 5f95f3a0f..bd241e8b2 100644 --- a/libnautilus/nautilus-idle-queue.h +++ b/libnautilus/nautilus-idle-queue.h @@ -27,9 +27,8 @@ #define NAUTILUS_IDLE_QUEUE_H #include <glib.h> -#include <libgnome/gnome-defs.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS typedef struct NautilusIdleQueue NautilusIdleQueue; @@ -41,6 +40,6 @@ void nautilus_idle_queue_add (NautilusIdleQueue *queue, GFreeFunc free_callback_data); void nautilus_idle_queue_destroy (NautilusIdleQueue *queue); -END_GNOME_DECLS +G_END_DECLS #endif /* NAUTILUS_IDLE_QUEUE_H */ diff --git a/libnautilus/nautilus-undo.c b/libnautilus/nautilus-undo.c index b7a05c4ad..66a618137 100644 --- a/libnautilus/nautilus-undo.c +++ b/libnautilus/nautilus-undo.c @@ -30,7 +30,7 @@ #include "nautilus-undo-transaction.h" #include <gtk/gtksignal.h> #include <gtk/gtkwindow.h> -#include <libgnomeui/gnome-canvas.h> +#include <libgnomecanvas/gnome-canvas.h> #define NAUTILUS_UNDO_MANAGER_DATA "Nautilus undo manager" diff --git a/libnautilus/nautilus-view-standard-main.c b/libnautilus/nautilus-view-standard-main.c index a32311e03..c4ef56367 100644 --- a/libnautilus/nautilus-view-standard-main.c +++ b/libnautilus/nautilus-view-standard-main.c @@ -34,11 +34,8 @@ #include <bonobo/bonobo-main.h> #include <gtk/gtkmain.h> #include <gtk/gtksignal.h> -#include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> -#include <libgnomeui/gnome-init.h> #include <libgnomevfs/gnome-vfs-init.h> -#include <liboaf/liboaf.h> #include <gdk/gdkx.h> #include <X11/Xlib.h> #include <stdlib.h> diff --git a/libnautilus/nautilus-view-standard-main.h b/libnautilus/nautilus-view-standard-main.h index 930f56601..2b0b9629f 100644 --- a/libnautilus/nautilus-view-standard-main.h +++ b/libnautilus/nautilus-view-standard-main.h @@ -35,7 +35,7 @@ #include <libnautilus/nautilus-view.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS typedef NautilusView * (*NautilusViewCreateFunction) (const char *iid, void *user_data); @@ -68,6 +68,6 @@ int nautilus_view_standard_main_multi (const char *executable_n */ NautilusView * nautilus_view_create_from_get_type_function (const char *iid, void *user_data); -END_GNOME_DECLS +G_END_DECLS #endif /* NAUTILUS_VIEW_STANDARD_MAIN_H */ diff --git a/libnautilus/nautilus-view.h b/libnautilus/nautilus-view.h index d16168b5b..9ce471010 100644 --- a/libnautilus/nautilus-view.h +++ b/libnautilus/nautilus-view.h @@ -32,7 +32,7 @@ #include <libnautilus/nautilus-view-component.h> #include <bonobo/bonobo-control.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS #define NAUTILUS_TYPE_VIEW (nautilus_view_get_type ()) #define NAUTILUS_VIEW(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW, NautilusView)) @@ -115,6 +115,6 @@ NautilusView * nautilus_view_construct (NautilusV NautilusView * nautilus_view_construct_from_bonobo_control (NautilusView *view, BonoboControl *bonobo_control); -END_GNOME_DECLS +G_END_DECLS #endif /* NAUTILUS_VIEW_H */ diff --git a/nautilus-config.in b/nautilus-config.in deleted file mode 100644 index 339dfe2a3..000000000 --- a/nautilus-config.in +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -usage="\ - Usage: nauilus-config [--version] [--config] [--cflags] [--libs]" - -config_file="@LIBDIR@/nautilusConf.sh" -. $config_file - -if test $# -eq 0; then - echo "${usage}" 1>&2 - exit 1 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --version) - echo @VERSION@ - ;; - --config) - echo $config_file - ;; - --cflags) - echo $NAUTILUS_INCLUDEDIR - ;; - --libs) - echo "$NAUTILUS_LIBDIR $NAUTILUS_LIBS" - ;; - *) - echo "${usage}" 1>&2 - exit 1 - esac - shift -done diff --git a/nautilusConf.sh.in b/nautilusConf.sh.in deleted file mode 100644 index 584d96159..000000000 --- a/nautilusConf.sh.in +++ /dev/null @@ -1,7 +0,0 @@ -# -# Configuration file for using the nautilus library -# -NAUTILUS_LIBDIR="@NAUTILUS_LIBDIR@" -NAUTILUS_LIBS="@NAUTILUS_LIBS@" -NAUTILUS_INCLUDEDIR="@NAUTILUS_INCLUDEDIR@" -MODULE_VERSION="nautilus-@VERSION@" diff --git a/src/Makefile.am b/src/Makefile.am index 329e46a7b..fb45617f8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -121,11 +121,11 @@ $(nautilus_OBJECTS): nautilus_shell_interface_idl_stamp TESTS=check-nautilus -oafdir = $(datadir)/oaf -oaf_in_files = Nautilus_shell.oaf.in -oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +serverdir = $(datadir)/server +server_in_files = Nautilus_shell.server.in +server_DATA = $(server_in_files:.server.in=.server) -@XML_I18N_MERGE_OAF_RULE@ +@INTLTOOL_SERVER_RULE@ uidir = $(datadir)/gnome/ui ui_DATA = \ @@ -138,8 +138,8 @@ CLEANFILES = \ $(NULL) EXTRA_DIST = \ - $(oaf_in_files) \ - $(oaf_DATA) \ + $(server_in_files) \ + $(server_DATA) \ $(ui_DATA) \ check-nautilus \ nautilus-shell-interface.idl \ diff --git a/src/nautilus-preferences-dialog.h b/src/nautilus-preferences-dialog.h index c8cc534b0..93a79dd68 100644 --- a/src/nautilus-preferences-dialog.h +++ b/src/nautilus-preferences-dialog.h @@ -27,10 +27,10 @@ #include <libnautilus-private/nautilus-global-preferences.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS void nautilus_preferences_dialog_show (void); -END_GNOME_DECLS +G_END_DECLS #endif /* NAUTILUS_PREFERENCES_DIALOG_H */ diff --git a/src/nautilus-theme-selector.h b/src/nautilus-theme-selector.h index e33c82e97..f0fd292a7 100644 --- a/src/nautilus-theme-selector.h +++ b/src/nautilus-theme-selector.h @@ -32,7 +32,7 @@ #include <gtk/gtkwindow.h> #include <libgnome/gnome-defs.h> -BEGIN_GNOME_DECLS +G_BEGIN_DECLS #define NAUTILUS_TYPE_THEME_SELECTOR (nautilus_theme_selector_get_type ()) #define NAUTILUS_THEME_SELECTOR(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_THEME_SELECTOR, NautilusThemeSelector)) @@ -64,6 +64,6 @@ void nautilus_theme_selector_set_selected_theme (NautilusThemeSelector void nautilus_theme_selector_set_parent_window (NautilusThemeSelector *theme_selector, GtkWindow *parent_window); -END_GNOME_DECLS +G_END_DECLS #endif /* NAUTILUS_THEME_SELECTOR_H */ |