summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2005-10-19 07:53:43 +0000
committerAlexander Larsson <alexl@src.gnome.org>2005-10-19 07:53:43 +0000
commitcc68b946d38289eb7ea44784467e7216f161b7f8 (patch)
treef3e228177db2aaabbc58d1f80a0c6c86903a10a5
parent07771c5ccef312023e3a770daa9aa04bc78735dd (diff)
downloadnautilus-cc68b946d38289eb7ea44784467e7216f161b7f8.tar.gz
Reuse Nautilus::URI from the one defined in libnautilus-private.
2005-10-19 Alexander Larsson <alexl@redhat.com> * src/nautilus-shell-interface.idl: Reuse Nautilus::URI from the one defined in libnautilus-private. * libnautilus-private/Makefile.am: Link libnautilus-private statically.
-rw-r--r--ChangeLog8
-rw-r--r--libnautilus-private/Makefile.am2
-rw-r--r--src/nautilus-shell-interface.idl3
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e96ea1f6..604742a5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-19 Alexander Larsson <alexl@redhat.com>
+
+ * src/nautilus-shell-interface.idl:
+ Reuse Nautilus::URI from the one defined in libnautilus-private.
+
+ * libnautilus-private/Makefile.am:
+ Link libnautilus-private statically.
+
2005-10-18 Christian Neumair <chris@gnome-de.org>
* src/file-manager/fm-directory-view.c:
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index a3b8c3e5a..5f68a29be 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/Makefile.shared
-lib_LTLIBRARIES=libnautilus-private.la
+noinst_LTLIBRARIES=libnautilus-private.la
libnautilus_private_la_LIBADD = \
../libnautilus-extension/libnautilus-extension.la
diff --git a/src/nautilus-shell-interface.idl b/src/nautilus-shell-interface.idl
index bbb999360..066332e78 100644
--- a/src/nautilus-shell-interface.idl
+++ b/src/nautilus-shell-interface.idl
@@ -4,9 +4,10 @@
#define NAUTILUS_SHELL_INTERFACE_IDL
#include <Bonobo.idl>
+/* For URI define */
+#include <../libnautilus-private/nautilus-metafile-server.idl>
module Nautilus {
- typedef string URI;
typedef sequence<URI> URIList;
interface Shell : ::Bonobo::Unknown {