Commit ed8a9567 authored by Elliot Lee's avatar Elliot Lee

Include the .idl files of other modules that we use. Define -D_REENTRANT,



* idl/*.idl: Include the .idl files of other modules that we use.
* libnautilus/Makefile.am, src/Makefile.am, src/file-manager/Makefile.am:
Define -D_REENTRANT, just in case.
* src/file-manager/Makefile.am: Add cflags for .idl compilation.
* components/help/Makefile.am: Build converters. Stop installing
the now-unneeded .schemes file.
* components/websearch/ntl-web-search.c: Get rid of
gnome_button_can_default()
* libnautilus/nautilus-icons-view-icon-item.c: Get rid of missing
prototypes and associated warnings by including needed headers.
* src/ntl-types.h, src/ntl-uri-map.[ch], src/ntl-window.h,
src/ntl-window-msgs.c: Remove scheme mapping functionality (now
done in gnome-vfs). Use asynchronous version of get_file_info.
parent 256c431a
2000-02-07 Elliot Lee <sopwith@redhat.com> 2000-02-07 Elliot Lee <sopwith@redhat.com>
* idl/*.idl: Include the .idl files of other modules that we use.
* libnautilus/Makefile.am, src/Makefile.am, src/file-manager/Makefile.am:
Define -D_REENTRANT, just in case.
* src/file-manager/Makefile.am: Add cflags for .idl compilation.
* components/help/Makefile.am: Build converters. Stop installing * components/help/Makefile.am: Build converters. Stop installing
the now-unneeded .schemes file. the now-unneeded .schemes file.
......
#include <gnome-factory.idl>
#include <Bonobo.idl>
module GNOME { module GNOME {
module Desktop { module Desktop {
interface FileOperationService { interface FileOperationService {
typedef sequence<string> FileNameList; typedef sequence<string> FileNameList;
typedef unsigned short XferOptions; typedef unsigned short XferOptions;
const unsigned short XferOptionDefault = 0; const unsigned short XferOptionDefault = 0;
const unsigned short XferOptionPreserve = 1 << 0; const unsigned short XferOptionPreserve = 1 << 0;
const unsigned short XferOptionFollowLinks = 1 << 1; const unsigned short XferOptionFollowLinks = 1 << 1;
const unsigned short XferOptionWithParents = 1 << 2; const unsigned short XferOptionWithParents = 1 << 2;
const unsigned short XferOptionRecursive = 1 << 3; const unsigned short XferOptionRecursive = 1 << 3;
const unsigned short XferOptionSameFS = 1 << 4; const unsigned short XferOptionSameFS = 1 << 4;
const unsigned short XferOptionSparseAlways = 1 << 5; const unsigned short XferOptionSparseAlways = 1 << 5;
const unsigned short XferOptionSparseNever = 1 << 6; const unsigned short XferOptionSparseNever = 1 << 6;
const unsigned short XferOptionUpdateMode = 1 << 7; const unsigned short XferOptionUpdateMode = 1 << 7;
const unsigned short XferOptionRemoveSource = 1 << 8; const unsigned short XferOptionRemoveSource = 1 << 8;
enum XferOverwriteMode { enum XferOverwriteMode {
XferOverwriteAbort, XferOverwriteAbort,
XferOverwriteQuery, XferOverwriteQuery,
XferOverwriteReplace, XferOverwriteReplace,
XferOverwriteSkip XferOverwriteSkip
}; };
enum XferErrorMode { enum XferErrorMode {
XferErrorAbort, XferErrorAbort,
XferErrorQuery XferErrorQuery
}; };
void xfer (in string source_directory_uri, void xfer (in string source_directory_uri,
in FileNameList source_file_names, in FileNameList source_file_names,
in string target_directory_uri, in string target_directory_uri,
in FileNameList target_file_names, in FileNameList target_file_names,
in XferOptions options, in XferOptions options,
in XferErrorMode error_mode, in XferErrorMode error_mode,
in XferOverwriteMode overwrite_mode); in XferOverwriteMode overwrite_mode);
}; };
}; };
}; };
#include <gnome-factory.idl>
#include <Bonobo.idl> #include <Bonobo.idl>
module Nautilus { module Nautilus {
......
...@@ -7,7 +7,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \ ...@@ -7,7 +7,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \ $(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \ $(VFS_CFLAGS) \
$(XML_CFLAGS) \ $(XML_CFLAGS) \
$(WERROR) $(WERROR) \
-D_REENTRANT
libnautilus_la_LDFLAGS=\ libnautilus_la_LDFLAGS=\
$(GNOME_LIBS) \ $(GNOME_LIBS) \
......
...@@ -7,7 +7,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \ ...@@ -7,7 +7,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \ $(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \ $(VFS_CFLAGS) \
$(XML_CFLAGS) \ $(XML_CFLAGS) \
$(WERROR) $(WERROR) \
-D_REENTRANT
libnautilus_la_LDFLAGS=\ libnautilus_la_LDFLAGS=\
$(GNOME_LIBS) \ $(GNOME_LIBS) \
......
...@@ -7,7 +7,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \ ...@@ -7,7 +7,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \ $(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \ $(VFS_CFLAGS) \
$(XML_CFLAGS) \ $(XML_CFLAGS) \
$(WERROR) $(WERROR) \
-D_REENTRANT
libnautilus_la_LDFLAGS=\ libnautilus_la_LDFLAGS=\
$(GNOME_LIBS) \ $(GNOME_LIBS) \
......
...@@ -8,7 +8,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \ ...@@ -8,7 +8,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(VFS_CFLAGS) \ $(VFS_CFLAGS) \
$(XML_CFLAGS) \ $(XML_CFLAGS) \
-DVERSION="\"$(VERSION)\"" \ -DVERSION="\"$(VERSION)\"" \
$(WERROR) $(WERROR) \
-D_REENTRANT
LDADD= file-manager/libntl-file-manager.la \ LDADD= file-manager/libntl-file-manager.la \
../libnautilus/libnautilus.la \ ../libnautilus/libnautilus.la \
......
...@@ -4,7 +4,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \ ...@@ -4,7 +4,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(BONOBO_CFLAGS) $(GNORBA_CFLAGS) \ $(BONOBO_CFLAGS) $(GNORBA_CFLAGS) \
$(GNOMEUI_CFLAGS) -DVERSION="\"$(VERSION)\"" \ $(GNOMEUI_CFLAGS) -DVERSION="\"$(VERSION)\"" \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \ $(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(WERROR) $(WERROR) \
-D_REENTRANT
dfos_corba_srcs= \ dfos_corba_srcs= \
GNOME_Desktop_FileOperationService.h \ GNOME_Desktop_FileOperationService.h \
...@@ -61,7 +62,7 @@ dfos-corba.h: GNOME_Desktop_FileOperationService.h ...@@ -61,7 +62,7 @@ dfos-corba.h: GNOME_Desktop_FileOperationService.h
$(dfos_corba_srcs): dfos_corba_stamp $(dfos_corba_srcs): dfos_corba_stamp
dfos_corba_stamp: $(top_srcdir)/idl/GNOME_Desktop_FileOperationService.idl dfos_corba_stamp: $(top_srcdir)/idl/GNOME_Desktop_FileOperationService.idl
orbit-idl $(top_srcdir)/idl/GNOME_Desktop_FileOperationService.idl orbit-idl `gnome-config --cflags idl` $(top_srcdir)/idl/GNOME_Desktop_FileOperationService.idl
touch dfos_corba_stamp touch dfos_corba_stamp
BUILT_SOURCES=$(dfos_corba_srcs) BUILT_SOURCES=$(dfos_corba_srcs)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment