diff options
| author | Michael Meeks <michael@ximian.com> | 2002-07-16 22:17:57 +0000 |
|---|---|---|
| committer | Michael Meeks <michael@src.gnome.org> | 2002-07-16 22:17:57 +0000 |
| commit | 046369b55d3e86c6644f16d01601b469a0688301 (patch) | |
| tree | cd578a77d248e9106a3c164cc30de758901c7cf8 /components/text | |
| parent | 1eaa6d588a7d7aa05497f6944955ef00960e84af (diff) | |
| download | nautilus-046369b55d3e86c6644f16d01601b469a0688301.tar.gz | |
components/*/.server.in -> *.server.in.in move stuff into $(libexec) and
2002-07-11 Michael Meeks <michael@ximian.com>
* components/*/.server.in -> *.server.in.in
* components/*/Makefile.am: move stuff into $(libexec)
and $(libdir)/bonobo - a very, very boring ( and likely to
be buggy ) patch, watch the tinderbox...
* libnautilus-private/nautilus-icon-container.c
(nautilus_icon_container_class_init): upd.
(expose_event): add for debugging, looks like most icons
areas get 3 expose events each on startup.
Diffstat (limited to 'components/text')
| -rw-r--r-- | components/text/Makefile.am | 11 | ||||
| -rw-r--r-- | components/text/Nautilus_View_text.server.in | 29 | ||||
| -rw-r--r-- | components/text/Nautilus_View_text.server.in.in | 3 |
3 files changed, 9 insertions, 34 deletions
diff --git a/components/text/Makefile.am b/components/text/Makefile.am index bb7964c96..f75de1671 100644 --- a/components/text/Makefile.am +++ b/components/text/Makefile.am @@ -12,7 +12,7 @@ INCLUDES = \ -DGTK_ENABLE_BROKEN \ $(NULL) -bin_PROGRAMS = nautilus-text-view +libexec_PROGRAMS=nautilus-text-view nautilus_text_view_SOURCES = \ nautilus-text-view.c @@ -25,9 +25,12 @@ nautilus_text_view_LDADD = \ #uidir = $(datadir)/gnome-2.0/ui #ui_DATA = nautilus-text-view-ui.xml +server_in_files = Nautilus_View_text.server.in.in + serverdir = $(libdir)/bonobo/servers -server_in_files = Nautilus_View_text.server.in -server_DATA = $(server_in_files:.server.in=.server) +server_DATA = $(server_in_files:.server.in.in=.server) +$(server_in_files:.server.in.in=.server.in): $(server_in_files) + sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ @INTLTOOL_SERVER_RULE@ -EXTRA_DIST = $(server_in_files) $(nautilus_text_view_SOURCES) # $(server_DATA) #$(ui_data) +EXTRA_DIST = $(server_in_files) $(nautilus_text_view_SOURCES) diff --git a/components/text/Nautilus_View_text.server.in b/components/text/Nautilus_View_text.server.in deleted file mode 100644 index 8d0de1072..000000000 --- a/components/text/Nautilus_View_text.server.in +++ /dev/null @@ -1,29 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:Nautilus_Text_View_Factory" type="exe" location="nautilus-text-view"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/ObjectFactory:1.0"/> - </oaf_attribute> - <oaf_attribute name="name" type="string" _value="Text view factory"/> - <oaf_attribute name="description" type="string" _value="Factory for text view"/> -</oaf_server> - -<oaf_server iid="OAFIID:Nautilus_Text_View" type="factory" location="OAFIID:Nautilus_Text_View_Factory"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:Bonobo/Unknown:1.0"/> - <item value="IDL:Bonobo/Control:1.0"/> - <item value="IDL:Nautilus/View:1.0"/> - </oaf_attribute> - <oaf_attribute name="name" type="string" _value="Text view"/> - <oaf_attribute name="description" type="string" _value="Text view"/> - <oaf_attribute name="bonobo:editable" type="boolean" value="true"/> - <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> - <item value="text/plain"/> - <item value="text/*"/> - </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" _value="Text"/> - <oaf_attribute name="nautilus:view_as_label" type="string" _value="View as Text"/> - <oaf_attribute name="nautilus:viewer_label" type="string" _value="Text Viewer"/> -</oaf_server> - -</oaf_info> diff --git a/components/text/Nautilus_View_text.server.in.in b/components/text/Nautilus_View_text.server.in.in index 8d0de1072..b9fc3462e 100644 --- a/components/text/Nautilus_View_text.server.in.in +++ b/components/text/Nautilus_View_text.server.in.in @@ -1,6 +1,7 @@ <oaf_info> -<oaf_server iid="OAFIID:Nautilus_Text_View_Factory" type="exe" location="nautilus-text-view"> +<oaf_server iid="OAFIID:Nautilus_Text_View_Factory" + type="exe" location="@LIBEXECDIR@/nautilus-text-view"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> </oaf_attribute> |