GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

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>
* 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.
......
#include <gnome-factory.idl>
#include <Bonobo.idl>
module GNOME {
module Desktop {
module Desktop {
interface FileOperationService {
interface FileOperationService {
typedef sequence<string> FileNameList;
typedef unsigned short XferOptions;
......@@ -35,7 +38,7 @@ interface FileOperationService {
in XferOptions options,
in XferErrorMode error_mode,
in XferOverwriteMode overwrite_mode);
};
};
};
};
};
#include <gnome-factory.idl>
#include <Bonobo.idl>
module Nautilus {
......
......@@ -7,7 +7,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
$(WERROR)
$(WERROR) \
-D_REENTRANT
libnautilus_la_LDFLAGS=\
$(GNOME_LIBS) \
......
......@@ -7,7 +7,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
$(WERROR)
$(WERROR) \
-D_REENTRANT
libnautilus_la_LDFLAGS=\
$(GNOME_LIBS) \
......
......@@ -7,7 +7,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
$(WERROR)
$(WERROR) \
-D_REENTRANT
libnautilus_la_LDFLAGS=\
$(GNOME_LIBS) \
......
......@@ -8,7 +8,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
-DVERSION="\"$(VERSION)\"" \
$(WERROR)
$(WERROR) \
-D_REENTRANT
LDADD= file-manager/libntl-file-manager.la \
../libnautilus/libnautilus.la \
......
......@@ -4,7 +4,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(BONOBO_CFLAGS) $(GNORBA_CFLAGS) \
$(GNOMEUI_CFLAGS) -DVERSION="\"$(VERSION)\"" \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(WERROR)
$(WERROR) \
-D_REENTRANT
dfos_corba_srcs= \
GNOME_Desktop_FileOperationService.h \
......@@ -61,7 +62,7 @@ dfos-corba.h: GNOME_Desktop_FileOperationService.h
$(dfos_corba_srcs): dfos_corba_stamp
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
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