diff options
| author | Maciej Stachowiak <mstachow@src.gnome.org> | 2001-01-05 13:10:51 +0000 |
|---|---|---|
| committer | Maciej Stachowiak <mstachow@src.gnome.org> | 2001-01-05 13:10:51 +0000 |
| commit | 7f8d07e83c535d6069584727a045c9c523722137 (patch) | |
| tree | f2abb2e7039c89e3c02478710947ed5a232fa226 | |
| parent | 8fc6a9efe4d9a306f044cf3f2f79ec3879ea2ec5 (diff) | |
| download | nautilus-7f8d07e83c535d6069584727a045c9c523722137.tar.gz | |
xml-i18n-toolized Nautilus (plus a bit of other cleanup) as part
of resolving bug 2693 (I will consider my work done once I have
also handled Bonobo).
* autogen.sh, configure.in: xml-i18n-toolize
* .cvsignore: ignore xml-i18n scripts
* Makefile.am: distribute xml-i18n-scripts
* components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in:
Renamed from components/adapter/nautilus-adapter.oafinfo; mark
translatable strings transalatable.
* components/adapter/Makefile.am: Deal w/ oaf file rename, do
merge.
* components/adapter/.cvsignore: Ignore .oaf file.
* components/hardware/.cvsignore, components/hardware/Makefile.am,
components/hardware/Nautilus_View_hardware.oaf.in,
components/hardware/nautilus-hardware-view.oafinfo: Ditto.
* components/history/.cvsignore, components/history/Makefile.am,
components/history/Nautilus_View_history.oaf.in,
components/history/nautilus-history-view.oafinfo: Ditto.
* components/image-viewer/.cvsignore,
components/image-viewer/Makefile.am,
components/image-viewer/Nautilus_View_image.oaf.in,
components/image-viewer/nautilus-image-view.oafinfo: Ditto.
* components/loser/content/.cvsignore,
components/loser/content/Makefile.am,
components/loser/content/Nautilus_View_content-loser.oaf.in,
components/loser/content/nautilus-content-loser.oafinfo: Ditto.
* components/loser/sidebar/.cvsignore,
components/loser/sidebar/Makefile.am,
components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in,
components/loser/sidebar/nautilus-sidebar-loser.oafinfo: Ditto.
* components/mozilla/.cvsignore, components/mozilla/Makefile.am,
components/mozilla/Nautilus_View_mozilla.oaf.in,
components/mozilla/nautilus-mozilla-content-view.oafinfo: Ditto.
* components/music/.cvsignore, components/music/Makefile.am,
components/music/Nautilus_View_music.oaf.in,
components/music/nautilus-music-view.oafinfo: Ditto.
* components/notes/.cvsignore, components/notes/Makefile.am,
components/notes/Nautilus_View_notes.oaf.in,
components/notes/nautilus-notes.oafinfo: Ditto.
* components/rpmview/.cvsignore, components/rpmview/Makefile.am,
components/rpmview/Nautilus_View_rpm.oaf.in,
components/rpmview/nautilus-rpm-view.oafinfo: Ditto.
* components/sample/.cvsignore, components/sample/Makefile.am,
components/sample/Nautilus_View_sample.oaf.in,
components/sample/nautilus-sample-content-view.oafinfo: Ditto.
* components/services/install/nautilus-view/.cvsignore,
components/services/install/nautilus-view/Makefile.am,
components/services/install/nautilus-view/Nautilus_View_install.oaf.in,
components/services/install/nautilus-view/nautilus-service-install-view.oafinfo:
Ditto.
* components/services/install/server/.cvsignore,
components/services/install/server/Makefile.am,
components/services/install/server/Trilobite_Service_install.oaf.in,
components/services/install/server/trilobite-eazel-install-service.oafinfo:
Ditto.
* components/services/login/nautilus-view/.cvsignore,
components/services/login/nautilus-view/Makefile.am,
components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in,
components/services/login/nautilus-view/nautilus-change-password-view.oafinfo:
Ditto.
* components/services/summary/nautilus-view/.cvsignore,
components/services/summary/nautilus-view/Makefile.am,
components/services/summary/nautilus-view/Nautilus_View_services-summary.oaf.in,
components/services/summary/nautilus-view/nautilus-summary-view.oafinfo: Ditto.
* components/services/trilobite/sample/.cvsignore,
components/services/trilobite/sample/nautilus-view/Makefile.am,
components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in,
components/services/trilobite/sample/nautilus-view/nautilus-sample-service-view.oafinfo:
Ditto.
* components/services/trilobite/sample/service/.cvsignore,
components/services/trilobite/sample/service/Makefile.am,
components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in,
components/services/trilobite/sample/service/trilobite-eazel-sample-service.oafinfo:
Ditto.
* components/text/.cvsignore, components/text/Makefile.am,
components/text/Nautilus_View_text.oaf.in,
components/text/nautilus-text-view.oafinfo: Ditto.
* src/.cvsignore, src/Makefile.am, src/Nautilus_shell.oaf.in,
src/nautilus.oafinfo: Ditto.
* components/tree/.cvsignore, components/tree/Makefile.am,
components/tree/Nautilus_View_tree.oaf.in,
components/tree/nautilus-tree-view.oafinfo.shlib: Ditto, and
removed ability to build tree view as an exe component (no one was
really using it anyway).
* components/tree/nautilus-tree-view.oafinfo.exe: Removed.
* components/help/.cvsignore, components/help/Makefile.am,
components/help/Nautilus_View_help.oaf.in:
components/help/help-contents.oafinfo: Ditto, and merged other
oafinfo files into Nautilus_View_help.oaf.in, commented out.
* components/help/help-factory.oafinfo,
components/help/help-index.oafinfo,
components/help/help-search.oafinfo: Removed.
* po/POTFILES.in: Added .oaf.in files.
* po/README.tools, po/ui-extract.pl, po/ui-testcases.glade,
po/ui-testcases.xml, po/update.pl, po/update.sh: Removed these
now-obsolete files.
* components/services/Makefile.am: Removed time service from build.
* components/html/*, components/websearch/*: cvs deleted these
obsolete long since non-built components.
* ChangeLog-200001018: Renamed to ChangeLog-20001018 (whoops)
147 files changed, 1252 insertions, 4783 deletions
diff --git a/.cvsignore b/.cvsignore index db4579aea..938a5e850 100644 --- a/.cvsignore +++ b/.cvsignore @@ -21,3 +21,6 @@ obj po stamp-h stamp-h.in +xml-i18n-extract +xml-i18n-merge +xml-i18n-update @@ -1,3 +1,114 @@ +2001-01-05 Maciej Stachowiak <mjs@eazel.com> + + xml-i18n-toolized Nautilus (plus a bit of other cleanup) as part + of resolving bug 2693 (I will consider my work done once I have + also handled Bonobo). + + * autogen.sh, configure.in: xml-i18n-toolize + * .cvsignore: ignore xml-i18n scripts + * Makefile.am: distribute xml-i18n-scripts + + * components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in: + Renamed from components/adapter/nautilus-adapter.oafinfo; mark + translatable strings transalatable. + * components/adapter/Makefile.am: Deal w/ oaf file rename, do + merge. + * components/adapter/.cvsignore: Ignore .oaf file. + + * components/hardware/.cvsignore, components/hardware/Makefile.am, + components/hardware/Nautilus_View_hardware.oaf.in, + components/hardware/nautilus-hardware-view.oafinfo: Ditto. + * components/history/.cvsignore, components/history/Makefile.am, + components/history/Nautilus_View_history.oaf.in, + components/history/nautilus-history-view.oafinfo: Ditto. + + * components/image-viewer/.cvsignore, + components/image-viewer/Makefile.am, + components/image-viewer/Nautilus_View_image.oaf.in, + components/image-viewer/nautilus-image-view.oafinfo: Ditto. + + * components/loser/content/.cvsignore, + components/loser/content/Makefile.am, + components/loser/content/Nautilus_View_content-loser.oaf.in, + components/loser/content/nautilus-content-loser.oafinfo: Ditto. + + * components/loser/sidebar/.cvsignore, + components/loser/sidebar/Makefile.am, + components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in, + components/loser/sidebar/nautilus-sidebar-loser.oafinfo: Ditto. + * components/mozilla/.cvsignore, components/mozilla/Makefile.am, + components/mozilla/Nautilus_View_mozilla.oaf.in, + components/mozilla/nautilus-mozilla-content-view.oafinfo: Ditto. + * components/music/.cvsignore, components/music/Makefile.am, + components/music/Nautilus_View_music.oaf.in, + components/music/nautilus-music-view.oafinfo: Ditto. + * components/notes/.cvsignore, components/notes/Makefile.am, + components/notes/Nautilus_View_notes.oaf.in, + components/notes/nautilus-notes.oafinfo: Ditto. + * components/rpmview/.cvsignore, components/rpmview/Makefile.am, + components/rpmview/Nautilus_View_rpm.oaf.in, + components/rpmview/nautilus-rpm-view.oafinfo: Ditto. + * components/sample/.cvsignore, components/sample/Makefile.am, + components/sample/Nautilus_View_sample.oaf.in, + components/sample/nautilus-sample-content-view.oafinfo: Ditto. + * components/services/install/nautilus-view/.cvsignore, + components/services/install/nautilus-view/Makefile.am, + components/services/install/nautilus-view/Nautilus_View_install.oaf.in, + components/services/install/nautilus-view/nautilus-service-install-view.oafinfo: + Ditto. + * components/services/install/server/.cvsignore, + components/services/install/server/Makefile.am, + components/services/install/server/Trilobite_Service_install.oaf.in, + components/services/install/server/trilobite-eazel-install-service.oafinfo: + Ditto. + * components/services/login/nautilus-view/.cvsignore, + components/services/login/nautilus-view/Makefile.am, + components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in, + components/services/login/nautilus-view/nautilus-change-password-view.oafinfo: + Ditto. + * components/services/summary/nautilus-view/.cvsignore, + components/services/summary/nautilus-view/Makefile.am, + components/services/summary/nautilus-view/Nautilus_View_services-summary.oaf.in, + components/services/summary/nautilus-view/nautilus-summary-view.oafinfo: Ditto. + * components/services/trilobite/sample/.cvsignore, + components/services/trilobite/sample/nautilus-view/Makefile.am, + components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in, + components/services/trilobite/sample/nautilus-view/nautilus-sample-service-view.oafinfo: + Ditto. + * components/services/trilobite/sample/service/.cvsignore, + components/services/trilobite/sample/service/Makefile.am, + components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in, + components/services/trilobite/sample/service/trilobite-eazel-sample-service.oafinfo: + Ditto. + * components/text/.cvsignore, components/text/Makefile.am, + components/text/Nautilus_View_text.oaf.in, + components/text/nautilus-text-view.oafinfo: Ditto. + * src/.cvsignore, src/Makefile.am, src/Nautilus_shell.oaf.in, + src/nautilus.oafinfo: Ditto. + * components/tree/.cvsignore, components/tree/Makefile.am, + components/tree/Nautilus_View_tree.oaf.in, + components/tree/nautilus-tree-view.oafinfo.shlib: Ditto, and + removed ability to build tree view as an exe component (no one was + really using it anyway). + * components/tree/nautilus-tree-view.oafinfo.exe: Removed. + * components/help/.cvsignore, components/help/Makefile.am, + components/help/Nautilus_View_help.oaf.in: + components/help/help-contents.oafinfo: Ditto, and merged other + oafinfo files into Nautilus_View_help.oaf.in, commented out. + * components/help/help-factory.oafinfo, + components/help/help-index.oafinfo, + components/help/help-search.oafinfo: Removed. + + * po/POTFILES.in: Added .oaf.in files. + * po/README.tools, po/ui-extract.pl, po/ui-testcases.glade, + po/ui-testcases.xml, po/update.pl, po/update.sh: Removed these + now-obsolete files. + + * components/services/Makefile.am: Removed time service from build. + * components/html/*, components/websearch/*: cvs deleted these + obsolete long since non-built components. + * ChangeLog-200001018: Renamed to ChangeLog-20001018 (whoops) + 2001-01-04 Andy Hertzfeld <andy@eazel.com> * libnautilus-extensions/nautilus-icon-factory.c: diff --git a/ChangeLog-200001018 b/ChangeLog-20001018 index 2b9c1e971..2b9c1e971 100644 --- a/ChangeLog-200001018 +++ b/ChangeLog-20001018 diff --git a/Makefile.am b/Makefile.am index 41bfb45e0..dfad8b368 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,19 +23,22 @@ SUBDIRS = \ po \ $(NULL) -EXTRA_DIST= \ - COPYING.LIB \ - RPMs-README \ - HACKING \ - MAINTAINERS \ - nautilus.spec.in \ - nautilus-clean.sh \ - nautilus.desktop \ - nautilus-launch-icon.png \ - ChangeLog-200001018 \ - ChangeLog-20000414 \ - ChangeLog-20000625 \ - ChangeLog-20000831 \ +EXTRA_DIST= \ + COPYING.LIB \ + RPMs-README \ + HACKING \ + MAINTAINERS \ + nautilus.spec.in \ + nautilus-clean.sh \ + nautilus.desktop \ + nautilus-launch-icon.png \ + ChangeLog-200001018 \ + ChangeLog-20000414 \ + ChangeLog-20000625 \ + ChangeLog-20000831 \ + xml-i18n-extract \ + xml-i18n-merge \ + xml-i18n-update \ $(NULL) appicondir = $(datadir)/pixmaps diff --git a/autogen.sh b/autogen.sh index 44e06b636..158086f08 100755 --- a/autogen.sh +++ b/autogen.sh @@ -37,6 +37,11 @@ DIE=0 DIE=1 } +(xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have xml-i18n-tools installed to compile $PROJECT." +} + if test "$DIE" -eq 1; then exit 1 fi @@ -61,6 +66,9 @@ echo "Running gettextize... Ignore non-fatal messages." # while making dist. echo "no" | gettextize --copy --force +echo "Running xml-i18n-toolize... Ignore non-fatal messages." +xml-i18n-toolize --copy --force --automake + echo "Running libtoolize" libtoolize --copy --force @@ -75,13 +83,6 @@ aclocal $ACLOCAL_FLAGS automake -a $am_opt -if [ -r po/Makefile.i18npatch ]; then - if grep GENPOT po/Makefile.in.in >/dev/null; - then echo "no need for patching file \`Makefile.in.in'"; - else patch po/Makefile.in.in < po/Makefile.i18npatch; - fi; -fi - autoconf cd $ORIGDIR diff --git a/components/adapter/.cvsignore b/components/adapter/.cvsignore index 2beeb817b..e25b8d67f 100644 --- a/components/adapter/.cvsignore +++ b/components/adapter/.cvsignore @@ -3,3 +3,4 @@ Makefile Makefile.in nautilus-adapter +Nautilus_ComponentAdapterFactory_std.oaf diff --git a/components/adapter/Makefile.am b/components/adapter/Makefile.am index 6a91aac8c..46534c979 100644 --- a/components/adapter/Makefile.am +++ b/components/adapter/Makefile.am @@ -14,11 +14,14 @@ INCLUDES = \ $(NULL) oafdir = $(datadir)/oaf - -oaf_DATA = \ - nautilus-adapter.oafinfo \ +oaf_in_files = \ + Nautilus_ComponentAdapterFactory_std.oaf.in \ $(NULL) +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + bin_PROGRAMS = \ nautilus-adapter \ $(NULL) @@ -68,5 +71,5 @@ nautilus_adapter_LDADD = \ $(NULL) -EXTRA_DIST = $(oaf_DATA) +EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) diff --git a/components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in b/components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in index cbbabb7be..650c886f8 100644 --- a/components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in +++ b/components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in @@ -2,20 +2,20 @@ <oaf_server iid="OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f" type="exe" location="nautilus-adapter"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Factory for Nautilus component adapter factories"/> -<oaf_attribute name="description" type="string" value="Factory for Nautilus component adapter factories "/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Factory for Nautilus component adapter factories"/> + <oaf_attribute name="description" type="string" _value="Factory for Nautilus component adapter factories "/> </oaf_server> <oaf_server iid="OAFIID:nautilus_adapter_factory:fd24ecfc-0a6e-47ab-bc53-69d7487c6ad4" type="factory" location="OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:Nautilus/ComponentAdapterFactory:1.0"/> -<item value="IDL:Bonobo/Unknown:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus component adapter factory"/> -<oaf_attribute name="description" type="string" value="Factory for objects that wrap ordinary Bonobo Controls or Embeddables to look like Nautilus Views"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:Nautilus/ComponentAdapterFactory:1.0"/> + <item value="IDL:Bonobo/Unknown:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus component adapter factory"/> + <oaf_attribute name="description" type="string" _value="Factory for objects that wrap ordinary Bonobo Controls or Embeddables to look like Nautilus Views"/> </oaf_server> </oaf_info> diff --git a/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in b/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in index cbbabb7be..650c886f8 100644 --- a/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in +++ b/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in @@ -2,20 +2,20 @@ <oaf_server iid="OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f" type="exe" location="nautilus-adapter"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Factory for Nautilus component adapter factories"/> -<oaf_attribute name="description" type="string" value="Factory for Nautilus component adapter factories "/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Factory for Nautilus component adapter factories"/> + <oaf_attribute name="description" type="string" _value="Factory for Nautilus component adapter factories "/> </oaf_server> <oaf_server iid="OAFIID:nautilus_adapter_factory:fd24ecfc-0a6e-47ab-bc53-69d7487c6ad4" type="factory" location="OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:Nautilus/ComponentAdapterFactory:1.0"/> -<item value="IDL:Bonobo/Unknown:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus component adapter factory"/> -<oaf_attribute name="description" type="string" value="Factory for objects that wrap ordinary Bonobo Controls or Embeddables to look like Nautilus Views"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:Nautilus/ComponentAdapterFactory:1.0"/> + <item value="IDL:Bonobo/Unknown:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus component adapter factory"/> + <oaf_attribute name="description" type="string" _value="Factory for objects that wrap ordinary Bonobo Controls or Embeddables to look like Nautilus Views"/> </oaf_server> </oaf_info> diff --git a/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in b/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in index cbbabb7be..650c886f8 100644 --- a/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in +++ b/components/adapter/Nautilus_ComponentAdapterFactory_std.server.in.in @@ -2,20 +2,20 @@ <oaf_server iid="OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f" type="exe" location="nautilus-adapter"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Factory for Nautilus component adapter factories"/> -<oaf_attribute name="description" type="string" value="Factory for Nautilus component adapter factories "/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Factory for Nautilus component adapter factories"/> + <oaf_attribute name="description" type="string" _value="Factory for Nautilus component adapter factories "/> </oaf_server> <oaf_server iid="OAFIID:nautilus_adapter_factory:fd24ecfc-0a6e-47ab-bc53-69d7487c6ad4" type="factory" location="OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:Nautilus/ComponentAdapterFactory:1.0"/> -<item value="IDL:Bonobo/Unknown:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus component adapter factory"/> -<oaf_attribute name="description" type="string" value="Factory for objects that wrap ordinary Bonobo Controls or Embeddables to look like Nautilus Views"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:Nautilus/ComponentAdapterFactory:1.0"/> + <item value="IDL:Bonobo/Unknown:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus component adapter factory"/> + <oaf_attribute name="description" type="string" _value="Factory for objects that wrap ordinary Bonobo Controls or Embeddables to look like Nautilus Views"/> </oaf_server> </oaf_info> diff --git a/components/adapter/nautilus-adapter.oafinfo b/components/adapter/nautilus-adapter.oafinfo deleted file mode 100644 index cbbabb7be..000000000 --- a/components/adapter/nautilus-adapter.oafinfo +++ /dev/null @@ -1,21 +0,0 @@ -<oaf_info> - - -<oaf_server iid="OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f" type="exe" location="nautilus-adapter"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Factory for Nautilus component adapter factories"/> -<oaf_attribute name="description" type="string" value="Factory for Nautilus component adapter factories "/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_adapter_factory:fd24ecfc-0a6e-47ab-bc53-69d7487c6ad4" type="factory" location="OAFIID:nautilus_adapter_factory_generic_factory:8e62e106-807d-4d37-b14a-00dc82ecf88f"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:Nautilus/ComponentAdapterFactory:1.0"/> -<item value="IDL:Bonobo/Unknown:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus component adapter factory"/> -<oaf_attribute name="description" type="string" value="Factory for objects that wrap ordinary Bonobo Controls or Embeddables to look like Nautilus Views"/> -</oaf_server> - -</oaf_info> diff --git a/components/hardware/.cvsignore b/components/hardware/.cvsignore index 5f9ead006..9251119c9 100644 --- a/components/hardware/.cvsignore +++ b/components/hardware/.cvsignore @@ -3,3 +3,4 @@ Makefile Makefile.in nautilus-hardware-view +Nautilus_View_hardware.oaf diff --git a/components/hardware/Makefile.am b/components/hardware/Makefile.am index d0cb959e0..5cca0cf33 100644 --- a/components/hardware/Makefile.am +++ b/components/hardware/Makefile.am @@ -1,21 +1,28 @@ +NULL= + SUBDIRS=icons -INCLUDES = \ - -DPREFIX=\"$(prefix)\" \ - -DG_LOG_DOMAIN=\"Nautilus-Hardware\" \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(GCONF_CFLAGS) \ - $(VFS_CFLAGS) \ - $(BONOBO_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(GNOMEUI_CFLAGS) +INCLUDES = \ + -DPREFIX=\"$(prefix)\" \ + -DG_LOG_DOMAIN=\"Nautilus-Hardware\" \ + -I$(top_srcdir) \ + -I$(top_builddir) \ + $(GCONF_CFLAGS) \ + $(VFS_CFLAGS) \ + $(BONOBO_CFLAGS) \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + $(GNOMEUI_CFLAGS) \ + $(NULL) oafdir = $(datadir)/oaf -oaf_DATA = \ - nautilus-hardware-view.oafinfo +oaf_in_files = \ + Nautilus_View_hardware.oaf.in \ + $(NULL) + +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +@XML_I18N_MERGE_OAF_RULE@ bin_PROGRAMS = \ nautilus-hardware-view @@ -34,4 +41,5 @@ nautilus_hardware_view_LDADD = \ $(VFS_LIBS) \ $(GNORBA_LIBS) -EXTRA_DIST = $(oaf_DATA) +EXTRA_DIST = $(oaf_DATA) $(oaf_in_files) + diff --git a/components/hardware/Nautilus_View_hardware.oaf.in b/components/hardware/Nautilus_View_hardware.oaf.in index ccc2d7fe4..f5d755b8a 100644 --- a/components/hardware/Nautilus_View_hardware.oaf.in +++ b/components/hardware/Nautilus_View_hardware.oaf.in @@ -1,24 +1,24 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce" type="exe" location="nautilus-hardware-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for hardware view"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="Factory for hardware view"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_hardware_view:4a3f3793-bab4-4640-9f56-e7871fe8e150" type="factory" location="OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce"> -<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="Hardware view"/> -<oaf_attribute name="description" type="string" value="hardware view"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="hardware"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Hardware"/> + <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="Hardware view"/> + <oaf_attribute name="description" type="string" _value="hardware view"/> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="hardware"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Hardware"/> </oaf_server> </oaf_info> diff --git a/components/hardware/Nautilus_View_hardware.server.in b/components/hardware/Nautilus_View_hardware.server.in index ccc2d7fe4..f5d755b8a 100644 --- a/components/hardware/Nautilus_View_hardware.server.in +++ b/components/hardware/Nautilus_View_hardware.server.in @@ -1,24 +1,24 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce" type="exe" location="nautilus-hardware-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for hardware view"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="Factory for hardware view"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_hardware_view:4a3f3793-bab4-4640-9f56-e7871fe8e150" type="factory" location="OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce"> -<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="Hardware view"/> -<oaf_attribute name="description" type="string" value="hardware view"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="hardware"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Hardware"/> + <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="Hardware view"/> + <oaf_attribute name="description" type="string" _value="hardware view"/> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="hardware"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Hardware"/> </oaf_server> </oaf_info> diff --git a/components/hardware/Nautilus_View_hardware.server.in.in b/components/hardware/Nautilus_View_hardware.server.in.in index ccc2d7fe4..f5d755b8a 100644 --- a/components/hardware/Nautilus_View_hardware.server.in.in +++ b/components/hardware/Nautilus_View_hardware.server.in.in @@ -1,24 +1,24 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce" type="exe" location="nautilus-hardware-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for hardware view"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="Factory for hardware view"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_hardware_view:4a3f3793-bab4-4640-9f56-e7871fe8e150" type="factory" location="OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce"> -<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="Hardware view"/> -<oaf_attribute name="description" type="string" value="hardware view"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="hardware"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Hardware"/> + <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="Hardware view"/> + <oaf_attribute name="description" type="string" _value="hardware view"/> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="hardware"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Hardware"/> </oaf_server> </oaf_info> diff --git a/components/hardware/nautilus-hardware-view.oafinfo b/components/hardware/nautilus-hardware-view.oafinfo deleted file mode 100644 index ccc2d7fe4..000000000 --- a/components/hardware/nautilus-hardware-view.oafinfo +++ /dev/null @@ -1,24 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce" type="exe" location="nautilus-hardware-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for hardware view"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_hardware_view:4a3f3793-bab4-4640-9f56-e7871fe8e150" type="factory" location="OAFIID:nautilus_hardware_view_factory:8c80e55a-5c03-4403-9e51-3a5711b8a5ce"> -<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="Hardware view"/> -<oaf_attribute name="description" type="string" value="hardware view"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="hardware"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Hardware"/> -</oaf_server> - -</oaf_info> diff --git a/components/help/.cvsignore b/components/help/.cvsignore index b9147df64..4fe1245bc 100644 --- a/components/help/.cvsignore +++ b/components/help/.cvsignore @@ -5,3 +5,4 @@ Makefile Makefile.in hyperbola +Nautilus_View_help.oaf diff --git a/components/help/Makefile.am b/components/help/Makefile.am index 91d4e6a53..191216d5a 100644 --- a/components/help/Makefile.am +++ b/components/help/Makefile.am @@ -35,19 +35,6 @@ hyperbola_SOURCES= \ hyperbola-nav-index.c \ hyperbola-nav-search.c -oafdir=$(datadir)/oaf - -# These are broken: -# -# help-search.oafinfo -# help-index.oafinfo -# - -oaf_DATA=\ - help-factory.oafinfo \ - help-contents.oafinfo \ - $(NULL) - mapdatadir=$(datadir)/hyperbola/maps mapdata_DATA=pages.map @@ -61,5 +48,14 @@ libvfs_help_la_LIBADD = $(GLIB_LIBS) modulesconfdir=$(sysconfdir)/vfs/modules modulesconf_DATA = help-methods.conf -EXTRA_DIST=pages.map $(oaf_DATA) help-methods.conf +oafdir = $(datadir)/oaf +oaf_in_files = \ + Nautilus_View_help.oaf.in \ + $(NULL) +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + + +EXTRA_DIST=pages.map $(oaf_in_files) $(oaf_DATA) help-methods.conf diff --git a/components/help/Nautilus_View_help.oaf.in b/components/help/Nautilus_View_help.oaf.in index d053935a0..721890244 100644 --- a/components/help/Nautilus_View_help.oaf.in +++ b/components/help/Nautilus_View_help.oaf.in @@ -1,27 +1,65 @@ <oaf_info> <oaf_server iid="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb" type="exe" location="hyperbola"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Internal use only"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="Internal use only"/> </oaf_server> <oaf_server iid="OAFIID:hyperbola_navigation_tree:57542ce0-71ff-442d-a764-462c92514234" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb"> -<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="description" type="string" value="Help Navigation Tree"/> -<oaf_attribute name="name" type="string" value="Help sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Help"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="help"/> -<item value="ghelp"/> -<item value="man"/> -<item value="info"/> -</oaf_attribute> + <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="description" type="string" _value="Help Navigation Tree"/> + <oaf_attribute name="name" type="string" _value="Help sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Help"/> + <oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> + <item value="help"/> + <item value="ghelp"/> + <item value="man"/> + <item value="info"/> + </oaf_attribute> </oaf_server> +<!-- These parts are broken + +<oaf_server iid="OAFIID:hyperbola_navigation_search:89b2f3b8-4f09-49c8-9a7b-ccb14d034813" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb"> + <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="description" type="string" _value="Help Search"/> + <oaf_attribute name="name" type="string" _value="Help Search sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Help Search"/> + <oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> + <item value="ghelp"/> + <item value="help"/> + <item value="man"/> + <item value="info"/> + </oaf_attribute> +</oaf_server> + + +<oaf_server iid="OAFIID:hyperbola_navigation_index:0bafadc7-09f1-4f10-8c8e-dad53124fc49" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb"> + <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="description" type="string" _value="Help Index"/> + <oaf_attribute name="name" type="string" _value="Help Index sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Help Index"/> + <oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> + <item value="help"/> + <item value="man"/> + <item value="info"/> + </oaf_attribute> +</oaf_server> + +--> + </oaf_info> diff --git a/components/help/Nautilus_View_help.server.in b/components/help/Nautilus_View_help.server.in index d053935a0..721890244 100644 --- a/components/help/Nautilus_View_help.server.in +++ b/components/help/Nautilus_View_help.server.in @@ -1,27 +1,65 @@ <oaf_info> <oaf_server iid="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb" type="exe" location="hyperbola"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Internal use only"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="Internal use only"/> </oaf_server> <oaf_server iid="OAFIID:hyperbola_navigation_tree:57542ce0-71ff-442d-a764-462c92514234" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb"> -<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="description" type="string" value="Help Navigation Tree"/> -<oaf_attribute name="name" type="string" value="Help sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Help"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="help"/> -<item value="ghelp"/> -<item value="man"/> -<item value="info"/> -</oaf_attribute> + <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="description" type="string" _value="Help Navigation Tree"/> + <oaf_attribute name="name" type="string" _value="Help sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Help"/> + <oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> + <item value="help"/> + <item value="ghelp"/> + <item value="man"/> + <item value="info"/> + </oaf_attribute> </oaf_server> +<!-- These parts are broken + +<oaf_server iid="OAFIID:hyperbola_navigation_search:89b2f3b8-4f09-49c8-9a7b-ccb14d034813" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb"> + <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="description" type="string" _value="Help Search"/> + <oaf_attribute name="name" type="string" _value="Help Search sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Help Search"/> + <oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> + <item value="ghelp"/> + <item value="help"/> + <item value="man"/> + <item value="info"/> + </oaf_attribute> +</oaf_server> + + +<oaf_server iid="OAFIID:hyperbola_navigation_index:0bafadc7-09f1-4f10-8c8e-dad53124fc49" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb"> + <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="description" type="string" _value="Help Index"/> + <oaf_attribute name="name" type="string" _value="Help Index sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Help Index"/> + <oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> + <item value="help"/> + <item value="man"/> + <item value="info"/> + </oaf_attribute> +</oaf_server> + +--> + </oaf_info> diff --git a/components/help/help-contents.oafinfo b/components/help/help-contents.oafinfo deleted file mode 100644 index d053935a0..000000000 --- a/components/help/help-contents.oafinfo +++ /dev/null @@ -1,27 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb" type="exe" location="hyperbola"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Internal use only"/> -</oaf_server> - -<oaf_server iid="OAFIID:hyperbola_navigation_tree:57542ce0-71ff-442d-a764-462c92514234" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb"> -<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="description" type="string" value="Help Navigation Tree"/> -<oaf_attribute name="name" type="string" value="Help sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Help"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="help"/> -<item value="ghelp"/> -<item value="man"/> -<item value="info"/> -</oaf_attribute> -</oaf_server> - -</oaf_info> diff --git a/components/help/help-factory.oafinfo b/components/help/help-factory.oafinfo deleted file mode 100644 index 0cbfc0e14..000000000 --- a/components/help/help-factory.oafinfo +++ /dev/null @@ -1,10 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb" type="exe" location="hyperbola"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Internal use only"/> -</oaf_server> - -</oaf_info> diff --git a/components/help/help-index.oafinfo b/components/help/help-index.oafinfo deleted file mode 100644 index c581d35d7..000000000 --- a/components/help/help-index.oafinfo +++ /dev/null @@ -1,20 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:hyperbola_navigation_index:0bafadc7-09f1-4f10-8c8e-dad53124fc49" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb"> -<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="description" type="string" value="Help Index"/> -<oaf_attribute name="name" type="string" value="Help Index sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Help Index"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="help"/> -<item value="man"/> -<item value="info"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Help Index"/> -</oaf_server> - -</oaf_info> diff --git a/components/help/help-search.oafinfo b/components/help/help-search.oafinfo deleted file mode 100644 index dbd2258f4..000000000 --- a/components/help/help-search.oafinfo +++ /dev/null @@ -1,20 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:hyperbola_navigation_search:89b2f3b8-4f09-49c8-9a7b-ccb14d034813" type="factory" location="OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb"> -<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="description" type="string" value="Help Search"/> -<oaf_attribute name="name" type="string" value="Help Search sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Help Search"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="ghelp"/> -<item value="help"/> -<item value="man"/> -<item value="info"/> -</oaf_attribute> -</oaf_server> - -</oaf_info> diff --git a/components/history/.cvsignore b/components/history/.cvsignore index a9199111d..777f924ff 100644 --- a/components/history/.cvsignore +++ b/components/history/.cvsignore @@ -3,3 +3,4 @@ Makefile Makefile.in nautilus-history-view +Nautilus_View_history.oaf diff --git a/components/history/Makefile.am b/components/history/Makefile.am index 7eda209a9..6de881019 100644 --- a/components/history/Makefile.am +++ b/components/history/Makefile.am @@ -1,3 +1,5 @@ +NULL = + bin_PROGRAMS=nautilus-history-view INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GNOMEUI_CFLAGS) $(GCONF_CFLAGS) \ @@ -12,6 +14,15 @@ LDADD=\ nautilus_history_view_SOURCES=nautilus-history-view.c -oafdir=$(datadir)/oaf -oaf_DATA=nautilus-history-view.oafinfo -EXTRA_DIST=$(oaf_DATA) +oafdir = $(datadir)/oaf + +oaf_in_files = \ + Nautilus_View_history.oaf.in \ + $(NULL) + +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + +EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) + diff --git a/components/history/Nautilus_View_history.oaf.in b/components/history/Nautilus_View_history.oaf.in index 39421ed66..449ee219d 100644 --- a/components/history/Nautilus_View_history.oaf.in +++ b/components/history/Nautilus_View_history.oaf.in @@ -1,24 +1,24 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="nautilus-history-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for history views"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="Factory for history views"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e"> -<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="description" type="string" value="History sidebar panel for Nautilus"/> -<oaf_attribute name="name" type="string" value="History sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="History"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> + <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="description" type="string" _value="History sidebar panel for Nautilus"/> + <oaf_attribute name="name" type="string" _value="History sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="History"/> + <oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> + <item value="*"/> + </oaf_attribute> </oaf_server> diff --git a/components/history/Nautilus_View_history.server.in b/components/history/Nautilus_View_history.server.in index 39421ed66..449ee219d 100644 --- a/components/history/Nautilus_View_history.server.in +++ b/components/history/Nautilus_View_history.server.in @@ -1,24 +1,24 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="nautilus-history-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for history views"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="Factory for history views"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e"> -<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="description" type="string" value="History sidebar panel for Nautilus"/> -<oaf_attribute name="name" type="string" value="History sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="History"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> + <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="description" type="string" _value="History sidebar panel for Nautilus"/> + <oaf_attribute name="name" type="string" _value="History sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="History"/> + <oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> + <item value="*"/> + </oaf_attribute> </oaf_server> diff --git a/components/history/Nautilus_View_history.server.in.in b/components/history/Nautilus_View_history.server.in.in index 39421ed66..449ee219d 100644 --- a/components/history/Nautilus_View_history.server.in.in +++ b/components/history/Nautilus_View_history.server.in.in @@ -1,24 +1,24 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="nautilus-history-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for history views"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="Factory for history views"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e"> -<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="description" type="string" value="History sidebar panel for Nautilus"/> -<oaf_attribute name="name" type="string" value="History sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="History"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> + <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="description" type="string" _value="History sidebar panel for Nautilus"/> + <oaf_attribute name="name" type="string" _value="History sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="History"/> + <oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> + <item value="*"/> + </oaf_attribute> </oaf_server> diff --git a/components/history/nautilus-history-view.oafinfo b/components/history/nautilus-history-view.oafinfo deleted file mode 100644 index 39421ed66..000000000 --- a/components/history/nautilus-history-view.oafinfo +++ /dev/null @@ -1,25 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="nautilus-history-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for history views"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:nautilus_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e"> -<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="description" type="string" value="History sidebar panel for Nautilus"/> -<oaf_attribute name="name" type="string" value="History sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="History"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> - -</oaf_server> - -</oaf_info> diff --git a/components/html/.cvsignore b/components/html/.cvsignore deleted file mode 100644 index 339a84647..000000000 --- a/components/html/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -ntl-web-browser diff --git a/components/html/Makefile.am b/components/html/Makefile.am deleted file mode 100644 index 0db403671..000000000 --- a/components/html/Makefile.am +++ /dev/null @@ -1,45 +0,0 @@ -# FIXME bugzilla.eazel.com 714: I (Elliot) want the HTML component to be a -# shared library component, not an exe one. - -INCLUDES = \ - -DPREFIX=\"$(prefix)\" \ - -DG_LOG_DOMAIN=\"Nautilus-HTML\" \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(GCONF_CFLAGS) \ - $(GNOMEUI_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(BONOBO_CFLAGS) \ - $(VFS_CFLAGS) \ - $(LIBWWW_CFLAGS) \ - -D_VERSION=\"$(VERSION)\" - -oafdir = $(datadir)/oaf -oaf_DATA = \ - ntl-web-browser.oafinfo - - -bin_PROGRAMS = \ - ntl-web-browser - -ntl_web_browser_SOURCES = \ - ntl-web-browser.c \ - glibwww-init.c \ - glibwww-trans.c \ - glibwww-callbacks.c \ - glibwww.h \ - gnome-dialogs.c - -ntl_web_browser_LDADD = \ - $(top_builddir)/libnautilus/libnautilus.la \ - $(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \ - $(GTKHTML_LIBS) \ - $(BONOBO_LIBS) \ - $(GNOMEUI_LIBS) \ - $(GCONF_LIBS) \ - $(VFS_LIBS) \ - $(OAF_LIBS) \ - $(LIBWWW_LIBS) - -EXTRA_DIST = $(oaf_DATA) diff --git a/components/html/glibwww-callbacks.c b/components/html/glibwww-callbacks.c deleted file mode 100644 index 6ff1751b5..000000000 --- a/components/html/glibwww-callbacks.c +++ /dev/null @@ -1,214 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -#include "glibwww.h" -#include <HTEvent.h> -#include <HTTimer.h> -#undef PACKAGE -#undef VERSION -#include <config.h> - -#define WWW_HIGH_PRIORITY (G_PRIORITY_HIGH_IDLE + 50) -#define WWW_LOW_PRIORITY G_PRIORITY_LOW -#define WWW_SCALE_PRIORITY(p) ((WWW_HIGH_PRIORITY - WWW_LOW_PRIORITY) * p \ - / HT_PRIORITY_MAX + WWW_LOW_PRIORITY) - -#define READ_CONDITION (G_IO_IN | G_IO_HUP | G_IO_ERR) -#define WRITE_CONDITION (G_IO_OUT | G_IO_ERR) -#define EXCEPTION_CONDITION (G_IO_PRI) - -typedef struct _SockEventInfo SockEventInfo; -struct _SockEventInfo { - SOCKET s; - HTEventType type; - HTEvent *event; - guint io_tag; - guint timer_tag; -}; - -typedef struct _SockInfo SockInfo; -struct _SockInfo { - SOCKET s; - GIOChannel *io; - SockEventInfo ev[HTEvent_TYPES]; -}; - -static GHashTable *sockhash = NULL; - - -static SockInfo * -get_sock_info(SOCKET s, gboolean create) -{ - SockInfo *info; - - if (!sockhash) - sockhash = g_hash_table_new(NULL, NULL); - - info = g_hash_table_lookup(sockhash, GINT_TO_POINTER(s)); - if (!info && create) { - info = g_new0(SockInfo, 1); - info->s = s; - info->io = g_io_channel_unix_new(s); - info->ev[0].s = info->ev[1].s = info->ev[2].s = s; - info->ev[0].type = HTEvent_READ; - info->ev[1].type = HTEvent_WRITE; - info->ev[2].type = HTEvent_OOB; - g_hash_table_insert(sockhash, GINT_TO_POINTER(s), info); - } - return info; -} - -static gboolean glibwww_timeout_func (gpointer data); -static gboolean glibwww_io_func(GIOChannel *source, GIOCondition condition, - gpointer data); - -static int -glibwww_event_register (SOCKET s, HTEventType type, HTEvent *event) -{ - SockInfo *info; - gint priority = G_PRIORITY_DEFAULT; - GIOCondition condition; - - if (s == INVSOC || HTEvent_INDEX(type) >= HTEvent_TYPES) - return 0; - - info = get_sock_info(s, TRUE); - info->ev[HTEvent_INDEX(type)].event = event; - - switch (HTEvent_INDEX(type)) { - case HTEvent_INDEX(HTEvent_READ): - condition = READ_CONDITION; break; - case HTEvent_INDEX(HTEvent_WRITE): - condition = WRITE_CONDITION; break; - case HTEvent_INDEX(HTEvent_OOB): - condition = EXCEPTION_CONDITION; break; - default: - condition = 0; /* this should never occur */ - } - if (event->priority != HT_PRIORITY_OFF) - priority = WWW_SCALE_PRIORITY(event->priority); - - info->ev[HTEvent_INDEX(type)].io_tag = - g_io_add_watch_full(info->io, priority, condition, glibwww_io_func, - &info->ev[HTEvent_INDEX(type)], NULL); - - if (event->millis >= 0) - info->ev[HTEvent_INDEX(type)].timer_tag = - g_timeout_add_full(priority, event->millis, glibwww_timeout_func, - &info->ev[HTEvent_INDEX(type)], NULL); - - return HT_OK; -} - -static int -glibwww_event_unregister (SOCKET s, HTEventType type) -{ - SockInfo *info = get_sock_info(s, FALSE); - - if (info) { - if (info->ev[HTEvent_INDEX(type)].io_tag) - g_source_remove(info->ev[HTEvent_INDEX(type)].io_tag); - if (info->ev[HTEvent_INDEX(type)].timer_tag) - g_source_remove(info->ev[HTEvent_INDEX(type)].timer_tag); - - info->ev[HTEvent_INDEX(type)].event = NULL; - info->ev[HTEvent_INDEX(type)].io_tag = 0; - info->ev[HTEvent_INDEX(type)].timer_tag = 0; - - /* clean up sock hash if needed */ - /*if (info->ev[0].io_tag == 0 && - info->ev[1].io_tag == 0 && - info->ev[2].io_tag == 0) { - g_message("Freeing sock:%d", s); - g_hash_table_remove(sockhash, GINT_TO_POINTER(s)); - g_io_channel_unref(info->io); - g_free(info); - }*/ - - return HT_OK; - } - return HT_ERROR; -} - -static gboolean -glibwww_timeout_func (gpointer data) -{ - SockEventInfo *info = (SockEventInfo *)data; - HTEvent *event = info->event; - - if (event) - (* event->cbf) (info->s, event->param, HTEvent_TIMEOUT); - return info->timer_tag != 0; /* XXXX a hack */ -} - -static gboolean -glibwww_io_func(GIOChannel *source, GIOCondition condition, gpointer data) -{ - SockEventInfo *info = (SockEventInfo *)data; - HTEvent *event = info->event; - - if (info->timer_tag) - g_source_remove(info->timer_tag); - if (event && event->millis >= 0) { - gint priority = G_PRIORITY_DEFAULT; - - if (event->priority != HT_PRIORITY_OFF) - priority = WWW_SCALE_PRIORITY(event->priority); - info->timer_tag = - g_timeout_add_full(priority, info->event->millis, glibwww_timeout_func, - info, NULL); - } - - if (event) - (* event->cbf) (info->s, event->param, info->type); - return info->io_tag != 0; /* XXXX a hack */ -} - -static GHashTable *timers = NULL; - -static gboolean -glibwww_dispatch_timer(gpointer data) -{ - HTTimer *timer = (HTTimer *)data; - - HTTimer_dispatch(timer); - return FALSE; -} - -static BOOL -glibwww_timer_register(HTTimer *timer) -{ - guint tag; - - if (!timers) - timers = g_hash_table_new(NULL, NULL); - - tag = g_timeout_add(HTTimer_expiresRelative(timer), - glibwww_dispatch_timer, timer); - g_hash_table_insert(timers, timer, GUINT_TO_POINTER(tag)); - return YES; -} - -static BOOL -glibwww_timer_unregister(HTTimer *timer) { - guint tag; - - if (!timers) - return NO; - tag = GPOINTER_TO_UINT(g_hash_table_lookup(timers, timer)); - if (tag) { - g_source_remove(tag); - g_hash_table_remove(timers, timer); - return YES; - } - return NO; -} - -void -glibwww_register_callbacks(void) -{ - HTEvent_setRegisterCallback(glibwww_event_register); - HTEvent_setUnregisterCallback(glibwww_event_unregister); - - HTTimer_registerSetTimerCallback(glibwww_timer_register); - HTTimer_registerDeleteTimerCallback(glibwww_timer_unregister); -} - diff --git a/components/html/glibwww-init.c b/components/html/glibwww-init.c deleted file mode 100644 index 7f0c033de..000000000 --- a/components/html/glibwww-init.c +++ /dev/null @@ -1,383 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -#include <WWWCore.h> -#include <WWWStream.h> -#include <WWWTrans.h> -#include <WWWHTTP.h> -#include <WWWMIME.h> -#include <WWWFTP.h> -#include <WWWFile.h> -#include <WWWGophe.h> -#include <WWWZip.h> - -/* clean up the cpp namespace -- libwww is particularly dirty */ -#undef PACKAGE -#undef VERSION -#undef _ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include <glib.h> -#include "glibwww.h" - -/* For some reason, the folks at Sun are missing this declaration. - * Rather than figure out why, I just decided to add it here. - */ -extern HTCoder HTZLib_inflate; - -#ifndef FTP_PORT -#define FTP_PORT 21 -#endif -#ifndef HTTP_PORT -#define HTTP_PORT 80 -#endif -/*#include "WWWMIME.h"*/ - -static void HTMIMEInit (void); - -static void glibwww_parse_proxy_env (void); - -static int HTProxyFilter (HTRequest *request, void *param, int status); -static int HTRedirectFilter (HTRequest *request, HTResponse *response, - void *param, int status); -static int HTCredentialsFilter (HTRequest *request, void *param, int status); -static int HTAuthFilter (HTRequest *request, HTResponse *response, - void *param, int status); -static int HTAuthInfoFilter (HTRequest *request, HTResponse *response, - void *param, int status); - -static gboolean exitfunc = FALSE; - -void -glibwww_init(const gchar *appName, const gchar *appVersion) -{ - if (!HTLib_isInitialized()) - HTLibInit(appName, appVersion); - /*HTAlertInit(); - HTAlert_setInteractive(NO);*/ - - HTTransport_add("tcp", HT_TP_SINGLE,HTReader_new,HTWriter_new); - HTTransport_add("buffered_tcp",HT_TP_SINGLE,HTReader_new,HTBufferWriter_new); - HTTransport_add("local", HT_TP_SINGLE,HTReader_new,HTWriter_new); - - HTProtocol_add("ftp", "tcp", FTP_PORT, NO, HTLoadFTP, NULL); - HTProtocol_add("http", "buffered_tcp", HTTP_PORT, NO, HTLoadHTTP, NULL); - HTProtocol_add("file", "local", 0, NO, HTLoadFile, NULL); - - HTNet_setMaxSocket(6); - - HTNet_addBefore(HTCredentialsFilter, "http://*", NULL, HT_FILTER_LATE); - HTNet_addBefore(HTProxyFilter, NULL, NULL, HT_FILTER_LATE); - HTNet_addAfter(HTAuthFilter, "http://*", NULL, HT_NO_ACCESS, - HT_FILTER_MIDDLE); - HTNet_addAfter(HTAuthFilter, "http://*", NULL, HT_REAUTH, - HT_FILTER_MIDDLE); - HTNet_addAfter(HTRedirectFilter, "http://*", NULL, HT_PERM_REDIRECT, - HT_FILTER_MIDDLE); - HTNet_addAfter(HTRedirectFilter, "http://*", NULL, HT_FOUND, - HT_FILTER_MIDDLE); - HTNet_addAfter(HTRedirectFilter, "http://*", NULL, HT_SEE_OTHER, - HT_FILTER_MIDDLE); - HTNet_addAfter(HTRedirectFilter, "http://*", NULL, HT_TEMP_REDIRECT, - HT_FILTER_MIDDLE); - HTNet_addAfter(HTAuthInfoFilter, "http://*", NULL, HT_ALL, - HT_FILTER_MIDDLE); - - HTAA_newModule ("basic", HTBasic_generate, HTBasic_parse, NULL, - HTBasic_delete); - - glibwww_parse_proxy_env(); - /* set proxy from our config files ... */ - /* glibwww_add_proxy("http", ...); */ - /* glibwww_add_proxy("ftp", ...); */ - - HTMIME_setSaveStream (HTSaveLocally); - - HTFormat_addConversion("message/rfc822", "*/*", HTMIMEConvert, - 1.0, 0.0, 0.0); - HTFormat_addConversion("message/x-rfc822-foot", "*/*", HTMIMEFooter, - 1.0, 0.0, 0.0); - HTFormat_addConversion("message/x-rfc822-head", "*/*", HTMIMEHeader, - 1.0, 0.0, 0.0); - HTFormat_addConversion("message/x-rfc822-cont", "*/*", HTMIMEContinue, - 1.0, 0.0, 0.0); - HTFormat_addConversion("message/x-rfc822-upgrade", "*/*", HTMIMEUpgrade, - 1.0, 0.0, 0.0); - HTFormat_addConversion("message/x-rfc822-partial", "*/*", HTMIMEPartial, - 1.0, 0.0, 0.0); - - HTFormat_addConversion("text/x-http", "*/*", HTTPStatus_new, - 1.0, 0.0, 0.0); - - HTFormat_addCoding("*", HTIdentityCoding, HTIdentityCoding, 0.3); - - HTFormat_addTransferCoding("deflate", NULL, HTZLib_inflate, 1.0); - HTFormat_addTransferCoding("chunked", HTChunkedEncoder,HTChunkedDecoder,1.0); - - HTMIMEInit(); - - HTFileInit(); - - HTHost_setEventTimeout(30000); - - HTFTP_setTransferMode(FTP_BINARY_TRANSFER_MODE); - - glibwww_register_callbacks(); - - if (!exitfunc) - g_atexit(glibwww_cleanup); - exitfunc = TRUE; - - /*WWWTRACE = SHOW_MEM_TRACE;*/ -} - -void glibwww_cleanup(void) { - if (HTLib_isInitialized()) { - HTFormat_deleteAll(); - HTLibTerminate(); - } -} - -struct ProxyEntry { - gchar *protocol; - gchar *proxy; -}; - -static GList *proxies = NULL; -static GList *noproxy = NULL; - -void -glibwww_add_proxy(const gchar *protocol, const gchar *proxy) -{ - GList *tmp; - struct ProxyEntry *ent; - - for (tmp = proxies; tmp; tmp = tmp->next) { - ent = tmp->data; - if (!g_strcasecmp(protocol, ent->protocol)) { - g_free(ent->proxy); - ent->proxy = g_strdup(proxy); - return; - } - } - ent = g_new(struct ProxyEntry, 1); - ent->protocol = g_strdup(protocol); - ent->proxy = g_strdup(proxy); - proxies = g_list_prepend(proxies, ent); -} - -void -glibwww_add_noproxy(const gchar *host) -{ - noproxy = g_list_prepend(noproxy, g_strdup(host)); -} - -static const gchar * -glibwww_get_proxy(const gchar *url) -{ - gchar *protocol; - GList *tmp; - - if (!url || !proxies) - return NULL; - if (noproxy) { - char *host = HTParse(url, "", PARSE_HOST); - char *ptr = strchr(host, ':'); - - if (ptr != NULL) *ptr = ':'; - for (tmp = noproxy; tmp; tmp = tmp->next) { - char *nophost = tmp->data; - char *np = nophost + strlen(nophost); - char *hp = host + strlen(host); - - while (np>=nophost && hp>=host && (*np--==*hp--)) - ; - if (np==nophost-1 && (hp==host-1 || *hp=='.')) - return NULL; - } - } - protocol = HTParse(url, "", PARSE_ACCESS); - for (tmp = proxies; tmp; tmp = tmp->next) { - struct ProxyEntry *ent = tmp->data; - - if (!g_strcasecmp(ent->protocol, protocol)) { - HT_FREE(protocol); - return ent->proxy; - } - } - HT_FREE(protocol); - return NULL; -} - -static void -glibwww_parse_proxy_env(void) -{ - static const char *protocollist[] = { - "http", - "ftp", - "news", - "wais", - "gopher", - NULL - }; - const char **prot = protocollist; - char *nop; - - for (prot = protocollist; *prot != NULL; prot++) { - gchar *var = g_strconcat(*prot, "_proxy", NULL); - gchar *proxy = g_getenv(var); - - if (proxy && proxy[0]) - glibwww_add_proxy(*prot, proxy); - else { - gchar *up = var; - while ((*up = TOUPPER(*up))) up++; - if ((proxy = g_getenv(var)) != NULL && proxy[0]) - glibwww_add_proxy(*prot, proxy); - } - g_free(var); - } - nop = g_getenv("no_proxy"); - if (nop && nop[0]) { - char *str = g_strdup(nop); - char *ptr = str; - char *name; - - while ((name = HTNextField(&ptr)) != NULL) - glibwww_add_noproxy(name); - g_free(str); - } -} - -/* mime initialisation */ -static void -HTMIMEInit(void) -{ - struct { - char *string; - HTParserCallback *pHandler; - } fixedHandlers[] = { - {"accept", &HTMIME_accept}, - {"accept-charset", &HTMIME_acceptCharset}, - {"accept-encoding", &HTMIME_acceptEncoding}, - {"accept-language", &HTMIME_acceptLanguage}, - {"accept-ranges", &HTMIME_acceptRanges}, - {"authorization", NULL}, - {"cache-control", &HTMIME_cacheControl}, - {"connection", &HTMIME_connection}, - {"content-encoding", &HTMIME_contentEncoding}, - {"content-length", &HTMIME_contentLength}, - {"content-range", &HTMIME_contentRange}, - {"content-transfer-encoding", &HTMIME_contentTransferEncoding}, - {"content-type", &HTMIME_contentType}, - {"digest-MessageDigest", &HTMIME_messageDigest}, - {"keep-alive", &HTMIME_keepAlive}, - {"link", &HTMIME_link}, - {"location", &HTMIME_location}, - {"max-forwards", &HTMIME_maxForwards}, - {"mime-version", NULL}, - {"pragma", &HTMIME_pragma}, - {"protocol", &HTMIME_protocol}, - {"protocol-info", &HTMIME_protocolInfo}, - {"protocol-request", &HTMIME_protocolRequest}, - {"proxy-authenticate", &HTMIME_authenticate}, - {"proxy-authorization", &HTMIME_proxyAuthorization}, - {"public", &HTMIME_public}, - {"range", &HTMIME_range}, - {"referer", &HTMIME_referer}, - {"retry-after", &HTMIME_retryAfter}, - {"server", &HTMIME_server}, - {"trailer", &HTMIME_trailer}, - {"transfer-encoding", &HTMIME_transferEncoding}, - {"upgrade", &HTMIME_upgrade}, - {"user-agent", &HTMIME_userAgent}, - {"vary", &HTMIME_vary}, - {"via", &HTMIME_via}, - {"warning", &HTMIME_warning}, - {"www-authenticate", &HTMIME_authenticate}, - {"authentication-info", &HTMIME_authenticationInfo}, - {"proxy-authentication-info", &HTMIME_proxyAuthenticationInfo} - }; - int i; - - for (i = 0; i < sizeof(fixedHandlers)/sizeof(fixedHandlers[0]); i++) - HTHeader_addParser(fixedHandlers[i].string, NO, fixedHandlers[i].pHandler); -} - -/* the following filters are from HTFilter.c: */ -static int -HTProxyFilter(HTRequest *request, void *param, int status) -{ - HTParentAnchor *anchor = HTRequest_anchor(request); - char *addr = HTAnchor_physical(anchor); - const char *physical = NULL; - - if ((physical = glibwww_get_proxy(addr))) { - HTRequest_setFullURI(request, YES); - HTRequest_setProxy(request, physical); - } else { - HTRequest_setFullURI(request, NO); - HTRequest_deleteProxy(request); - } - return HT_OK; -} - -static int -HTRedirectFilter(HTRequest *request, HTResponse *response, - void *param, int status) -{ - HTMethod method = HTRequest_method(request); - HTAnchor *new_anchor = HTResponse_redirection(response); - - if (!new_anchor) - return HT_OK; - - if (!HTMethod_isSafe(method)) - return HT_OK; - - HTRequest_deleteCredentialsAll(request); - if (HTRequest_doRetry(request)) { - HTRequest_setAnchor(request, new_anchor); - HTLoad(request, NO); - } else { - HTRequest_addError(request, ERR_FATAL, NO, HTERR_MAX_REDIRECT, - NULL, 0, "HTRedirectFilter"); - return HT_OK; - } - return HT_ERROR; -} - -static int -HTCredentialsFilter(HTRequest *request, void *param, int status) -{ - if (HTAA_beforeFilter(request, param, status) == HT_OK) - return HT_OK; - else { - HTRequest_addError(request, ERR_FATAL, NO, HTERR_UNAUTHORIZED, - NULL, 0, "HTCredentialsFilter"); - return HT_ERROR; - } -} - -static int -HTAuthFilter(HTRequest *request, HTResponse *response, - void *param, int status) -{ - if (HTAA_afterFilter(request, response, param, status) == HT_OK) { - HTLoad(request, NO); - return HT_ERROR; - } - return HT_OK; -} -static int -HTAuthInfoFilter(HTRequest *request, HTResponse *response, - void *param, int status) -{ - if (!HTResponse_challenge(response)) - return HT_OK; - else if (HTAA_updateFilter(request, response, param, status) == HT_OK) - return HT_OK; - else - return HT_ERROR; -} - diff --git a/components/html/glibwww-trans.c b/components/html/glibwww-trans.c deleted file mode 100644 index cb903c82e..000000000 --- a/components/html/glibwww-trans.c +++ /dev/null @@ -1,200 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -#include <WWWCore.h> -#include <WWWStream.h> -#include <WWWTrans.h> - -#undef PACKAGE -#undef VERSION -#undef _ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include "glibwww.h" -#include <stdio.h> - -static gboolean -delete_request(HTRequest *request) -{ - /*HTRequest_delete(request);*/ - return FALSE; -} - -struct LoadToFileData { - gchar *url; - gchar *file; - GWWWLoadToFileFunc callback; - gpointer user_data; -}; - -static int -after_load_to_file(HTRequest *request, HTResponse *response, - void *param, int status) -{ - struct LoadToFileData *data = (struct LoadToFileData *)param; - - /* Ignore these after events. We will get another call to the - * after filter when the data actually loads. */ - switch (status) { - case HT_NO_ACCESS: - case HT_REAUTH: - case HT_PERM_REDIRECT: - case HT_FOUND: - case HT_SEE_OTHER: - case HT_TEMP_REDIRECT: - return HT_OK; - default: - break; - } - - if (data) { - if (data->callback) - (* data->callback)(data->url, data->file, status, - data->user_data); - g_free(data->url); - g_free(data->file); - g_free(data); - } - - /* schedule for the request to be deleted */ - g_idle_add((GSourceFunc)delete_request, request); - - return HT_OK; -} - -GWWWRequest * -glibwww_load_to_file(const gchar *url, const gchar *file, - GWWWLoadToFileFunc callback, gpointer user_data) -{ - FILE *fp; - HTRequest *request; - HTStream *writer; - struct LoadToFileData *data; - - g_return_val_if_fail(url != NULL, NULL); - g_return_val_if_fail(file != NULL, NULL); - - if ((fp = fopen(file, "wb")) == NULL) - return NULL; - - request = HTRequest_new(); - writer = HTFWriter_new(request, fp, NO); - HTRequest_setOutputFormat(request, WWW_SOURCE); - HTRequest_setOutputStream(request, writer); - HTRequest_setDebugStream(request, writer); - HTRequest_setAnchor(request, HTAnchor_findAddress(url)); - - data = g_new(struct LoadToFileData, 1); - data->url = g_strdup(url); - data->file = g_strdup(file); - data->callback = callback; - data->user_data = user_data; - HTRequest_addAfter(request, after_load_to_file, NULL, data, - HT_ALL, HT_FILTER_LAST, FALSE); - - if (HTLoad(request, NO) == NO) { - fclose(fp); - HTRequest_delete(request); - return NULL; - } - return request; -} - -struct LoadToMemData { - gchar *url; - HTChunk *chunk; - GWWWLoadToMemFunc callback; - gpointer user_data; -}; - -static int -after_load_to_mem(HTRequest *request, HTResponse *response, - void *param, int status) -{ - struct LoadToMemData *data = (struct LoadToMemData *)param; - - /* Ignore these after events. We will get another call to the - * after filter when the data actually loads. */ - switch (status) { - case HT_NO_ACCESS: - case HT_REAUTH: - case HT_PERM_REDIRECT: - case HT_FOUND: - case HT_SEE_OTHER: - case HT_TEMP_REDIRECT: - return HT_OK; - default: - break; - } - - if (data->callback) - (* data->callback)(data->url, HTChunk_data(data->chunk), - HTChunk_size(data->chunk), status, data->user_data); - g_free(data->url); - HTChunk_delete(data->chunk); - g_free(data); - - /* schedule for the request to be deleted */ - g_idle_add((GSourceFunc)delete_request, request); - - return HT_OK; -} - -GWWWRequest * -glibwww_load_to_mem(const gchar *url, GWWWLoadToMemFunc callback, - gpointer user_data) -{ - HTRequest *request; - HTStream *writer; - HTChunk *chunk = NULL; - struct LoadToMemData *data; - - g_return_val_if_fail(url != NULL, NULL); - - request = HTRequest_new(); - writer = HTStreamToChunk(request, &chunk, 0); - HTRequest_setOutputFormat(request, WWW_SOURCE); - HTRequest_setOutputStream(request, writer); - HTRequest_setDebugStream(request, writer); - HTRequest_setAnchor(request, HTAnchor_findAddress(url)); - - data = g_new(struct LoadToMemData, 1); - data->url = g_strdup(url); - data->chunk = chunk; - data->callback = callback; - data->user_data = user_data; - HTRequest_addAfter(request, after_load_to_mem, NULL, data, - HT_ALL, HT_FILTER_LAST, FALSE); - - if (HTLoad(request, NO) == NO) { - HTChunk_delete(chunk); - HTRequest_delete(request); - return NULL; - } - return request; -} - -gboolean -glibwww_abort_request(GWWWRequest *request) -{ - g_return_val_if_fail(request != NULL, FALSE); - - return HTRequest_kill(request) == YES; -} - -void -glibwww_request_progress(GWWWRequest *request, glong *nread, glong *total) -{ - glong tot = HTAnchor_length(HTRequest_anchor(request)); - glong nr = -1; - - if (tot > 0) - nr = HTRequest_bodyRead(request); - else - nr = HTRequest_bytesRead(request); - - if (nread) - *nread = nr; - if (total) - *total = tot; -} diff --git a/components/html/glibwww.h b/components/html/glibwww.h deleted file mode 100644 index b4fb557e5..000000000 --- a/components/html/glibwww.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -#include <glib.h> - -#ifndef _GLIBWWW_H_ -#define _GLIBWWW_H_ - -/* Defined here so we don't have to include any libwww headers */ -typedef struct _HTRequest GWWWRequest; - -/* If status < 0, an error occured */ -typedef void (*GWWWLoadToFileFunc) (const gchar *url, const gchar *file, - int status, gpointer user_data); -typedef void (*GWWWLoadToMemFunc) (const gchar *url, const gchar *buffer, - int size, int status, gpointer user_data); - -/* Initialise enough of libwww for doing http/ftp downloads with - * authentication, redirection and proxy support. - */ -void glibwww_init (const gchar *appName, const gchar *appVersion); -void glibwww_cleanup (void); /* not necessary -- registered with g_atexit() */ - -typedef enum { - DLG_PROGRESS = 1<<0, - DLG_CONFIRM = 1<<1, - DLG_PROMPT = 1<<2, - DLG_AUTH = 1<<3 -} GLibWWWDialogType; -/* register the GUI dialogs for glibwww. This will take care of all the - * authentication and progress bar stuff for the application. */ -void glibwww_register_gnome_dialogs (GLibWWWDialogType type); - -/* Setup proxies as needed -- use the http://proxyhost:port/ notation */ -void glibwww_add_proxy (const gchar *protocol, const gchar *proxy); -void glibwww_add_noproxy (const gchar *host); - -/* Load a url to a file or to memory. The callback will be invoked - * exactly once. */ -GWWWRequest *glibwww_load_to_file (const gchar *url, const gchar *file, - GWWWLoadToFileFunc callback, - gpointer user_data); - -GWWWRequest *glibwww_load_to_mem (const gchar *url, - GWWWLoadToMemFunc callback, - gpointer user_data); - -/* Abort a currently running download */ -gboolean glibwww_abort_request(GWWWRequest *request); - -/* Get the progress of the currently running request. nread or total may - * return a negative result if it can't determine how far along things are. */ -void glibwww_request_progress (GWWWRequest *request, - glong *nread, glong *total); - - -/* This is called by glibwww_init, but may be useful if you only want to - * use the callbacks provided by glibwww for embedding libwww into the - * glib main loop */ -void glibwww_register_callbacks (void); - -#endif diff --git a/components/html/gnome-dialogs.c b/components/html/gnome-dialogs.c deleted file mode 100644 index cb9a26ea2..000000000 --- a/components/html/gnome-dialogs.c +++ /dev/null @@ -1,421 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -#include <WWWCore.h> -#include <WWWStream.h> -#include <WWWTrans.h> -#include <WWWHTTP.h> -#include <HTDialog.h> - -#undef PACKAGE -#undef VERSION -#undef _ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include "glibwww.h" - -#include <gnome.h> - -static const char * HTDialogs[HT_MSG_ELEMENTS] = { - HT_MSG_ENGLISH_INITIALIZER -}; -#if 0 -static HTErrorMessage HTErrors[HTERR_ELEMENTS] = { - HTERR_ENGLISH_INITIALIZER -}; -#endif - -typedef struct _ProgressInfo ProgressInfo; -struct _ProgressInfo { - HTRequest *req; - GtkBox *box; - GtkLabel *url; - GtkProgress *progress; -}; - -static GtkWidget *prog_win = NULL; -static GtkWidget *prog_box = NULL; -static GList *prog_info = NULL; - -static gint -hide_win(GtkWidget *win) -{ - gtk_widget_hide(win); - return TRUE; -} - -/* a simple routine to remove the progress meter from the screen when the - * request finishes */ -static int -hide_progress(HTRequest *request, HTResponse *response, - void *param, int status) -{ - GList *tmp; - - for (tmp = prog_info; tmp; tmp = tmp->next) { - ProgressInfo *info = tmp->data; - - if (info->req == request) { - /* this will destroy the widgets */ - gtk_container_remove(GTK_CONTAINER(prog_box), GTK_WIDGET(info->box)); - prog_info = g_list_remove(prog_info, info); - g_free(info); - if (prog_info == NULL) - gtk_widget_hide(prog_win); - return HT_OK; - } - } - return HT_OK; -} - -static ProgressInfo * -get_progress(HTRequest *req) -{ - GList *tmp; - ProgressInfo *info; - GtkWidget *box, *label, *progress; - char *uri; - - for (tmp = prog_info; tmp; tmp = tmp->next) { - info = tmp->data; - if (info->req == req) - return info; - } - - if (prog_win == NULL) { - prog_win = gtk_window_new(GTK_WINDOW_TOPLEVEL); - gtk_window_set_title(GTK_WINDOW(prog_win), _("Transfer Progress")); - gtk_window_set_wmclass(GTK_WINDOW(prog_win), "html_progress", "Nautilus"); - gtk_window_set_policy(GTK_WINDOW(prog_win), FALSE, FALSE, TRUE); - gtk_signal_connect(GTK_OBJECT(prog_win), "delete_event", - GTK_SIGNAL_FUNC(hide_win), NULL); - prog_box = gtk_vbox_new(FALSE, GNOME_PAD); - gtk_container_set_border_width(GTK_CONTAINER(prog_box), GNOME_PAD_SMALL); - gtk_container_add(GTK_CONTAINER(prog_win), prog_box); - gtk_widget_show(prog_box); - } - - info = g_new(ProgressInfo, 1); - prog_info = g_list_append(prog_info, info); - info->req = req; - - HTRequest_addAfter(req, hide_progress, NULL, NULL, - HT_ALL, HT_FILTER_LAST, FALSE); - - box = gtk_vbox_new(FALSE, GNOME_PAD_SMALL); - info->box = GTK_BOX(box); - - uri = HTAnchor_address((HTAnchor *)HTRequest_anchor(req)); - label = gtk_label_new(uri); - info->url = GTK_LABEL(label); - HT_FREE(uri); - gtk_box_pack_start(info->box, label, TRUE, TRUE, 0); - gtk_widget_show(label); - - progress = gtk_progress_bar_new(); - info->progress = GTK_PROGRESS(progress); - gtk_progress_set_show_text(info->progress, TRUE); - gtk_box_pack_start(info->box, progress, TRUE, TRUE, 0); - gtk_widget_show(progress); - - gtk_box_pack_start(GTK_BOX(prog_box), box, TRUE, TRUE, 0); - gtk_widget_show(box); - gtk_widget_show(prog_win); - - return info; -} - -static BOOL -glibwww_progress(HTRequest *request, HTAlertOpcode op, - int msgnum, const char *dfault, void *input, - HTAlertPar *reply) -{ - ProgressInfo *info; - gchar *text; - long cl; - - if (!request) - return NO; - info = get_progress(request); - switch (op) { - case HT_PROG_DNS: - text = g_strdup_printf(_("Looking up %s"), input?(char*)input:""); - gtk_progress_set_format_string(info->progress, text); - g_free(text); - gtk_progress_set_activity_mode(info->progress, TRUE); - break; - case HT_PROG_CONNECT: - text = g_strdup_printf(_("Contacting %s"), input?(char*)input:""); - gtk_progress_set_format_string(info->progress, text); - g_free(text); - gtk_progress_set_activity_mode(info->progress, TRUE); - break; - case HT_PROG_ACCEPT: - gtk_progress_set_format_string(info->progress, - _("Waiting for a connection...")); - gtk_progress_set_activity_mode(info->progress, TRUE); - break; - case HT_PROG_LOGIN: - gtk_progress_set_format_string(info->progress, _("Logging in...")); - gtk_progress_set_activity_mode(info->progress, TRUE); - break; - case HT_PROG_READ: - cl = HTAnchor_length(HTRequest_anchor(request)); - if (cl > 0) { - long b_read = HTRequest_bodyRead(request); - gfloat pcnt = (double)b_read/cl; - - text = g_strdup_printf(_("Read %d%%%% of %ld"), (int)pcnt, cl); - gtk_progress_set_format_string(info->progress, text); - g_free(text); - gtk_progress_set_activity_mode(info->progress, FALSE); - gtk_progress_set_percentage(info->progress, pcnt); - } else { - long b_read = HTRequest_bytesRead(request); - int *raw_read = input ? (int *)input : NULL; - - if (b_read > 0) - text = g_strdup_printf(_("Read %ld bytes"), b_read); - else if (raw_read && *raw_read > 0) - text = g_strdup_printf(_("Read %d bytes"), *raw_read); - else - text = g_strdup(_("Reading...")); - gtk_progress_set_format_string(info->progress, text); - g_free(text); - gtk_progress_set_activity_mode(info->progress, TRUE); - } - break; - case HT_PROG_WRITE: - if (HTMethod_hasEntity(HTRequest_method(request))) { - HTParentAnchor *anchor = HTRequest_anchor(HTRequest_source(request)); - - cl = HTAnchor_length(anchor); - if (cl > 0) { - long b_write = HTRequest_bodyWritten(request); - gfloat pcnt = (double)b_write/cl; - - text = g_strdup_printf(_("Writing %d%%%% of %ld"), (int)pcnt, cl); - gtk_progress_set_format_string(info->progress, text); - g_free(text); - gtk_progress_set_activity_mode(info->progress, FALSE); - gtk_progress_set_percentage(info->progress, pcnt); - } else { - long b_write = HTRequest_bytesWritten(request); - int *raw_write = input ? (int *)input : NULL; - - if (b_write > 0) - text = g_strdup_printf(_("Writing %ld bytes"), b_write); - else if (raw_write && *raw_write > 0) - text = g_strdup_printf(_("Writing %d bytes"), *raw_write); - else - text = g_strdup(_("Writing...")); - gtk_progress_set_format_string(info->progress, text); - g_free(text); - gtk_progress_set_activity_mode(info->progress, TRUE); - } - } - break; - case HT_PROG_DONE: - gtk_progress_set_format_string(info->progress, _("Done!")); - gtk_progress_set_activity_mode(info->progress, TRUE); - break; - case HT_PROG_INTERRUPT: - gtk_progress_set_format_string(info->progress, _("Interrupted!")); - gtk_progress_set_activity_mode(info->progress, TRUE); - break; - case HT_PROG_OTHER: - gtk_progress_set_format_string(info->progress, _("Please wait...")); - gtk_progress_set_activity_mode(info->progress, TRUE); - break; - case HT_PROG_TIMEOUT: - gtk_progress_set_format_string(info->progress, _("Request timeout!")); - gtk_progress_set_activity_mode(info->progress, TRUE); - break; - default: - gtk_progress_set_format_string(info->progress, _("Unknown")); - gtk_progress_set_activity_mode(info->progress, TRUE); - break; - } - return YES; -} - -static BOOL -glibwww_confirm(HTRequest *request, HTAlertOpcode op, - int msgnum, const char *dfault, void *input, - HTAlertPar *reply) -{ - GtkWidget *dlg = gnome_message_box_new(HTDialogs[msgnum], - GNOME_MESSAGE_BOX_QUESTION, - GNOME_STOCK_BUTTON_YES, - GNOME_STOCK_BUTTON_NO, - NULL); - gint button; - - gnome_dialog_set_default(GNOME_DIALOG(dlg), 0); - gnome_dialog_close_hides(GNOME_DIALOG(dlg), FALSE); - gnome_dialog_set_close(GNOME_DIALOG(dlg), TRUE); - - button = gnome_dialog_run_and_close(GNOME_DIALOG(dlg)); - return button == 0; -} - -static BOOL -glibwww_prompt(HTRequest *request, HTAlertOpcode op, - int msgnum, const char *dfault, void *input, - HTAlertPar *reply) -{ - GtkWidget *dlg; - GtkWidget *label; - GtkWidget *entry; - gint button; - - if (msgnum == HT_MSG_FILENAME) { - if (dfault) - HTAlert_setReplyMessage(reply, dfault); - return YES; - } - - dlg = gnome_dialog_new(_("Enter Text"), GNOME_STOCK_BUTTON_OK, NULL); - gtk_window_set_wmclass(GTK_WINDOW(dlg), "html_prompt", "Nautilus"); - if (input) { - gchar *tmp = g_strconcat(HTDialogs[msgnum], " (", - (char *)input, ")", NULL); - label = gtk_label_new(tmp); - g_free(tmp); - } else - label = gtk_label_new(HTDialogs[msgnum]); - entry = gtk_entry_new(); - if (dfault) - gtk_entry_set_text(GTK_ENTRY(entry), dfault); - gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dlg)->vbox), label, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dlg)->vbox), entry, TRUE, TRUE, 0); - gtk_widget_show(label); - gtk_widget_show(entry); - - gnome_dialog_set_default(GNOME_DIALOG(dlg), 0); - gnome_dialog_close_hides(GNOME_DIALOG(dlg), TRUE); - gnome_dialog_set_close(GNOME_DIALOG(dlg), TRUE); - gnome_dialog_editable_enters(GNOME_DIALOG(dlg), GTK_EDITABLE(entry)); - - button = gnome_dialog_run_and_close(GNOME_DIALOG(dlg)); - if (button == 0) { - HTAlert_setReplyMessage(reply, gtk_entry_get_text(GTK_ENTRY(entry))); - gtk_widget_unref(dlg); - return YES; - } - gtk_widget_unref(dlg); - return NO; -} - -static BOOL -glibwww_prompt_password(HTRequest *request, HTAlertOpcode op, - int msgnum, const char *dfault, - void *input, HTAlertPar *reply) -{ - GtkWidget *dlg; - GtkWidget *label; - GtkWidget *entry; - gint button; - - dlg = gnome_dialog_new(_("Enter Password"), GNOME_STOCK_BUTTON_OK, NULL); - gtk_window_set_wmclass(GTK_WINDOW(dlg), "html_prompt", "Nautilus"); - if (input) { - gchar *tmp = g_strconcat(HTDialogs[msgnum], " (", - (char *)input, ")", NULL); - label = gtk_label_new(tmp); - g_free(tmp); - } else - label = gtk_label_new(HTDialogs[msgnum]); - entry = gtk_entry_new(); - gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); - gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dlg)->vbox), label, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dlg)->vbox), entry, TRUE, TRUE, 0); - gtk_widget_show(label); - gtk_widget_show(entry); - - gnome_dialog_set_default(GNOME_DIALOG(dlg), 0); - gnome_dialog_close_hides(GNOME_DIALOG(dlg), TRUE); - gnome_dialog_set_close(GNOME_DIALOG(dlg), TRUE); - gnome_dialog_editable_enters(GNOME_DIALOG(dlg), GTK_EDITABLE(entry)); - - button = gnome_dialog_run_and_close(GNOME_DIALOG(dlg)); - if (button == 0) { - HTAlert_setReplySecret(reply, gtk_entry_get_text(GTK_ENTRY(entry))); - gtk_widget_unref(dlg); - return YES; - } - gtk_widget_unref(dlg); - return NO; -} - -static BOOL -glibwww_prompt_username_and_password(HTRequest *request, HTAlertOpcode op, - int msgnum, const char *dfault, - void *input, HTAlertPar *reply) -{ - GtkWidget *dlg; - GtkWidget *label; - GtkWidget *entry1; - GtkWidget *entry2; - gint button; - - dlg = gnome_dialog_new(_("Enter Password"), GNOME_STOCK_BUTTON_OK, - GNOME_STOCK_BUTTON_CANCEL, NULL); - gtk_window_set_wmclass(GTK_WINDOW(dlg), "html_prompt", "Nautilus"); - if (input) { - gchar *tmp = g_strconcat(HTDialogs[msgnum], " (", - (char *)input, ")", NULL); - label = gtk_label_new(tmp); - g_free(tmp); - } else - label = gtk_label_new(HTDialogs[msgnum]); - entry1 = gtk_entry_new(); - if (dfault) - gtk_entry_set_text(GTK_ENTRY(entry1), dfault); - entry2 = gtk_entry_new(); - gtk_entry_set_visibility(GTK_ENTRY(entry2), FALSE); - gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dlg)->vbox), label, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dlg)->vbox), entry1, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(GNOME_DIALOG(dlg)->vbox), entry2, TRUE, TRUE, 0); - gtk_widget_show(label); - gtk_widget_show(entry1); - gtk_widget_show(entry2); - - gnome_dialog_set_default(GNOME_DIALOG(dlg), 0); - gnome_dialog_close_hides(GNOME_DIALOG(dlg), TRUE); - gnome_dialog_set_close(GNOME_DIALOG(dlg), TRUE); - /* enter on first entry moves focus to second one */ - gtk_signal_connect_object(GTK_OBJECT(entry1), "activate", - GTK_SIGNAL_FUNC(gtk_widget_grab_focus), - GTK_OBJECT(entry2)); - gnome_dialog_editable_enters(GNOME_DIALOG(dlg), GTK_EDITABLE(entry2)); - - button = gnome_dialog_run_and_close(GNOME_DIALOG(dlg)); - if (button == 0) { - HTAlert_setReplyMessage(reply, gtk_entry_get_text(GTK_ENTRY(entry1))); - HTAlert_setReplySecret(reply, gtk_entry_get_text(GTK_ENTRY(entry2))); - gtk_widget_unref(dlg); - return YES; - } - gtk_widget_unref(dlg); - return NO; -} - -void -glibwww_register_gnome_dialogs(GLibWWWDialogType type) -{ - if(type & DLG_PROGRESS) - HTAlert_add(glibwww_progress, HT_A_PROGRESS); - /* HTAlert_add(glibwww_message, HT_A_MESSAGE); - */ - if(type & DLG_CONFIRM) - HTAlert_add(glibwww_confirm, HT_A_CONFIRM); - if(type & DLG_PROMPT) - HTAlert_add(glibwww_prompt, HT_A_PROMPT); - if(type & DLG_AUTH) { - HTAlert_add(glibwww_prompt_password, HT_A_SECRET); - HTAlert_add(glibwww_prompt_username_and_password, HT_A_USER_PW); - } - - HTAlert_setInteractive(YES); -} diff --git a/components/html/ntl-html-component.gnorba b/components/html/ntl-html-component.gnorba deleted file mode 100644 index 016849c5d..000000000 --- a/components/html/ntl-html-component.gnorba +++ /dev/null @@ -1,11 +0,0 @@ -[embeddable-factory:explorer-html-component] -type=exe -repo_id=IDL:GNOME/EmbeddableFactory:1.0 IDL:GNOME/GenericFactory:1.0 -description=Explorer HTML component's embeddable factory -location_info=explorer-html-component - -[embeddable:explorer-html-component] -type=factory -repo_id=IDL:BonoboObject/explorer-html-component:1.0 IDL:GNOME/Embeddable:1.0 -description=Explorer HTML component -location_info=embeddable-factory:explorer-html-component diff --git a/components/html/ntl-web-browser.c b/components/html/ntl-web-browser.c deleted file mode 100644 index 1f1d14f5d..000000000 --- a/components/html/ntl-web-browser.c +++ /dev/null @@ -1,646 +0,0 @@ -#include <WWWCore.h> -#include <WWWStream.h> -#include <WWWTrans.h> -#include <WWWHTTP.h> -#include <WWWMIME.h> -#include <WWWFTP.h> -#include <WWWFile.h> -#include <WWWGophe.h> -#include <WWWZip.h> - -/* clean up the cpp namespace -- libwww is particularly dirty */ -#undef PACKAGE -#undef VERSION -#undef _ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "glibwww.h" -#ifdef HAVE_ALLOCA_H -#include <alloca.h> -#endif -#include <gnome.h> -#include <libnautilus/libnautilus.h> -#include <gtkhtml/gtkhtml.h> -#include <liboaf/liboaf.h> -#include <libgnomevfs/gnome-vfs.h> -#include <libnautilus-extensions/nautilus-debug.h> -/*Include the GConf main header. */ -#include <gconf/gconf.h> - -typedef struct { - NautilusView *nautilus_view; - GtkWidget *htmlw; - char *base_url, *base_target_url; - - int prevsel; - - HTMethod method; - char *post_data; -} BrowserInfo; - -typedef struct { - GtkHTMLStream *sh; - BrowserInfo *bi; - char *url; - HTStream *stream; -} VFSHandle; - -static void do_vfs_load(VFSHandle *handle); - -static char * -canonicalize_url (const char *in_url, const char *base_url) -{ - char *ctmp, *ctmp2, *retval, *removebegin, *removeend, *curpos; - gboolean trailing_slash = FALSE; - - g_return_val_if_fail(in_url, NULL); - - if(base_url && base_url[strlen(base_url)-1] == '/') - trailing_slash = TRUE; - - ctmp = strstr(in_url, "://"); - if(ctmp) - { - retval = g_strdup(in_url); - goto out; - } - else if(*in_url == '/') - { - int inc = 0; - - if(trailing_slash) - inc++; - - ctmp = base_url?strstr(base_url, "://"):NULL; - if(!ctmp) - { - retval = g_strconcat("file://", in_url, NULL); - goto out; - } - - ctmp2 = strchr(ctmp + 3, '/'); - - retval = g_strconcat(base_url, in_url+inc, NULL); - goto out; - } - - /* XXX TODO - We should really do processing of .. and . in URLs */ - - ctmp = base_url?strstr(base_url, "://"):NULL; - if(!ctmp) - { - char *cwd; - - if(in_url) - { - ctmp = strchr(in_url, ':'); - if(ctmp) /* OK, it's some funky URL scheme without any /'s */ - return g_strdup(in_url); - } - - cwd = g_get_current_dir(); - ctmp = g_strconcat("file://", cwd, "/", in_url, NULL); - g_free(cwd); - - retval = ctmp; - goto out; - } - - retval = g_strconcat(base_url, "/", in_url, NULL); - - out: - /* Now fix up the /. and /.. pieces */ - - ctmp = strstr(retval, "://"); - if(!ctmp) - return retval; - - ctmp += 3; - ctmp = strchr(ctmp, '/'); - if(!ctmp) { - ctmp = retval; - retval = g_strconcat(retval, trailing_slash?"":"/", NULL); - g_free(ctmp); - return retval; - } - - removebegin = removeend = NULL; - do { - if(removebegin && removeend) - { - memmove(removebegin, removeend, strlen(removeend) + 1); - removebegin = removeend = NULL; - } - curpos = ctmp; - - redo: - ctmp2 = strstr(curpos, "/."); - if(!ctmp2) - break; - - if(*(ctmp2 + 2) == '.') /* We have to skip over stuff like /...blahblah or /.foo */ - { - if(*(ctmp2 + 3) != '/' - && *(ctmp2 + 3) != '\0') - { - curpos = ctmp2 + 3; - goto redo; - } - } - else if(*(ctmp2 + 2) != '/' && *(ctmp2 + 2) != '\0') - { - curpos = ctmp2 + 2; - goto redo; - } - - switch(*(ctmp2+2)) - { - case '/': - case '\0': - removebegin = ctmp2; - removeend = ctmp2 + 2; - break; - case '.': - removeend = ctmp2 + 3; - ctmp2--; - while((ctmp2 >= ctmp) && *ctmp2 != '/') - ctmp2--; - if(*ctmp2 == '/') - removebegin = ctmp2; - break; - } - - } while(removebegin); - - return retval; -} - -static void -browser_url_load_done(GtkWidget *htmlw, BrowserInfo *bi) -{ - nautilus_view_report_load_complete(bi->nautilus_view); -} - -struct _HTStream { - const HTStreamClass * isa; - BrowserInfo *bi; - GtkHTMLStream *handle; -}; - -static int netin_stream_write (HTStream * me, const char * s, int l) -{ - gtk_html_write(GTK_HTML(me->bi->htmlw), me->handle, s, l); - - return HT_OK; -} - -static int netin_stream_put_character (HTStream * me, char c) -{ - return netin_stream_write(me, &c, 1); -} - -static int netin_stream_put_string (HTStream * me, const char * s) -{ - return netin_stream_write(me, s, strlen(s)); -} - -static int netin_stream_flush (HTStream * me) -{ - return HT_OK; -} - -static int netin_stream_free (HTStream * me) -{ - if(me->handle) - gtk_html_end(GTK_HTML(me->bi->htmlw), me->handle, GTK_HTML_STREAM_OK); - g_free(me); - - return HT_OK; -} - -static int netin_stream_abort (HTStream * me, HTList * e) -{ - if(me->handle) - gtk_html_end(GTK_HTML(me->bi->htmlw), me->handle, GTK_HTML_STREAM_ERROR); - g_free(me); - - return HT_OK; -} - -static const HTStreamClass netin_stream_class = -{ - "netin_stream", - netin_stream_flush, - netin_stream_free, - netin_stream_abort, - netin_stream_put_character, - netin_stream_put_string, - netin_stream_write -}; - -static HTStream * -netin_stream_new (BrowserInfo *bi, GtkHTMLStream *handle) -{ - HTStream *retval; - - retval = g_new0(HTStream, 1); - - retval->isa = &netin_stream_class; - retval->bi = bi; - retval->handle = handle; - - return retval; -} - -static gboolean -do_request_delete(gpointer req) -{ - HTRequest_delete(req); - - return FALSE; -} - -static int -request_terminator (HTRequest * request, HTResponse * response, void * param, int status) -{ - gpointer d; - VFSHandle *vfsh; - - d = HTRequest_context(request); - g_return_val_if_fail(d, HT_OK); - vfsh = d; - - if (status < 0) - { - g_print("Load couldn't be completed successfully (%p)\n", request); - vfsh->stream->handle = NULL; - vfsh->stream = NULL; - do_vfs_load(vfsh); - } - else - { - g_free(vfsh->url); - g_free(vfsh); - } - - HTRequest_setContext(request, NULL); - g_idle_add(do_request_delete, request); - - return HT_OK; -} - -static int -browser_do_post(HTRequest *request, HTStream *stream) -{ - VFSHandle *vfsh = HTRequest_context(request); - int status; - - g_assert(vfsh); - - status = (*stream->isa->put_block)(stream, vfsh->bi->post_data, strlen(vfsh->bi->post_data)); - - g_message("browser_do_post got status %d", status); - - switch(status) - { - case HT_LOADED: - case HT_OK: - g_free(vfsh->bi->post_data); vfsh->bi->post_data = NULL; - (*stream->isa->flush)(stream); - default: - return status; - break; - } -} - -static char vfs_read_buf[40960]; - -static void -browser_vfs_read_callback (GnomeVFSAsyncHandle *h, GnomeVFSResult res, gpointer buffer, - GnomeVFSFileSize bytes_requested, - GnomeVFSFileSize bytes_read, - gpointer data) -{ - VFSHandle *vfsh = data; - - g_message("browser_vfs_read_callback: %ld/%ld bytes", (long) bytes_read, (long) bytes_requested); - if(bytes_read != 0) - { - gtk_html_write(GTK_HTML(vfsh->bi->htmlw), vfsh->sh, buffer, bytes_read); - } - - if(bytes_read == 0 || res != GNOME_VFS_OK) - { - gtk_html_end(GTK_HTML(vfsh->bi->htmlw), vfsh->sh, GTK_HTML_STREAM_OK); - gnome_vfs_async_close(h, (GnomeVFSAsyncCloseCallback)gtk_true, NULL); - g_free(vfsh); - return; - } - - gnome_vfs_async_read(h, vfs_read_buf, sizeof(vfs_read_buf), browser_vfs_read_callback, data); -} - -static void -browser_vfs_callback(GnomeVFSAsyncHandle *h, GnomeVFSResult res, gpointer data) -{ - VFSHandle *vfsh = data; - - g_message("browser_vfs_callback, res was %s", gnome_vfs_result_to_string(res)); - - if(res != GNOME_VFS_OK) - { - nautilus_view_report_load_failed(vfsh->bi->nautilus_view); - gtk_html_end(GTK_HTML(vfsh->bi->htmlw), vfsh->sh, GTK_HTML_STREAM_ERROR); - g_free(vfsh); - } - else - { - gnome_vfs_async_read(h, vfs_read_buf, sizeof(vfs_read_buf), browser_vfs_read_callback, vfsh); - } -} - -static void -do_vfs_load(VFSHandle *vfsh) -{ - GnomeVFSAsyncHandle *ah; - - g_warning("Falling back to gnome-vfs for %s", vfsh->url); - - gnome_vfs_async_open(&ah, vfsh->url, GNOME_VFS_OPEN_READ, browser_vfs_callback, vfsh); -} - -static void -browser_url_requested(GtkWidget *htmlw, const char *url, GtkHTMLStream *handle, BrowserInfo *bi) -{ - char *real_url; - HTRequest *request; - HTStream *writer; - HTAnchor *anchor; - VFSHandle *vfsh; - - real_url = canonicalize_url(url, bi->base_url); - - vfsh = g_new0(VFSHandle, 1); - vfsh->sh = handle; - vfsh->bi = bi; - vfsh->url = real_url; - - anchor = HTAnchor_findAddress(real_url); - if(!anchor) - { - do_vfs_load(vfsh); - return; - } - - request = HTRequest_new(); - HTRequest_setContext(request, vfsh); - writer = netin_stream_new(bi, handle); - vfsh->stream = writer; - HTRequest_setOutputFormat(request, WWW_SOURCE); - HTRequest_setOutputStream(request, writer); - if(bi->method == METHOD_POST) - HTRequest_setPostCallback(request, browser_do_post); - HTRequest_setAnchor(request, anchor); - HTRequest_setMethod(request, bi->method); - bi->method = METHOD_GET; - - if(HTLoad(request, NO) == NO) - { - g_warning("Load failed"); - do_vfs_load(vfsh); - writer->handle = NULL; - HTRequest_delete(request); - } -} - -static void -browser_set_base(GtkWidget *htmlw, const char *base_url, BrowserInfo *bi) -{ - if(bi->base_url) - g_free(bi->base_url); - bi->base_url = g_strdup(base_url); -} - -static void -browser_set_base_target(GtkWidget *htmlw, const char *base_target_url, BrowserInfo *bi) -{ - if(bi->base_target_url) - g_free(bi->base_target_url); - bi->base_target_url = g_strdup(base_target_url); -} - -static void -browser_goto_url_real(GtkWidget *htmlw, const char *url, BrowserInfo *bi) -{ - GtkHTMLStream *stream; - - HTNet_killAll(); - g_free(bi->base_url); - g_free(bi->base_target_url); - - if(url[strlen(url) - 1] == '/') - { - bi->base_url = g_strdup(url); - bi->base_target_url = g_strdup(url); - } - else - { - bi->base_url = g_dirname(url); - bi->base_target_url = g_dirname(url); - } - - stream = gtk_html_begin(GTK_HTML(bi->htmlw)); - - browser_url_requested(bi->htmlw, url, stream, bi); - - nautilus_view_report_load_underway(bi->nautilus_view); -} - -static void -browser_goto_url(GtkWidget *htmlw, const char *url, BrowserInfo *bi) -{ - char *real_url; - - real_url = canonicalize_url(url, bi->base_target_url); - - g_return_if_fail(real_url); - - nautilus_view_report_location_change(bi->nautilus_view, real_url); - browser_goto_url_real(htmlw, real_url, bi); - g_free(real_url); -} - -static void -browser_select_url(GtkWidget *htmlw, const char *url, BrowserInfo *bi) -{ - GList *list; - GList simple_list; - char *real_url; - - list = NULL; - real_url = NULL; - if(url && !bi->prevsel) - { - real_url = canonicalize_url(url, bi->base_target_url); - simple_list.data = real_url; - simple_list.next = NULL; - simple_list.prev = NULL; - list = &simple_list; - } - - nautilus_view_report_selection_change(bi->nautilus_view, list); - if (real_url != NULL) - nautilus_view_report_status(bi->nautilus_view, real_url); - g_free(real_url); - bi->prevsel = url?1:0; -} - -static void -browser_title_changed(GtkWidget *htmlw, const char *new_title, BrowserInfo *bi) -{ - nautilus_view_set_title(bi->nautilus_view, new_title); -} - -static void -browser_submit(GtkWidget *htmlw, const char *method, const char *url, const char *encoding, BrowserInfo *bi) -{ - g_free(bi->post_data); bi->post_data = NULL; - - if(!g_strcasecmp(method, "POST")) - { - char **pieces = g_strsplit(encoding, "&", -1); - - if(pieces) - { - char *ctmp; - ctmp = g_strjoinv("\r\n", pieces); - bi->post_data = g_strconcat(ctmp, "\r\n", NULL); - g_free(ctmp); - g_strfreev(pieces); - bi->method = METHOD_POST; - } - - browser_goto_url(htmlw, url, bi); - } - else - { - char tmp_url[4096]; - - g_snprintf(tmp_url, sizeof(tmp_url), "%s?%s", url, encoding); - browser_goto_url(htmlw, tmp_url, bi); - } -} - -static void -browser_load_location(NautilusView *nautilus_view, - const char *location, - BrowserInfo *bi) -{ - browser_goto_url_real(NULL, location, bi); -} - -static int object_count = 0; - -static void -browser_do_destroy(GtkObject *obj) -{ - object_count--; - if(object_count <= 0) - gtk_main_quit(); -} - -static BonoboObject * -make_obj(BonoboGenericFactory *Factory, const char *goad_id, void *closure) -{ - BrowserInfo *bi; - GtkWidget *wtmp; - - if(strcmp(goad_id, "OAFIID:ntl_web_browser:0ce1a736-c939-4ac7-b12c-19d72bf1510b")) - return NULL; - - bi = g_new0(BrowserInfo, 1); - - bi->htmlw = gtk_html_new(); - gtk_signal_connect(GTK_OBJECT(bi->htmlw), "link_clicked", browser_goto_url, bi); - gtk_signal_connect(GTK_OBJECT(bi->htmlw), "set_base", browser_set_base, bi); - gtk_signal_connect(GTK_OBJECT(bi->htmlw), "load_done", browser_url_load_done, bi); - gtk_signal_connect(GTK_OBJECT(bi->htmlw), "set_base", browser_set_base, bi); - gtk_signal_connect(GTK_OBJECT(bi->htmlw), "set_base_target", browser_set_base_target, bi); - gtk_signal_connect(GTK_OBJECT(bi->htmlw), "url_requested", browser_url_requested, bi); - gtk_signal_connect(GTK_OBJECT(bi->htmlw), "on_url", browser_select_url, bi); - gtk_signal_connect(GTK_OBJECT(bi->htmlw), "submit", browser_submit, bi); - gtk_signal_connect(GTK_OBJECT(bi->htmlw), "title_changed", browser_title_changed, bi); - - wtmp = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(wtmp), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(wtmp), bi->htmlw); - gtk_widget_show(bi->htmlw); - gtk_widget_show(wtmp); - - bi->nautilus_view = nautilus_view_new (wtmp); - - gtk_signal_connect(GTK_OBJECT(bi->nautilus_view), "load_location", - browser_load_location, bi); - object_count++; - gtk_signal_connect(GTK_OBJECT(bi->nautilus_view), "destroy", - browser_do_destroy, NULL); - - return BONOBO_OBJECT (bi->nautilus_view); -} - -int main(int argc, char *argv[]) -{ - BonoboGenericFactory *factory; - CORBA_ORB orb; - GConfError *error = NULL; - char *registration_id; - - if (g_getenv ("NAUTILUS_DEBUG") != NULL) - nautilus_make_warnings_and_criticals_stop_in_debugger - (G_LOG_DOMAIN, g_log_domain_glib, "Gdk", "Gtk", "GnomeVFS", "GnomeUI", "Bonobo", - "Nautilus-HTML", "gtkhtml", NULL); - - - /* Initialize gettext support */ -#ifdef ENABLE_NLS /* sadly we need this ifdef because otherwise the following get empty statement warnings */ - bindtextdomain (PACKAGE, GNOMELOCALEDIR); - textdomain (PACKAGE); -#endif - - gnome_init_with_popt_table ("ntl-web-browser", _VERSION, - argc, argv, - oaf_popt_options, 0, NULL); - - orb = oaf_init (argc, argv); - /* Init the GConf library.*/ - gconf_init (argc, argv, &error); - if (error != NULL) { - g_warning (_("GConf init failed:\n %s"), error->str); - gconf_error_destroy (error); - error = NULL; - } - - gnome_vfs_init(); - gdk_rgb_init(); - glibwww_init("ntl-web-browser", _VERSION); - HTNet_addAfter(request_terminator, NULL, NULL, HT_ALL, HT_FILTER_LAST); - bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL); - - registration_id = oaf_make_registration_id ("OAFIID:ntl_web_browser_factory:e553fd3e-101d-445d-ae53-a3a59e77fcc9", getenv ("DISPLAY")); - factory = bonobo_generic_factory_new_multi (registration_id, - make_obj, - NULL); - g_free (registration_id); - - - - do { - bonobo_main (); - } while (object_count > 0); - - gnome_vfs_shutdown (); - return 0; -} diff --git a/components/html/ntl-web-browser.oafinfo b/components/html/ntl-web-browser.oafinfo deleted file mode 100644 index f974586d9..000000000 --- a/components/html/ntl-web-browser.oafinfo +++ /dev/null @@ -1,27 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:ntl_web_browser_factory:e553fd3e-101d-445d-ae53-a3a59e77fcc9" type="exe" location="ntl-web-browser"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Nautilus GtkHTML component factory"/> -<oaf_attribute name="description" type="string" value="HTML component's factory"/> -</oaf_server> - -<oaf_server iid="OAFIID:ntl_web_browser:0ce1a736-c939-4ac7-b12c-19d72bf1510b" type="factory" location="OAFIID:ntl_web_browser_factory:e553fd3e-101d-445d-ae53-a3a59e77fcc9"> -<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="Nautilus GtkHTML component"/> -<oaf_attribute name="description" type="string" value="Web browser component"/> -<oaf_attribute name="bonobo:editable" type="boolean" value="false"/> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="text/html"/> -<item value="x-directory/webdav"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Web Page (GtkHTML)"/> -</oaf_server> - -</oaf_info> diff --git a/components/image-viewer/.cvsignore b/components/image-viewer/.cvsignore index 6a2fd5cbb..7a424f2c1 100644 --- a/components/image-viewer/.cvsignore +++ b/components/image-viewer/.cvsignore @@ -3,3 +3,4 @@ Makefile Makefile.in nautilus-image-view +Nautilus_View_image.oaf diff --git a/components/image-viewer/Makefile.am b/components/image-viewer/Makefile.am index 82c586ac4..2f341c703 100644 --- a/components/image-viewer/Makefile.am +++ b/components/image-viewer/Makefile.am @@ -1,3 +1,5 @@ +NULL = + PRINT_LIBS = -lbonobo-print OBJECT_DIRECTORY_LIBS = $(GNOME_LIBS) $(OAF_LIBS) @@ -26,7 +28,15 @@ nautilus_image_view_LDADD = \ $(GCONF_LIBS) \ $(GNOMEUI_LIBS) + oafdir = $(datadir)/oaf -oaf_DATA = nautilus-image-view.oafinfo -EXTRA_DIST = $(oaf_DATA) +oaf_in_files = \ + Nautilus_View_image.oaf.in \ + $(NULL) + +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + +EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) diff --git a/components/image-viewer/Nautilus_View_image.oaf.in b/components/image-viewer/Nautilus_View_image.oaf.in index 3f111371e..57ab3a87a 100644 --- a/components/image-viewer/Nautilus_View_image.oaf.in +++ b/components/image-viewer/Nautilus_View_image.oaf.in @@ -1,41 +1,41 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_image_view_factory:61ea9ab1-e4b4-4da8-8f54-61cf6f33c4f6" type="exe" location="nautilus-image-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus Image viewer factory"/> -<oaf_attribute name="description" type="string" value="Generic image control factory"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus Image viewer factory"/> + <oaf_attribute name="description" type="string" _value="Generic image control factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus-image-viewer:30686633-23d5-422b-83c6-4f1b06f8abcd" type="factory" location="OAFIID:nautilus_image_view_factory:61ea9ab1-e4b4-4da8-8f54-61cf6f33c4f6"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:Bonobo/Control:1.0"/> -<item value="IDL:Bonobo/Unknown:1.0"/> -<item value="IDL:Bonobo/PersistStream:1.0"/> -<item value="IDL:Bonobo/Persist:1.0"/> -<item value="IDL:Nautilus/View:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus Image Viewer"/> -<oaf_attribute name="description" type="string" value="Generic Image Viewer"/> -<oaf_attribute name="bonobo:editable" type="boolean" value="false"/> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="image/gif"/> -<item value="image/jpeg"/> -<item value="image/png"/> -<item value="image/tiff"/> -<item value="image/x-bmp"/> -<item value="image/x-cmu-raster"/> -<item value="image/x-ico"/> -<item value="image/x-png"/> -<item value="image/x-portable-anymap"/> -<item value="image/x-portable-bitmap"/> -<item value="image/x-portable-graymap"/> -<item value="image/x-portable-pixmap"/> -<item value="image/x-xpixmap"/> -<item value="image/xpm"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Image"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:Bonobo/Control:1.0"/> + <item value="IDL:Bonobo/Unknown:1.0"/> + <item value="IDL:Bonobo/PersistStream:1.0"/> + <item value="IDL:Bonobo/Persist:1.0"/> + <item value="IDL:Nautilus/View:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus Image Viewer"/> + <oaf_attribute name="description" type="string" _value="Generic Image Viewer"/> + <oaf_attribute name="bonobo:editable" type="boolean" value="false"/> + <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> + <item value="image/gif"/> + <item value="image/jpeg"/> + <item value="image/png"/> + <item value="image/tiff"/> + <item value="image/x-bmp"/> + <item value="image/x-cmu-raster"/> + <item value="image/x-ico"/> + <item value="image/x-png"/> + <item value="image/x-portable-anymap"/> + <item value="image/x-portable-bitmap"/> + <item value="image/x-portable-graymap"/> + <item value="image/x-portable-pixmap"/> + <item value="image/x-xpixmap"/> + <item value="image/xpm"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Image"/> </oaf_server> </oaf_info> diff --git a/components/image-viewer/Nautilus_View_image.server.in b/components/image-viewer/Nautilus_View_image.server.in index 3f111371e..57ab3a87a 100644 --- a/components/image-viewer/Nautilus_View_image.server.in +++ b/components/image-viewer/Nautilus_View_image.server.in @@ -1,41 +1,41 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_image_view_factory:61ea9ab1-e4b4-4da8-8f54-61cf6f33c4f6" type="exe" location="nautilus-image-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus Image viewer factory"/> -<oaf_attribute name="description" type="string" value="Generic image control factory"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus Image viewer factory"/> + <oaf_attribute name="description" type="string" _value="Generic image control factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus-image-viewer:30686633-23d5-422b-83c6-4f1b06f8abcd" type="factory" location="OAFIID:nautilus_image_view_factory:61ea9ab1-e4b4-4da8-8f54-61cf6f33c4f6"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:Bonobo/Control:1.0"/> -<item value="IDL:Bonobo/Unknown:1.0"/> -<item value="IDL:Bonobo/PersistStream:1.0"/> -<item value="IDL:Bonobo/Persist:1.0"/> -<item value="IDL:Nautilus/View:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus Image Viewer"/> -<oaf_attribute name="description" type="string" value="Generic Image Viewer"/> -<oaf_attribute name="bonobo:editable" type="boolean" value="false"/> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="image/gif"/> -<item value="image/jpeg"/> -<item value="image/png"/> -<item value="image/tiff"/> -<item value="image/x-bmp"/> -<item value="image/x-cmu-raster"/> -<item value="image/x-ico"/> -<item value="image/x-png"/> -<item value="image/x-portable-anymap"/> -<item value="image/x-portable-bitmap"/> -<item value="image/x-portable-graymap"/> -<item value="image/x-portable-pixmap"/> -<item value="image/x-xpixmap"/> -<item value="image/xpm"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Image"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:Bonobo/Control:1.0"/> + <item value="IDL:Bonobo/Unknown:1.0"/> + <item value="IDL:Bonobo/PersistStream:1.0"/> + <item value="IDL:Bonobo/Persist:1.0"/> + <item value="IDL:Nautilus/View:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus Image Viewer"/> + <oaf_attribute name="description" type="string" _value="Generic Image Viewer"/> + <oaf_attribute name="bonobo:editable" type="boolean" value="false"/> + <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> + <item value="image/gif"/> + <item value="image/jpeg"/> + <item value="image/png"/> + <item value="image/tiff"/> + <item value="image/x-bmp"/> + <item value="image/x-cmu-raster"/> + <item value="image/x-ico"/> + <item value="image/x-png"/> + <item value="image/x-portable-anymap"/> + <item value="image/x-portable-bitmap"/> + <item value="image/x-portable-graymap"/> + <item value="image/x-portable-pixmap"/> + <item value="image/x-xpixmap"/> + <item value="image/xpm"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Image"/> </oaf_server> </oaf_info> diff --git a/components/image-viewer/nautilus-image-view.oafinfo b/components/image-viewer/nautilus-image-view.oafinfo deleted file mode 100644 index 3f111371e..000000000 --- a/components/image-viewer/nautilus-image-view.oafinfo +++ /dev/null @@ -1,41 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_image_view_factory:61ea9ab1-e4b4-4da8-8f54-61cf6f33c4f6" type="exe" location="nautilus-image-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus Image viewer factory"/> -<oaf_attribute name="description" type="string" value="Generic image control factory"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus-image-viewer:30686633-23d5-422b-83c6-4f1b06f8abcd" type="factory" location="OAFIID:nautilus_image_view_factory:61ea9ab1-e4b4-4da8-8f54-61cf6f33c4f6"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:Bonobo/Control:1.0"/> -<item value="IDL:Bonobo/Unknown:1.0"/> -<item value="IDL:Bonobo/PersistStream:1.0"/> -<item value="IDL:Bonobo/Persist:1.0"/> -<item value="IDL:Nautilus/View:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus Image Viewer"/> -<oaf_attribute name="description" type="string" value="Generic Image Viewer"/> -<oaf_attribute name="bonobo:editable" type="boolean" value="false"/> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="image/gif"/> -<item value="image/jpeg"/> -<item value="image/png"/> -<item value="image/tiff"/> -<item value="image/x-bmp"/> -<item value="image/x-cmu-raster"/> -<item value="image/x-ico"/> -<item value="image/x-png"/> -<item value="image/x-portable-anymap"/> -<item value="image/x-portable-bitmap"/> -<item value="image/x-portable-graymap"/> -<item value="image/x-portable-pixmap"/> -<item value="image/x-xpixmap"/> -<item value="image/xpm"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Image"/> -</oaf_server> - -</oaf_info> diff --git a/components/loser/content/.cvsignore b/components/loser/content/.cvsignore index adb3fc7da..86cbc9af8 100644 --- a/components/loser/content/.cvsignore +++ b/components/loser/content/.cvsignore @@ -4,3 +4,4 @@ Makefile Makefile.in nautilus-content-loser nautilus-content-loser-ui.xml.h +Nautilus_View_content-loser.oaf diff --git a/components/loser/content/Makefile.am b/components/loser/content/Makefile.am index 040db3837..d705fea6d 100644 --- a/components/loser/content/Makefile.am +++ b/components/loser/content/Makefile.am @@ -13,9 +13,6 @@ INCLUDES = \ $(GNOMEUI_CFLAGS) \ $(NULL) -oafdir = $(datadir)/oaf -oaf_DATA = nautilus-content-loser.oafinfo - uidir = $(datadir)/gnome/ui ui_DATA = nautilus-content-loser-ui.xml @@ -36,4 +33,13 @@ nautilus_content_loser_LDADD = \ $(VFS_LIBS) \ $(OAF_LIBS) -EXTRA_DIST = $(oaf_DATA) $(ui_DATA) +oafdir = $(datadir)/oaf + +oaf_in_files = \ + Nautilus_View_content-loser.oaf.in \ + $(NULL) +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + +EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(ui_DATA) diff --git a/components/loser/content/Nautilus_View_content-loser.oaf.in b/components/loser/content/Nautilus_View_content-loser.oaf.in index 215868e08..c92c8b146 100644 --- a/components/loser/content/Nautilus_View_content-loser.oaf.in +++ b/components/loser/content/Nautilus_View_content-loser.oaf.in @@ -1,29 +1,29 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69" type="exe" location="nautilus-content-loser"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus content loser factory"/> -<oaf_attribute name="description" type="string" value="Nautilus content loser component's factory"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus content loser factory"/> + <oaf_attribute name="description" type="string" _value="Nautilus content loser component's factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_content_loser:95901458-c68b-43aa-aaca-870ced11062d" type="factory" location="OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69"> -<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="Nautilus Content Loser"/> -<oaf_attribute name="description" type="string" value="Nautilus content view that fails on command"/> -<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="*"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Content Loser"/> -<oaf_attribute name="test_only" type="boolean" value="true"/> + <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="Nautilus Content Loser"/> + <oaf_attribute name="description" type="string" _value="Nautilus content view that fails on command"/> + <oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> + <item value="*"/> + </oaf_attribute> + <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> + <item value="*"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Content Loser"/> + <oaf_attribute name="test_only" type="boolean" value="true"/> </oaf_server> </oaf_info> diff --git a/components/loser/content/Nautilus_View_content-loser.server.in b/components/loser/content/Nautilus_View_content-loser.server.in index 215868e08..c92c8b146 100644 --- a/components/loser/content/Nautilus_View_content-loser.server.in +++ b/components/loser/content/Nautilus_View_content-loser.server.in @@ -1,29 +1,29 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69" type="exe" location="nautilus-content-loser"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus content loser factory"/> -<oaf_attribute name="description" type="string" value="Nautilus content loser component's factory"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus content loser factory"/> + <oaf_attribute name="description" type="string" _value="Nautilus content loser component's factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_content_loser:95901458-c68b-43aa-aaca-870ced11062d" type="factory" location="OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69"> -<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="Nautilus Content Loser"/> -<oaf_attribute name="description" type="string" value="Nautilus content view that fails on command"/> -<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="*"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Content Loser"/> -<oaf_attribute name="test_only" type="boolean" value="true"/> + <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="Nautilus Content Loser"/> + <oaf_attribute name="description" type="string" _value="Nautilus content view that fails on command"/> + <oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> + <item value="*"/> + </oaf_attribute> + <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> + <item value="*"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Content Loser"/> + <oaf_attribute name="test_only" type="boolean" value="true"/> </oaf_server> </oaf_info> diff --git a/components/loser/content/Nautilus_View_content-loser.server.in.in b/components/loser/content/Nautilus_View_content-loser.server.in.in index 215868e08..c92c8b146 100644 --- a/components/loser/content/Nautilus_View_content-loser.server.in.in +++ b/components/loser/content/Nautilus_View_content-loser.server.in.in @@ -1,29 +1,29 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69" type="exe" location="nautilus-content-loser"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus content loser factory"/> -<oaf_attribute name="description" type="string" value="Nautilus content loser component's factory"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus content loser factory"/> + <oaf_attribute name="description" type="string" _value="Nautilus content loser component's factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_content_loser:95901458-c68b-43aa-aaca-870ced11062d" type="factory" location="OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69"> -<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="Nautilus Content Loser"/> -<oaf_attribute name="description" type="string" value="Nautilus content view that fails on command"/> -<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="*"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Content Loser"/> -<oaf_attribute name="test_only" type="boolean" value="true"/> + <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="Nautilus Content Loser"/> + <oaf_attribute name="description" type="string" _value="Nautilus content view that fails on command"/> + <oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> + <item value="*"/> + </oaf_attribute> + <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> + <item value="*"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Content Loser"/> + <oaf_attribute name="test_only" type="boolean" value="true"/> </oaf_server> </oaf_info> diff --git a/components/loser/content/nautilus-content-loser.oafinfo b/components/loser/content/nautilus-content-loser.oafinfo deleted file mode 100644 index 215868e08..000000000 --- a/components/loser/content/nautilus-content-loser.oafinfo +++ /dev/null @@ -1,29 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69" type="exe" location="nautilus-content-loser"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus content loser factory"/> -<oaf_attribute name="description" type="string" value="Nautilus content loser component's factory"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_content_loser:95901458-c68b-43aa-aaca-870ced11062d" type="factory" location="OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69"> -<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="Nautilus Content Loser"/> -<oaf_attribute name="description" type="string" value="Nautilus content view that fails on command"/> -<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="*"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Content Loser"/> -<oaf_attribute name="test_only" type="boolean" value="true"/> -</oaf_server> - -</oaf_info> diff --git a/components/loser/sidebar/.cvsignore b/components/loser/sidebar/.cvsignore index 9d76a6d15..b9dc5a810 100644 --- a/components/loser/sidebar/.cvsignore +++ b/components/loser/sidebar/.cvsignore @@ -4,3 +4,4 @@ Makefile Makefile.in nautilus-sidebar-loser nautilus-sidebar-loser-ui.xml.h +Nautilus_View_sidebar-loser.oaf diff --git a/components/loser/sidebar/Makefile.am b/components/loser/sidebar/Makefile.am index c7efe6b98..3e207259a 100644 --- a/components/loser/sidebar/Makefile.am +++ b/components/loser/sidebar/Makefile.am @@ -12,9 +12,6 @@ INCLUDES = \ $(BONOBO_CFLAGS) \ $(GNOMEUI_CFLAGS) -oafdir = $(datadir)/oaf -oaf_DATA = nautilus-sidebar-loser.oafinfo - uidir = $(datadir)/gnome/ui ui_DATA = nautilus-sidebar-loser-ui.xml @@ -35,4 +32,14 @@ nautilus_sidebar_loser_LDADD = \ $(VFS_LIBS) \ $(OAF_LIBS) -EXTRA_DIST = $(oaf_DATA) $(ui_DATA) + +oafdir = $(datadir)/oaf + +oaf_in_files = \ + Nautilus_View_sidebar-loser.oaf.in \ + $(NULL) +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + +EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(ui_DATA) diff --git a/components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in b/components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in index 7d9757200..18871a2ad 100644 --- a/components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in +++ b/components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in @@ -1,26 +1,26 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa" type="exe" location="nautilus-sidebar-loser"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus sidebar loser factory"/> -<oaf_attribute name="description" type="string" value="Nautilus sidebar loser component's factory"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus sidebar loser factory"/> + <oaf_attribute name="description" type="string" _value="Nautilus sidebar loser component's factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_sidebar_loser:07bfdd1d-7abc-4412-98ab-441b226a10d0" type="factory" location="OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa"> -<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="Nautilus Sidebar Loser"/> -<oaf_attribute name="description" type="string" value="Nautilus sidebar view that fails on command"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Sidebar Loser"/> -<oaf_attribute name="test_only" type="boolean" value="true"/> + <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="Nautilus Sidebar Loser"/> + <oaf_attribute name="description" type="string" _value="Nautilus sidebar view that fails on command"/> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="*"/> + </oaf_attribute> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Sidebar Loser"/> + <oaf_attribute name="test_only" type="boolean" value="true"/> </oaf_server> </oaf_info> diff --git a/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in b/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in index 7d9757200..18871a2ad 100644 --- a/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in +++ b/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in @@ -1,26 +1,26 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa" type="exe" location="nautilus-sidebar-loser"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus sidebar loser factory"/> -<oaf_attribute name="description" type="string" value="Nautilus sidebar loser component's factory"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus sidebar loser factory"/> + <oaf_attribute name="description" type="string" _value="Nautilus sidebar loser component's factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_sidebar_loser:07bfdd1d-7abc-4412-98ab-441b226a10d0" type="factory" location="OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa"> -<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="Nautilus Sidebar Loser"/> -<oaf_attribute name="description" type="string" value="Nautilus sidebar view that fails on command"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Sidebar Loser"/> -<oaf_attribute name="test_only" type="boolean" value="true"/> + <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="Nautilus Sidebar Loser"/> + <oaf_attribute name="description" type="string" _value="Nautilus sidebar view that fails on command"/> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="*"/> + </oaf_attribute> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Sidebar Loser"/> + <oaf_attribute name="test_only" type="boolean" value="true"/> </oaf_server> </oaf_info> diff --git a/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in.in b/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in.in index 7d9757200..18871a2ad 100644 --- a/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in.in +++ b/components/loser/sidebar/Nautilus_View_sidebar-loser.server.in.in @@ -1,26 +1,26 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa" type="exe" location="nautilus-sidebar-loser"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus sidebar loser factory"/> -<oaf_attribute name="description" type="string" value="Nautilus sidebar loser component's factory"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus sidebar loser factory"/> + <oaf_attribute name="description" type="string" _value="Nautilus sidebar loser component's factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_sidebar_loser:07bfdd1d-7abc-4412-98ab-441b226a10d0" type="factory" location="OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa"> -<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="Nautilus Sidebar Loser"/> -<oaf_attribute name="description" type="string" value="Nautilus sidebar view that fails on command"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Sidebar Loser"/> -<oaf_attribute name="test_only" type="boolean" value="true"/> + <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="Nautilus Sidebar Loser"/> + <oaf_attribute name="description" type="string" _value="Nautilus sidebar view that fails on command"/> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="*"/> + </oaf_attribute> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Sidebar Loser"/> + <oaf_attribute name="test_only" type="boolean" value="true"/> </oaf_server> </oaf_info> diff --git a/components/loser/sidebar/nautilus-sidebar-loser.oafinfo b/components/loser/sidebar/nautilus-sidebar-loser.oafinfo deleted file mode 100644 index 7d9757200..000000000 --- a/components/loser/sidebar/nautilus-sidebar-loser.oafinfo +++ /dev/null @@ -1,26 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa" type="exe" location="nautilus-sidebar-loser"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus sidebar loser factory"/> -<oaf_attribute name="description" type="string" value="Nautilus sidebar loser component's factory"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_sidebar_loser:07bfdd1d-7abc-4412-98ab-441b226a10d0" type="factory" location="OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa"> -<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="Nautilus Sidebar Loser"/> -<oaf_attribute name="description" type="string" value="Nautilus sidebar view that fails on command"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Sidebar Loser"/> -<oaf_attribute name="test_only" type="boolean" value="true"/> -</oaf_server> - -</oaf_info> diff --git a/components/mozilla/.cvsignore b/components/mozilla/.cvsignore index 126806eab..7242c315f 100644 --- a/components/mozilla/.cvsignore +++ b/components/mozilla/.cvsignore @@ -4,3 +4,4 @@ Makefile Makefile.in nautilus-mozilla-content-view nautilus-mozilla-ui.xml.h +Nautilus_View_mozilla.oaf diff --git a/components/mozilla/Makefile.am b/components/mozilla/Makefile.am index 9d26f9b6c..037298355 100644 --- a/components/mozilla/Makefile.am +++ b/components/mozilla/Makefile.am @@ -50,14 +50,29 @@ nautilus_mozilla_content_view_LDFLAGS = \ $(MOZILLA_COMPONENT_RPATH_FLAGS) \ $(NULL) + oafdir = $(datadir)/oaf -oaf_DATA = \ - nautilus-mozilla-content-view.oafinfo \ + +oaf_in_files = \ + Nautilus_View_mozilla.oaf.in \ $(NULL) +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + uidir = $(datadir)/gnome/ui -ui_DATA = \ - nautilus-mozilla-ui.xml \ +ui_DATA = \ + nautilus-mozilla-ui.xml \ $(NULL) -EXTRA_DIST = $(oaf_DATA) $(ui_DATA) +EXTRA_DIST = $(oaf_DATA) $(ui_DATA) $(oaf_in_files) + + + + + + + + + diff --git a/components/mozilla/Nautilus_View_mozilla.oaf.in b/components/mozilla/Nautilus_View_mozilla.oaf.in index 21a3e5c80..5aadd6d76 100644 --- a/components/mozilla/Nautilus_View_mozilla.oaf.in +++ b/components/mozilla/Nautilus_View_mozilla.oaf.in @@ -1,26 +1,26 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_mozilla_content_view_factory:020a0285-6b96-4685-84a1-4a56eb6baa2b" type="exe" location="nautilus-mozilla-content-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Mozilla Nautilus view factory"/> -<oaf_attribute name="description" type="string" value="Mozilla content view component's factory"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Mozilla Nautilus view factory"/> + <oaf_attribute name="description" type="string" _value="Mozilla content view component's factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_mozilla_content_view:1ee70717-57bf-4079-aae5-922abdd576b1" type="factory" location="OAFIID:nautilus_mozilla_content_view_factory:020a0285-6b96-4685-84a1-4a56eb6baa2b"> -<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="Mozilla Nautilus view"/> -<oaf_attribute name="description" type="string" value="Mozilla content view component"/> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="text/html"/> -<item value="x-directory/webdav"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Web Page"/> + <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="Mozilla Nautilus view"/> + <oaf_attribute name="description" type="string" _value="Mozilla content view component"/> + <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> + <item value="text/html"/> + <item value="x-directory/webdav"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Web Page"/> </oaf_server> diff --git a/components/mozilla/Nautilus_View_mozilla.server.in b/components/mozilla/Nautilus_View_mozilla.server.in index 21a3e5c80..5aadd6d76 100644 --- a/components/mozilla/Nautilus_View_mozilla.server.in +++ b/components/mozilla/Nautilus_View_mozilla.server.in @@ -1,26 +1,26 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_mozilla_content_view_factory:020a0285-6b96-4685-84a1-4a56eb6baa2b" type="exe" location="nautilus-mozilla-content-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Mozilla Nautilus view factory"/> -<oaf_attribute name="description" type="string" value="Mozilla content view component's factory"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Mozilla Nautilus view factory"/> + <oaf_attribute name="description" type="string" _value="Mozilla content view component's factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_mozilla_content_view:1ee70717-57bf-4079-aae5-922abdd576b1" type="factory" location="OAFIID:nautilus_mozilla_content_view_factory:020a0285-6b96-4685-84a1-4a56eb6baa2b"> -<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="Mozilla Nautilus view"/> -<oaf_attribute name="description" type="string" value="Mozilla content view component"/> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="text/html"/> -<item value="x-directory/webdav"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Web Page"/> + <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="Mozilla Nautilus view"/> + <oaf_attribute name="description" type="string" _value="Mozilla content view component"/> + <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> + <item value="text/html"/> + <item value="x-directory/webdav"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Web Page"/> </oaf_server> diff --git a/components/mozilla/nautilus-mozilla-content-view.oafinfo b/components/mozilla/nautilus-mozilla-content-view.oafinfo deleted file mode 100644 index 21a3e5c80..000000000 --- a/components/mozilla/nautilus-mozilla-content-view.oafinfo +++ /dev/null @@ -1,27 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_mozilla_content_view_factory:020a0285-6b96-4685-84a1-4a56eb6baa2b" type="exe" location="nautilus-mozilla-content-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Mozilla Nautilus view factory"/> -<oaf_attribute name="description" type="string" value="Mozilla content view component's factory"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_mozilla_content_view:1ee70717-57bf-4079-aae5-922abdd576b1" type="factory" location="OAFIID:nautilus_mozilla_content_view_factory:020a0285-6b96-4685-84a1-4a56eb6baa2b"> -<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="Mozilla Nautilus view"/> -<oaf_attribute name="description" type="string" value="Mozilla content view component"/> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="text/html"/> -<item value="x-directory/webdav"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Web Page"/> - -</oaf_server> - -</oaf_info> diff --git a/components/music/.cvsignore b/components/music/.cvsignore index 1c2b6dfaa..4ab8f3a2b 100644 --- a/components/music/.cvsignore +++ b/components/music/.cvsignore @@ -3,3 +3,4 @@ Makefile Makefile.in nautilus-music-view +Nautilus_View_music.oaf diff --git a/components/music/Makefile.am b/components/music/Makefile.am index bc3ca4589..bdac76dee 100644 --- a/components/music/Makefile.am +++ b/components/music/Makefile.am @@ -1,3 +1,5 @@ +NULL = + INCLUDES = \ -DPREFIX=\"$(prefix)\" \ -DG_LOG_DOMAIN=\"Nautilus-Music\" \ @@ -10,12 +12,6 @@ INCLUDES = \ $(BONOBO_CFLAGS) \ $(VFS_CFLAGS) -oafdir = $(datadir)/oaf - -oaf_DATA = \ - nautilus-music-view.oafinfo - - bin_PROGRAMS = \ nautilus-music-view @@ -64,4 +60,14 @@ nautilus_music_view_LDADD = \ $(VFS_LIBS) \ $(GNORBA_LIBS) -EXTRA_DIST = $(oaf_DATA) +oafdir = $(datadir)/oaf + +oaf_in_files = \ + Nautilus_View_music.oaf.in \ + $(NULL) + +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + +EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) diff --git a/components/music/Nautilus_View_music.oaf.in b/components/music/Nautilus_View_music.oaf.in index cef385197..e75c2d9c8 100644 --- a/components/music/Nautilus_View_music.oaf.in +++ b/components/music/Nautilus_View_music.oaf.in @@ -1,32 +1,32 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2" type="exe" location="nautilus-music-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Music view factory"/> -<oaf_attribute name="description" type="string" value="Factory for music view"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Music view factory"/> + <oaf_attribute name="description" type="string" _value="Factory for music view"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_music_view:9456b5d2-60a8-407f-a56e-d561e1821391" type="factory" location="OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2"> -<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="Music view"/> -<oaf_attribute name="description" type="string" value="Music view"/> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="x-directory/*"/> -</oaf_attribute> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="file"/> -</oaf_attribute> -<oaf_attribute name="nautilus:required_directory_content_mime_types" type="stringv"> -<item value="audio/x-mpeg"/> -<item value="audio/x-mp3"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Music"/> + <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="Music view"/> + <oaf_attribute name="description" type="string" _value="Music view"/> + <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> + <item value="x-directory/*"/> + </oaf_attribute> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="file"/> + </oaf_attribute> + <oaf_attribute name="nautilus:required_directory_content_mime_types" type="stringv"> + <item value="audio/x-mpeg"/> + <item value="audio/x-mp3"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Music"/> </oaf_server> </oaf_info> diff --git a/components/music/Nautilus_View_music.server.in b/components/music/Nautilus_View_music.server.in index cef385197..e75c2d9c8 100644 --- a/components/music/Nautilus_View_music.server.in +++ b/components/music/Nautilus_View_music.server.in @@ -1,32 +1,32 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2" type="exe" location="nautilus-music-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Music view factory"/> -<oaf_attribute name="description" type="string" value="Factory for music view"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Music view factory"/> + <oaf_attribute name="description" type="string" _value="Factory for music view"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_music_view:9456b5d2-60a8-407f-a56e-d561e1821391" type="factory" location="OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2"> -<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="Music view"/> -<oaf_attribute name="description" type="string" value="Music view"/> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="x-directory/*"/> -</oaf_attribute> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="file"/> -</oaf_attribute> -<oaf_attribute name="nautilus:required_directory_content_mime_types" type="stringv"> -<item value="audio/x-mpeg"/> -<item value="audio/x-mp3"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Music"/> + <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="Music view"/> + <oaf_attribute name="description" type="string" _value="Music view"/> + <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> + <item value="x-directory/*"/> + </oaf_attribute> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="file"/> + </oaf_attribute> + <oaf_attribute name="nautilus:required_directory_content_mime_types" type="stringv"> + <item value="audio/x-mpeg"/> + <item value="audio/x-mp3"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Music"/> </oaf_server> </oaf_info> diff --git a/components/music/Nautilus_View_music.server.in.in b/components/music/Nautilus_View_music.server.in.in index cef385197..e75c2d9c8 100644 --- a/components/music/Nautilus_View_music.server.in.in +++ b/components/music/Nautilus_View_music.server.in.in @@ -1,32 +1,32 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2" type="exe" location="nautilus-music-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Music view factory"/> -<oaf_attribute name="description" type="string" value="Factory for music view"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Music view factory"/> + <oaf_attribute name="description" type="string" _value="Factory for music view"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_music_view:9456b5d2-60a8-407f-a56e-d561e1821391" type="factory" location="OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2"> -<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="Music view"/> -<oaf_attribute name="description" type="string" value="Music view"/> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="x-directory/*"/> -</oaf_attribute> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="file"/> -</oaf_attribute> -<oaf_attribute name="nautilus:required_directory_content_mime_types" type="stringv"> -<item value="audio/x-mpeg"/> -<item value="audio/x-mp3"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Music"/> + <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="Music view"/> + <oaf_attribute name="description" type="string" _value="Music view"/> + <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> + <item value="x-directory/*"/> + </oaf_attribute> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="file"/> + </oaf_attribute> + <oaf_attribute name="nautilus:required_directory_content_mime_types" type="stringv"> + <item value="audio/x-mpeg"/> + <item value="audio/x-mp3"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Music"/> </oaf_server> </oaf_info> diff --git a/components/music/nautilus-music-view.oafinfo b/components/music/nautilus-music-view.oafinfo deleted file mode 100644 index cef385197..000000000 --- a/components/music/nautilus-music-view.oafinfo +++ /dev/null @@ -1,32 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2" type="exe" location="nautilus-music-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Music view factory"/> -<oaf_attribute name="description" type="string" value="Factory for music view"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_music_view:9456b5d2-60a8-407f-a56e-d561e1821391" type="factory" location="OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2"> -<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="Music view"/> -<oaf_attribute name="description" type="string" value="Music view"/> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="x-directory/*"/> -</oaf_attribute> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="file"/> -</oaf_attribute> -<oaf_attribute name="nautilus:required_directory_content_mime_types" type="stringv"> -<item value="audio/x-mpeg"/> -<item value="audio/x-mp3"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Music"/> -</oaf_server> - -</oaf_info> diff --git a/components/notes/.cvsignore b/components/notes/.cvsignore index c7651f7e9..5a8e70401 100644 --- a/components/notes/.cvsignore +++ b/components/notes/.cvsignore @@ -3,3 +3,4 @@ Makefile Makefile.in nautilus-notes +Nautilus_View_notes.oaf diff --git a/components/notes/Makefile.am b/components/notes/Makefile.am index b5c138981..573ff9c11 100644 --- a/components/notes/Makefile.am +++ b/components/notes/Makefile.am @@ -1,3 +1,5 @@ +NULL = + bin_PROGRAMS=nautilus-notes INCLUDES=\ @@ -19,7 +21,14 @@ LDADD=\ nautilus_notes_SOURCES=nautilus-notes.c -oafdir=$(datadir)/oaf -oaf_DATA=nautilus-notes.oafinfo + +oafdir = $(datadir)/oaf +oaf_in_files = \ + Nautilus_View_notes.oaf.in \ + $(NULL) +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ EXTRA_DIST=$(oaf_DATA) + diff --git a/components/notes/Nautilus_View_notes.oaf.in b/components/notes/Nautilus_View_notes.oaf.in index fbaa28a59..9b1963af9 100644 --- a/components/notes/Nautilus_View_notes.oaf.in +++ b/components/notes/Nautilus_View_notes.oaf.in @@ -1,24 +1,24 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0" type="exe" location="nautilus-notes"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for annotation view"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="Factory for annotation view"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185" type="factory" location="OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0"> -<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="description" type="string" value="Notes sidebar panel for Nautilus"/> -<oaf_attribute name="name" type="string" value="Notes sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Notes"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> + <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="description" type="string" _value="Notes sidebar panel for Nautilus"/> + <oaf_attribute name="name" type="string" _value="Notes sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Notes"/> + <oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> + <item value="*"/> + </oaf_attribute> </oaf_server> </oaf_info> diff --git a/components/notes/Nautilus_View_notes.server.in b/components/notes/Nautilus_View_notes.server.in index fbaa28a59..9b1963af9 100644 --- a/components/notes/Nautilus_View_notes.server.in +++ b/components/notes/Nautilus_View_notes.server.in @@ -1,24 +1,24 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0" type="exe" location="nautilus-notes"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for annotation view"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="Factory for annotation view"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185" type="factory" location="OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0"> -<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="description" type="string" value="Notes sidebar panel for Nautilus"/> -<oaf_attribute name="name" type="string" value="Notes sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Notes"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> + <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="description" type="string" _value="Notes sidebar panel for Nautilus"/> + <oaf_attribute name="name" type="string" _value="Notes sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Notes"/> + <oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> + <item value="*"/> + </oaf_attribute> </oaf_server> </oaf_info> diff --git a/components/notes/Nautilus_View_notes.server.in.in b/components/notes/Nautilus_View_notes.server.in.in index fbaa28a59..9b1963af9 100644 --- a/components/notes/Nautilus_View_notes.server.in.in +++ b/components/notes/Nautilus_View_notes.server.in.in @@ -1,24 +1,24 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0" type="exe" location="nautilus-notes"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for annotation view"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="Factory for annotation view"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185" type="factory" location="OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0"> -<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="description" type="string" value="Notes sidebar panel for Nautilus"/> -<oaf_attribute name="name" type="string" value="Notes sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Notes"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> + <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="description" type="string" _value="Notes sidebar panel for Nautilus"/> + <oaf_attribute name="name" type="string" _value="Notes sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Notes"/> + <oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> + <item value="*"/> + </oaf_attribute> </oaf_server> </oaf_info> diff --git a/components/notes/nautilus-notes.oafinfo b/components/notes/nautilus-notes.oafinfo deleted file mode 100644 index fbaa28a59..000000000 --- a/components/notes/nautilus-notes.oafinfo +++ /dev/null @@ -1,24 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0" type="exe" location="nautilus-notes"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for annotation view"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185" type="factory" location="OAFIID:nautilus_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0"> -<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="description" type="string" value="Notes sidebar panel for Nautilus"/> -<oaf_attribute name="name" type="string" value="Notes sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Notes"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="*"/> -</oaf_attribute> -</oaf_server> - -</oaf_info> diff --git a/components/rpmview/.cvsignore b/components/rpmview/.cvsignore index 65720a854..c4ddd2f95 100644 --- a/components/rpmview/.cvsignore +++ b/components/rpmview/.cvsignore @@ -3,3 +3,4 @@ Makefile Makefile.in nautilus-rpm-view +Nautilus_View_rpm.oaf diff --git a/components/rpmview/Makefile.am b/components/rpmview/Makefile.am index c7a2d8523..fe41d0e6d 100644 --- a/components/rpmview/Makefile.am +++ b/components/rpmview/Makefile.am @@ -16,9 +16,6 @@ INCLUDES = \ $(VFS_CFLAGS) \ $(NULL) -oafdir = $(datadir)/oaf -oaf_DATA = nautilus-rpm-view.oafinfo - bin_PROGRAMS = nautilus-rpm-view if EAZEL_SERVICES @@ -53,4 +50,16 @@ nautilus_rpm_view_LDADD = \ $(RPM_LIBS) \ $(NULL) -EXTRA_DIST = $(oaf_DATA) + +oafdir = $(datadir)/oaf + +oaf_in_files = \ + Nautilus_View_rpm.oaf.in \ + $(NULL) + +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + +EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) + diff --git a/components/rpmview/Nautilus_View_rpm.oaf.in b/components/rpmview/Nautilus_View_rpm.oaf.in index 4824695b7..b7527c3f5 100644 --- a/components/rpmview/Nautilus_View_rpm.oaf.in +++ b/components/rpmview/Nautilus_View_rpm.oaf.in @@ -1,29 +1,29 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_rpm_view_factory:5986d6a5-8840-44ea-84a1-e7f052bd85cf" type="exe" location="nautilus-rpm-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="RPM view factory"/> -<oaf_attribute name="description" type="string" value="Factory for rpm view"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="RPM view factory"/> + <oaf_attribute name="description" type="string" _value="Factory for rpm view"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_rpm_view:22ea002c-11e6-44fd-b13c-9445175a5e70" type="factory" location="OAFIID:nautilus_rpm_view_factory:5986d6a5-8840-44ea-84a1-e7f052bd85cf"> -<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="RPM component"/> -<oaf_attribute name="description" type="string" value="rpm view"/> -<oaf_attribute name="bonobo:editable" type="boolean" value="false"/> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="application/x-rpm"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Package"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="file"/> -</oaf_attribute> + <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="RPM component"/> + <oaf_attribute name="description" type="string" _value="rpm view"/> + <oaf_attribute name="bonobo:editable" type="boolean" value="false"/> + <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> + <item value="application/x-rpm"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Package"/> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="file"/> + </oaf_attribute> </oaf_server> </oaf_info> diff --git a/components/rpmview/nautilus-rpm-view.oafinfo b/components/rpmview/nautilus-rpm-view.oafinfo deleted file mode 100644 index 4824695b7..000000000 --- a/components/rpmview/nautilus-rpm-view.oafinfo +++ /dev/null @@ -1,29 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_rpm_view_factory:5986d6a5-8840-44ea-84a1-e7f052bd85cf" type="exe" location="nautilus-rpm-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="RPM view factory"/> -<oaf_attribute name="description" type="string" value="Factory for rpm view"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_rpm_view:22ea002c-11e6-44fd-b13c-9445175a5e70" type="factory" location="OAFIID:nautilus_rpm_view_factory:5986d6a5-8840-44ea-84a1-e7f052bd85cf"> -<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="RPM component"/> -<oaf_attribute name="description" type="string" value="rpm view"/> -<oaf_attribute name="bonobo:editable" type="boolean" value="false"/> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="application/x-rpm"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Package"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="file"/> -</oaf_attribute> -</oaf_server> - -</oaf_info> diff --git a/components/sample/.cvsignore b/components/sample/.cvsignore index 73d1f3981..4c7f4298c 100644 --- a/components/sample/.cvsignore +++ b/components/sample/.cvsignore @@ -4,3 +4,4 @@ Makefile Makefile.in nautilus-sample-content-view nautilus-sample-content-view-ui.xml.h +Nautilus_View_sample.oaf diff --git a/components/sample/Makefile.am b/components/sample/Makefile.am index 942ac29b1..c97997c98 100644 --- a/components/sample/Makefile.am +++ b/components/sample/Makefile.am @@ -17,12 +17,6 @@ INCLUDES = \ $(BONOBO_CFLAGS) \ $(OAF_CFLAGS) -oafdir = $(datadir)/oaf -oaf_DATA = nautilus-sample-content-view.oafinfo - -uidir = $(datadir)/gnome/ui -ui_DATA = nautilus-sample-content-view-ui.xml - bin_PROGRAMS = \ nautilus-sample-content-view @@ -39,4 +33,16 @@ nautilus_sample_content_view_LDADD = \ $(VFS_LIBS) \ $(OAF_LIBS) -EXTRA_DIST = $(oaf_DATA) $(ui_DATA) +uidir = $(datadir)/gnome/ui +ui_DATA = nautilus-sample-content-view-ui.xml + +oafdir = $(datadir)/oaf +oaf_in_files = \ + Nautilus_View_sample.oaf.in \ + $(NULL) +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + + +EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA) diff --git a/components/sample/Nautilus_View_sample.oaf.in b/components/sample/Nautilus_View_sample.oaf.in index e343602d7..d2a1041b0 100644 --- a/components/sample/Nautilus_View_sample.oaf.in +++ b/components/sample/Nautilus_View_sample.oaf.in @@ -11,8 +11,8 @@ <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus Sample view factory"/> - <oaf_attribute name="description" type="string" value="Sample content view component's factory"/> + <oaf_attribute name="name" type="string" _value="Nautilus Sample view factory"/> + <oaf_attribute name="description" type="string" _value="Sample content view component's factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_sample_content_view:45c746bc-7d64-4346-90d5-6410463b43ae" type="factory" location="OAFIID:nautilus_sample_content_view_factory:3df6b028-be44-4a18-95c3-7720f50ca0c5"> @@ -22,15 +22,15 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus Sample view"/> - <oaf_attribute name="description" type="string" value="Sample content view component"/> + <oaf_attribute name="name" type="string" _value="Nautilus Sample view"/> + <oaf_attribute name="description" type="string" _value="Sample content view component"/> <oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> <item value="*"/> </oaf_attribute> <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> <item value="*"/> </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Sample"/> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Sample"/> </oaf_server> </oaf_info> diff --git a/components/sample/Nautilus_View_sample.server.in b/components/sample/Nautilus_View_sample.server.in index e343602d7..d2a1041b0 100644 --- a/components/sample/Nautilus_View_sample.server.in +++ b/components/sample/Nautilus_View_sample.server.in @@ -11,8 +11,8 @@ <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus Sample view factory"/> - <oaf_attribute name="description" type="string" value="Sample content view component's factory"/> + <oaf_attribute name="name" type="string" _value="Nautilus Sample view factory"/> + <oaf_attribute name="description" type="string" _value="Sample content view component's factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_sample_content_view:45c746bc-7d64-4346-90d5-6410463b43ae" type="factory" location="OAFIID:nautilus_sample_content_view_factory:3df6b028-be44-4a18-95c3-7720f50ca0c5"> @@ -22,15 +22,15 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus Sample view"/> - <oaf_attribute name="description" type="string" value="Sample content view component"/> + <oaf_attribute name="name" type="string" _value="Nautilus Sample view"/> + <oaf_attribute name="description" type="string" _value="Sample content view component"/> <oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> <item value="*"/> </oaf_attribute> <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> <item value="*"/> </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Sample"/> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Sample"/> </oaf_server> </oaf_info> diff --git a/components/sample/Nautilus_View_sample.server.in.in b/components/sample/Nautilus_View_sample.server.in.in index e343602d7..d2a1041b0 100644 --- a/components/sample/Nautilus_View_sample.server.in.in +++ b/components/sample/Nautilus_View_sample.server.in.in @@ -11,8 +11,8 @@ <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus Sample view factory"/> - <oaf_attribute name="description" type="string" value="Sample content view component's factory"/> + <oaf_attribute name="name" type="string" _value="Nautilus Sample view factory"/> + <oaf_attribute name="description" type="string" _value="Sample content view component's factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_sample_content_view:45c746bc-7d64-4346-90d5-6410463b43ae" type="factory" location="OAFIID:nautilus_sample_content_view_factory:3df6b028-be44-4a18-95c3-7720f50ca0c5"> @@ -22,15 +22,15 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus Sample view"/> - <oaf_attribute name="description" type="string" value="Sample content view component"/> + <oaf_attribute name="name" type="string" _value="Nautilus Sample view"/> + <oaf_attribute name="description" type="string" _value="Sample content view component"/> <oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> <item value="*"/> </oaf_attribute> <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> <item value="*"/> </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Sample"/> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Sample"/> </oaf_server> </oaf_info> diff --git a/components/sample/nautilus-sample-content-view.oafinfo b/components/sample/nautilus-sample-content-view.oafinfo deleted file mode 100644 index e343602d7..000000000 --- a/components/sample/nautilus-sample-content-view.oafinfo +++ /dev/null @@ -1,36 +0,0 @@ -<oaf_info> - -<!-- WHAT YOU NEED TO CHANGE: Replace all the OAFIID strings (you can - use `uuidgen' to generate the random number looking part). - Also make sure to replace the names, and change the mime/scheme attributes - and interfaces to what your component really supports. - And finally, make sure to remove the test_only attribute. - --> - -<oaf_server iid="OAFIID:nautilus_sample_content_view_factory:3df6b028-be44-4a18-95c3-7720f50ca0c5" type="exe" location="nautilus-sample-content-view"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/ObjectFactory:1.0"/> - </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus Sample view factory"/> - <oaf_attribute name="description" type="string" value="Sample content view component's factory"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_sample_content_view:45c746bc-7d64-4346-90d5-6410463b43ae" type="factory" location="OAFIID:nautilus_sample_content_view_factory:3df6b028-be44-4a18-95c3-7720f50ca0c5"> - <oaf_attribute name="test_only" type="boolean" value="true"/> - <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="Nautilus Sample view"/> - <oaf_attribute name="description" type="string" value="Sample content view component"/> - <oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> - <item value="*"/> - </oaf_attribute> - <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> - <item value="*"/> - </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Sample"/> -</oaf_server> - -</oaf_info> diff --git a/components/services/Makefile.am b/components/services/Makefile.am index 3b21c347e..18d9d21cf 100644 --- a/components/services/Makefile.am +++ b/components/services/Makefile.am @@ -9,7 +9,6 @@ SUBDIRS = \ trilobite \ nautilus-dependent-shared \ $(INSTALL_SERVICE) \ - time \ login \ summary \ vault \ diff --git a/components/services/install-view/.cvsignore b/components/services/install-view/.cvsignore index 06988e9f5..14c2af5d6 100644 --- a/components/services/install-view/.cvsignore +++ b/components/services/install-view/.cvsignore @@ -3,3 +3,4 @@ Makefile.in .deps .libs nautilus-service-install-view +Nautilus_View_install.oaf diff --git a/components/services/install-view/Makefile.am b/components/services/install-view/Makefile.am index da128837b..49b2416b5 100644 --- a/components/services/install-view/Makefile.am +++ b/components/services/install-view/Makefile.am @@ -20,10 +20,6 @@ INCLUDES = \ $(VFS_CFLAGS) \ $(NULL) -oafdir = $(datadir)/oaf - -oaf_DATA = nautilus-service-install-view.oafinfo - bin_PROGRAMS = nautilus-service-install-view noinst_HEADERS = \ @@ -52,4 +48,13 @@ nautilus_service_install_view_LDADD = \ $(RPM_LIBS) \ $(NULL) -EXTRA_DIST = $(oaf_DATA) +oafdir = $(datadir)/oaf +oaf_in_files = \ + Nautilus_View_install.oaf.in \ + $(NULL) +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + + +EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) diff --git a/components/services/install-view/Nautilus_View_install.oaf.in b/components/services/install-view/Nautilus_View_install.oaf.in index 8ce6f3ee3..f519ef645 100644 --- a/components/services/install-view/Nautilus_View_install.oaf.in +++ b/components/services/install-view/Nautilus_View_install.oaf.in @@ -4,8 +4,8 @@ <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus Service Install View Factory"/> - <oaf_attribute name="description" type="string" value="Service Install View Component's Factory"/> + <oaf_attribute name="name" type="string" _value="Nautilus Service Install View Factory"/> + <oaf_attribute name="description" type="string" _value="Service Install View Component's Factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_service_install_view:886546ca-1115-4ea4-8d30-8cefa2f5070b" type="factory" location="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32"> @@ -14,12 +14,12 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus Service Install View"/> - <oaf_attribute name="description" type="string" value="Service Install View Component"/> + <oaf_attribute name="name" type="string" _value="Nautilus Service Install View"/> + <oaf_attribute name="description" type="string" _value="Service Install View Component"/> <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> <item value="eazel-install"/> </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Install Page"/> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Install Page"/> </oaf_server> </oaf_info> diff --git a/components/services/install-view/nautilus-service-install-view.oafinfo b/components/services/install-view/nautilus-service-install-view.oafinfo deleted file mode 100644 index 8ce6f3ee3..000000000 --- a/components/services/install-view/nautilus-service-install-view.oafinfo +++ /dev/null @@ -1,25 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32" type="exe" location="nautilus-service-install-view"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/ObjectFactory:1.0"/> - </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus Service Install View Factory"/> - <oaf_attribute name="description" type="string" value="Service Install View Component's Factory"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_service_install_view:886546ca-1115-4ea4-8d30-8cefa2f5070b" type="factory" location="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32"> - <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="Nautilus Service Install View"/> - <oaf_attribute name="description" type="string" value="Service Install View Component"/> - <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> - <item value="eazel-install"/> - </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Install Page"/> -</oaf_server> - -</oaf_info> diff --git a/components/services/install/nautilus-view/.cvsignore b/components/services/install/nautilus-view/.cvsignore index 06988e9f5..14c2af5d6 100644 --- a/components/services/install/nautilus-view/.cvsignore +++ b/components/services/install/nautilus-view/.cvsignore @@ -3,3 +3,4 @@ Makefile.in .deps .libs nautilus-service-install-view +Nautilus_View_install.oaf diff --git a/components/services/install/nautilus-view/Makefile.am b/components/services/install/nautilus-view/Makefile.am index da128837b..49b2416b5 100644 --- a/components/services/install/nautilus-view/Makefile.am +++ b/components/services/install/nautilus-view/Makefile.am @@ -20,10 +20,6 @@ INCLUDES = \ $(VFS_CFLAGS) \ $(NULL) -oafdir = $(datadir)/oaf - -oaf_DATA = nautilus-service-install-view.oafinfo - bin_PROGRAMS = nautilus-service-install-view noinst_HEADERS = \ @@ -52,4 +48,13 @@ nautilus_service_install_view_LDADD = \ $(RPM_LIBS) \ $(NULL) -EXTRA_DIST = $(oaf_DATA) +oafdir = $(datadir)/oaf +oaf_in_files = \ + Nautilus_View_install.oaf.in \ + $(NULL) +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + + +EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) diff --git a/components/services/install/nautilus-view/Nautilus_View_install.oaf.in b/components/services/install/nautilus-view/Nautilus_View_install.oaf.in index 8ce6f3ee3..f519ef645 100644 --- a/components/services/install/nautilus-view/Nautilus_View_install.oaf.in +++ b/components/services/install/nautilus-view/Nautilus_View_install.oaf.in @@ -4,8 +4,8 @@ <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus Service Install View Factory"/> - <oaf_attribute name="description" type="string" value="Service Install View Component's Factory"/> + <oaf_attribute name="name" type="string" _value="Nautilus Service Install View Factory"/> + <oaf_attribute name="description" type="string" _value="Service Install View Component's Factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_service_install_view:886546ca-1115-4ea4-8d30-8cefa2f5070b" type="factory" location="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32"> @@ -14,12 +14,12 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus Service Install View"/> - <oaf_attribute name="description" type="string" value="Service Install View Component"/> + <oaf_attribute name="name" type="string" _value="Nautilus Service Install View"/> + <oaf_attribute name="description" type="string" _value="Service Install View Component"/> <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> <item value="eazel-install"/> </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Install Page"/> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Install Page"/> </oaf_server> </oaf_info> diff --git a/components/services/install/nautilus-view/nautilus-service-install-view.oafinfo b/components/services/install/nautilus-view/nautilus-service-install-view.oafinfo deleted file mode 100644 index 8ce6f3ee3..000000000 --- a/components/services/install/nautilus-view/nautilus-service-install-view.oafinfo +++ /dev/null @@ -1,25 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32" type="exe" location="nautilus-service-install-view"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/ObjectFactory:1.0"/> - </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus Service Install View Factory"/> - <oaf_attribute name="description" type="string" value="Service Install View Component's Factory"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_service_install_view:886546ca-1115-4ea4-8d30-8cefa2f5070b" type="factory" location="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32"> - <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="Nautilus Service Install View"/> - <oaf_attribute name="description" type="string" value="Service Install View Component"/> - <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> - <item value="eazel-install"/> - </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Install Page"/> -</oaf_server> - -</oaf_info> diff --git a/components/services/install/server/.cvsignore b/components/services/install/server/.cvsignore index f42277cf7..1f47dc458 100644 --- a/components/services/install/server/.cvsignore +++ b/components/services/install/server/.cvsignore @@ -8,3 +8,4 @@ trilobite-eazel-install-skels.c trilobite-eazel-install-common.c trilobite-eazel-install.h trilobite_eazel_install_service_idl_stamp +Trilobite_Service_install.oaf
\ No newline at end of file diff --git a/components/services/install/server/Makefile.am b/components/services/install/server/Makefile.am index 6f5e692c6..2b4f3dea0 100644 --- a/components/services/install/server/Makefile.am +++ b/components/services/install/server/Makefile.am @@ -25,11 +25,6 @@ INCLUDES = \ pixmapdir = $(datadir)/pixmaps pixmap_DATA = trilobite-eazel-install-service.png -# CORBA magic - -oafdir = $(datadir)/oaf -oaf_DATA = trilobite-eazel-install-service.oafinfo - # make the auto-generated files depend on a installstamp file. # this is to ensure the individual files wait for each other before # proceeding which is needed in parallel makes @@ -54,10 +49,20 @@ trilobite_eazel_install_service_LDADD = \ $(BONOBO_LIBS) \ $(NULL) +# CORBA magic + +oafdir = $(datadir)/oaf +oaf_in_files = \ + Trilobite_Service_install.oaf.in \ + $(NULL) +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ ## Extra stuff -EXTRA_DIST = \ - $(oaf_DATA) \ - $(pixmap_DATA) \ +EXTRA_DIST = \ + $(oaf_in_files) \ + $(oaf_DATA) \ + $(pixmap_DATA) \ $(NULL) diff --git a/components/services/install/server/Trilobite_Service_install.oaf.in b/components/services/install/server/Trilobite_Service_install.oaf.in index 1f55819af..5055e9a60 100644 --- a/components/services/install/server/Trilobite_Service_install.oaf.in +++ b/components/services/install/server/Trilobite_Service_install.oaf.in @@ -1,29 +1,29 @@ <oaf_info> <oaf_server iid="OAFIID:trilobite_eazel_install_service_factory:b423ff3f-1941-4b0d-bd45-6542f64abbfc" type="exe" location="trilobite-eazel-install-service"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for the install service"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="Factory for the install service"/> </oaf_server> <oaf_server iid="OAFIID:trilobite_eazel_install_service:8ff6e815-1992-437c-9771-d932db3b4a17" type="factory" location="OAFIID:trilobite_eazel_install_service_factory:b423ff3f-1941-4b0d-bd45-6542f64abbfc"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:Bonobo/Unknown:1.0"/> -<item value="IDL:Trilobite/Service:1.0"/> -<item value="IDL:Trilobite/Eazel/Install:1.0"/> -</oaf_attribute> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:Bonobo/Unknown:1.0"/> + <item value="IDL:Trilobite/Service:1.0"/> + <item value="IDL:Trilobite/Eazel/Install:1.0"/> + </oaf_attribute> -<oaf_attribute name="trilobite:name" type="string" value="Install"/> -<oaf_attribute name="trilobite:version" type="string" value="0.1"/> -<oaf_attribute name="trilobite:vendor_name" type="string" value="Eazel, inc."/> -<oaf_attribute name="trilobite:vendor_url" type="string" value="http://www.eazel.com"/> -<oaf_attribute name="trilobite:info_url" type="string" value="http://www.eazel.com/install/"/> -<oaf_attribute name="trilobite:icon" type="string" value="trilobite-install-service.png"/> -<oaf_attribute name="trilobite:uri_scheme" type="string" value="eazel-install:"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="eazel-install"/> -</oaf_attribute> + <oaf_attribute name="trilobite:name" type="string" _value="Install"/> + <oaf_attribute name="trilobite:version" type="string" value="0.1"/> + <oaf_attribute name="trilobite:vendor_name" type="string" value="Eazel, inc."/> + <oaf_attribute name="trilobite:vendor_url" type="string" value="http://www.eazel.com"/> + <oaf_attribute name="trilobite:info_url" type="string" value="http://www.eazel.com/install/"/> + <oaf_attribute name="trilobite:icon" type="string" value="trilobite-install-service.png"/> + <oaf_attribute name="trilobite:uri_scheme" type="string" value="eazel-install:"/> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="eazel-install"/> + </oaf_attribute> </oaf_server> diff --git a/components/services/install/server/trilobite-eazel-install-service.oafinfo b/components/services/install/server/trilobite-eazel-install-service.oafinfo deleted file mode 100644 index 1f55819af..000000000 --- a/components/services/install/server/trilobite-eazel-install-service.oafinfo +++ /dev/null @@ -1,30 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:trilobite_eazel_install_service_factory:b423ff3f-1941-4b0d-bd45-6542f64abbfc" type="exe" location="trilobite-eazel-install-service"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for the install service"/> -</oaf_server> - -<oaf_server iid="OAFIID:trilobite_eazel_install_service:8ff6e815-1992-437c-9771-d932db3b4a17" type="factory" location="OAFIID:trilobite_eazel_install_service_factory:b423ff3f-1941-4b0d-bd45-6542f64abbfc"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:Bonobo/Unknown:1.0"/> -<item value="IDL:Trilobite/Service:1.0"/> -<item value="IDL:Trilobite/Eazel/Install:1.0"/> -</oaf_attribute> - -<oaf_attribute name="trilobite:name" type="string" value="Install"/> -<oaf_attribute name="trilobite:version" type="string" value="0.1"/> -<oaf_attribute name="trilobite:vendor_name" type="string" value="Eazel, inc."/> -<oaf_attribute name="trilobite:vendor_url" type="string" value="http://www.eazel.com"/> -<oaf_attribute name="trilobite:info_url" type="string" value="http://www.eazel.com/install/"/> -<oaf_attribute name="trilobite:icon" type="string" value="trilobite-install-service.png"/> -<oaf_attribute name="trilobite:uri_scheme" type="string" value="eazel-install:"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="eazel-install"/> -</oaf_attribute> - -</oaf_server> - -</oaf_info> diff --git a/components/services/login/nautilus-view/.cvsignore b/components/services/login/nautilus-view/.cvsignore index 8a2793a7a..da488f6fd 100644 --- a/components/services/login/nautilus-view/.cvsignore +++ b/components/services/login/nautilus-view/.cvsignore @@ -3,3 +3,4 @@ Makefile Makefile.in nautilus-change-password-view +Nautilus_View_change-password.oaf diff --git a/components/services/login/nautilus-view/Makefile.am b/components/services/login/nautilus-view/Makefile.am index 3ad08f169..427cfea8f 100644 --- a/components/services/login/nautilus-view/Makefile.am +++ b/components/services/login/nautilus-view/Makefile.am @@ -14,12 +14,6 @@ INCLUDES = \ $(VFS_CFLAGS) \ $(NULL) -oafdir = $(datadir)/oaf - -oaf_DATA = \ - nautilus-change-password-view.oafinfo - - bin_PROGRAMS = \ nautilus-change-password-view @@ -43,4 +37,10 @@ nautilus_change_password_view_LDADD = \ $(AMMONITE_LIBS) \ $(NULL) +oafdir = $(datadir)/oaf +oaf_in_files = Nautilus_View_change-password.oaf.in +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + EXTRA_DIST = $(oaf_DATA) diff --git a/components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in b/components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in index ef0dd504a..42c9fbb4c 100644 --- a/components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in +++ b/components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in @@ -1,28 +1,28 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_change_password_view_factory:a2839e69-53ae-47b8-b797-3e9335bacf22" type="exe" location="nautilus-change-password-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus Service Login View Factory"/> -<oaf_attribute name="description" type="string" value="Service Login View Component's Factory"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" _value="Nautilus Service Login View Factory"/> + <oaf_attribute name="description" type="string" _value="Service Login View Component's Factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_change_password_view:3a6345f0-d78d-4edc-9c3e-0c1be7426c44" type="factory" location="OAFIID:nautilus_change_password_view_factory:a2839e69-53ae-47b8-b797-3e9335bacf22"> -<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="Eazel Change Password View"/> -<oaf_attribute name="description" type="string" value="Eazel Change Password view component"/> -<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> -<item value="eazel-pw"/> -</oaf_attribute> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="eazel-pw"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="pw"/> -</oaf_server> + <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="Eazel Change Password View"/> + <oaf_attribute name="description" type="string" _value="Eazel Change Password view component"/> + <oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> + <item value="eazel-pw"/> + </oaf_attribute> + <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> + <item value="eazel-pw"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Change Password"/> + </oaf_server> </oaf_info> diff --git a/components/services/login/nautilus-view/nautilus-change-password-view.oafinfo b/components/services/login/nautilus-view/nautilus-change-password-view.oafinfo deleted file mode 100644 index ef0dd504a..000000000 --- a/components/services/login/nautilus-view/nautilus-change-password-view.oafinfo +++ /dev/null @@ -1,28 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_change_password_view_factory:a2839e69-53ae-47b8-b797-3e9335bacf22" type="exe" location="nautilus-change-password-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus Service Login View Factory"/> -<oaf_attribute name="description" type="string" value="Service Login View Component's Factory"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_change_password_view:3a6345f0-d78d-4edc-9c3e-0c1be7426c44" type="factory" location="OAFIID:nautilus_change_password_view_factory:a2839e69-53ae-47b8-b797-3e9335bacf22"> -<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="Eazel Change Password View"/> -<oaf_attribute name="description" type="string" value="Eazel Change Password view component"/> -<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> -<item value="eazel-pw"/> -</oaf_attribute> -<oaf_attribute name="bonobo:supported_mime_types" type="stringv"> -<item value="eazel-pw"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="pw"/> -</oaf_server> - -</oaf_info> diff --git a/components/services/summary/Nautilus_View_services-summary.oaf.in b/components/services/summary/Nautilus_View_services-summary.oaf.in index b06bf40fe..11d1cb78a 100644 --- a/components/services/summary/Nautilus_View_services-summary.oaf.in +++ b/components/services/summary/Nautilus_View_services-summary.oaf.in @@ -1,25 +1,25 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_summary_view_factory:1b0b1018-e0ca-4f14-8d23-7a134486ab30" type="exe" location="nautilus-summary-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus Service Summary View Factory"/> -<oaf_attribute name="description" type="string" value="Service Summary View Component's Factory"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" value="Nautilus Service Summary View Factory"/> + <oaf_attribute name="description" type="string" value="Service Summary View Component's Factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_summary_view:92811b0e-beb2-49db-858c-19a0dc8517e5" type="factory" location="OAFIID:nautilus_summary_view_factory:1b0b1018-e0ca-4f14-8d23-7a134486ab30"> -<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="Nautilus Summary View"/> -<oaf_attribute name="description" type="string" value="Service Summary view component"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="eazel"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Summary"/> + <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="Nautilus Summary View"/> + <oaf_attribute name="description" type="string" value="Service Summary view component"/> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="eazel"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" value="Summary"/> </oaf_server> </oaf_info> diff --git a/components/services/summary/nautilus-view/.cvsignore b/components/services/summary/nautilus-view/.cvsignore index f4d8439a4..bfcf5f908 100644 --- a/components/services/summary/nautilus-view/.cvsignore +++ b/components/services/summary/nautilus-view/.cvsignore @@ -3,3 +3,4 @@ Makefile Makefile.in nautilus-summary-view +Nautilus_View_services-summary.oaf diff --git a/components/services/summary/nautilus-view/Makefile.am b/components/services/summary/nautilus-view/Makefile.am index 6bbc6e810..851475050 100644 --- a/components/services/summary/nautilus-view/Makefile.am +++ b/components/services/summary/nautilus-view/Makefile.am @@ -17,9 +17,6 @@ INCLUDES = \ $(VFS_CFLAGS) \ $(NULL) -oafdir = $(datadir)/oaf -oaf_DATA = nautilus-summary-view.oafinfo - uidir = $(datadir)/gnome/ui ui_DATA = nautilus-summary-view-ui.xml @@ -56,4 +53,12 @@ nautilus_summary_view_LDADD = \ $(AMMONITE_LIBS) \ $(NULL) -EXTRA_DIST = $(oaf_DATA) $(ui_DATA) +oafdir = $(datadir)/oaf +oaf_in_files = \ + Nautilus_View_services-summary.oaf.in \ + $(NULL) +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + +EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA) diff --git a/components/services/summary/nautilus-view/Nautilus_View_services-summary.oaf.in b/components/services/summary/nautilus-view/Nautilus_View_services-summary.oaf.in index b06bf40fe..11d1cb78a 100644 --- a/components/services/summary/nautilus-view/Nautilus_View_services-summary.oaf.in +++ b/components/services/summary/nautilus-view/Nautilus_View_services-summary.oaf.in @@ -1,25 +1,25 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_summary_view_factory:1b0b1018-e0ca-4f14-8d23-7a134486ab30" type="exe" location="nautilus-summary-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus Service Summary View Factory"/> -<oaf_attribute name="description" type="string" value="Service Summary View Component's Factory"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="name" type="string" value="Nautilus Service Summary View Factory"/> + <oaf_attribute name="description" type="string" value="Service Summary View Component's Factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_summary_view:92811b0e-beb2-49db-858c-19a0dc8517e5" type="factory" location="OAFIID:nautilus_summary_view_factory:1b0b1018-e0ca-4f14-8d23-7a134486ab30"> -<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="Nautilus Summary View"/> -<oaf_attribute name="description" type="string" value="Service Summary view component"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="eazel"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Summary"/> + <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="Nautilus Summary View"/> + <oaf_attribute name="description" type="string" value="Service Summary view component"/> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="eazel"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" value="Summary"/> </oaf_server> </oaf_info> diff --git a/components/services/summary/nautilus-view/nautilus-summary-view.oafinfo b/components/services/summary/nautilus-view/nautilus-summary-view.oafinfo deleted file mode 100644 index b06bf40fe..000000000 --- a/components/services/summary/nautilus-view/nautilus-summary-view.oafinfo +++ /dev/null @@ -1,25 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_summary_view_factory:1b0b1018-e0ca-4f14-8d23-7a134486ab30" type="exe" location="nautilus-summary-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus Service Summary View Factory"/> -<oaf_attribute name="description" type="string" value="Service Summary View Component's Factory"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_summary_view:92811b0e-beb2-49db-858c-19a0dc8517e5" type="factory" location="OAFIID:nautilus_summary_view_factory:1b0b1018-e0ca-4f14-8d23-7a134486ab30"> -<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="Nautilus Summary View"/> -<oaf_attribute name="description" type="string" value="Service Summary view component"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="eazel"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Summary"/> -</oaf_server> - -</oaf_info> diff --git a/components/services/trilobite/sample/.cvsignore b/components/services/trilobite/sample/.cvsignore index 282522db0..4cfe07926 100644 --- a/components/services/trilobite/sample/.cvsignore +++ b/components/services/trilobite/sample/.cvsignore @@ -1,2 +1,3 @@ Makefile Makefile.in +Nautius_View_sample-service.oaf diff --git a/components/services/trilobite/sample/nautilus-view/.cvsignore b/components/services/trilobite/sample/nautilus-view/.cvsignore index e0ddbf57e..a7316e103 100644 --- a/components/services/trilobite/sample/nautilus-view/.cvsignore +++ b/components/services/trilobite/sample/nautilus-view/.cvsignore @@ -3,3 +3,4 @@ Makefile Makefile.in nautilus-sample-service-view +Nautilus_View_service-sample.oaf
\ No newline at end of file diff --git a/components/services/trilobite/sample/nautilus-view/Makefile.am b/components/services/trilobite/sample/nautilus-view/Makefile.am index 34c153d69..f121df1bd 100644 --- a/components/services/trilobite/sample/nautilus-view/Makefile.am +++ b/components/services/trilobite/sample/nautilus-view/Makefile.am @@ -13,12 +13,6 @@ INCLUDES = \ $(GCONF_CFLAGS) \ $(NULL) -oafdir = $(datadir)/oaf - -oaf_DATA = \ - nautilus-sample-service-view.oafinfo - - bin_PROGRAMS = \ nautilus-sample-service-view @@ -41,4 +35,14 @@ nautilus_sample_service_view_LDADD = \ $(OAF_LIBS) \ $(NULL) -EXTRA_DIST = $(oaf_DATA) + +oafdir = $(datadir)/oaf +oaf_in_files = \ + Nautilus_View_service-sample.oaf.in \ + $(NULL) +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + + +EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) diff --git a/components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in b/components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in index b61c92882..ac1fc08ff 100644 --- a/components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in +++ b/components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in @@ -4,8 +4,8 @@ <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> </oaf_attribute> -<oaf_attribute name="name" type="string" value="Services startup view factory"/> -<oaf_attribute name="description" type="string" value="Nautilus services startup view factory"/> +<oaf_attribute name="name" type="string" _value="Services startup view factory"/> +<oaf_attribute name="description" type="string" _value="Nautilus services startup view factory"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_sample_service_view:a8f1b0ef-a39f-4f92-84bc-1704f0321a82" type="factory" location="OAFIID:nautilus_sample_service_view_factory:fafa0f0d-a2d1-41f9-8164-4beb5e34656c"> @@ -14,12 +14,12 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> -<oaf_attribute name="name" type="string" value="eazel sample service view"/> -<oaf_attribute name="description" type="string" value="Nautilus eazel sample service view component"/> +<oaf_attribute name="name" type="string" _value="eazel sample service view"/> +<oaf_attribute name="description" type="string" _value="Nautilus eazel sample service view component"/> <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> <item value="eazel-sample"/> </oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Service"/> +<oaf_attribute name="nautilus:view_as_name" type="string" _value="Service"/> </oaf_server> </oaf_info> diff --git a/components/services/trilobite/sample/nautilus-view/nautilus-sample-service-view.oafinfo b/components/services/trilobite/sample/nautilus-view/nautilus-sample-service-view.oafinfo deleted file mode 100644 index b61c92882..000000000 --- a/components/services/trilobite/sample/nautilus-view/nautilus-sample-service-view.oafinfo +++ /dev/null @@ -1,25 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_sample_service_view_factory:fafa0f0d-a2d1-41f9-8164-4beb5e34656c" type="exe" location="nautilus-sample-service-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Services startup view factory"/> -<oaf_attribute name="description" type="string" value="Nautilus services startup view factory"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_sample_service_view:a8f1b0ef-a39f-4f92-84bc-1704f0321a82" type="factory" location="OAFIID:nautilus_sample_service_view_factory:fafa0f0d-a2d1-41f9-8164-4beb5e34656c"> -<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="eazel sample service view"/> -<oaf_attribute name="description" type="string" value="Nautilus eazel sample service view component"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="eazel-sample"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Service"/> -</oaf_server> - -</oaf_info> diff --git a/components/services/trilobite/sample/service/.cvsignore b/components/services/trilobite/sample/service/.cvsignore index a213b4786..959c71e70 100644 --- a/components/services/trilobite/sample/service/.cvsignore +++ b/components/services/trilobite/sample/service/.cvsignore @@ -3,3 +3,4 @@ Makefile Makefile.in trilobite-eazel-sample-service +Trilobite_Service_sample.oaf diff --git a/components/services/trilobite/sample/service/Makefile.am b/components/services/trilobite/sample/service/Makefile.am index e21826898..3f38248ba 100644 --- a/components/services/trilobite/sample/service/Makefile.am +++ b/components/services/trilobite/sample/service/Makefile.am @@ -20,10 +20,6 @@ INCLUDES = \ $(XML_CFLAGS) \ $(NULL) -oafdir = $(datadir)/oaf - -oaf_DATA = trilobite-eazel-sample-service.oafinfo - bin_PROGRAMS = trilobite-eazel-sample-service trilobite_eazel_sample_service_SOURCES = \ @@ -38,6 +34,16 @@ trilobite_eazel_sample_service_LDADD = \ $(BONOBO_LIBS) \ $(NULL) -EXTRA_DIST = \ - $(oaf_DATA) \ +oafdir = $(datadir)/oaf +oaf_in_files = Trilobite_Service_sample.oaf.in +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + +EXTRA_DIST = \ + $(oaf_in_files) \ + $(oaf_DATA) \ $(NULL) + + + diff --git a/components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in b/components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in index 6ea722c3d..3d02b479e 100644 --- a/components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in +++ b/components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in @@ -1,29 +1,29 @@ <oaf_info> <oaf_server iid="OAFIID:trilobite_eazel_sample_service_factory:19084a03-2f85-456e-95ed-bcebf8141e97" type="exe" location="trilobite-eazel-sample-service"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for the sample service"/> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:GNOME/ObjectFactory:1.0"/> + </oaf_attribute> + <oaf_attribute name="description" type="string" _value="Factory for the sample service"/> </oaf_server> <oaf_server iid="OAFIID:trilobite_eazel_sample_service:3d972cc6-d42d-4669-bd42-966998b3c306" type="factory" location="OAFIID:trilobite_eazel_sample_service_factory:19084a03-2f85-456e-95ed-bcebf8141e97"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:Bonobo/Unknown:1.0"/> -<item value="IDL:Trilobite/Service:1.0"/> -<item value="IDL:Trilobite/Eazel/Sample:1.0"/> -</oaf_attribute> + <oaf_attribute name="repo_ids" type="stringv"> + <item value="IDL:Bonobo/Unknown:1.0"/> + <item value="IDL:Trilobite/Service:1.0"/> + <item value="IDL:Trilobite/Eazel/Sample:1.0"/> + </oaf_attribute> -<oaf_attribute name="trilobite:name" type="string" value="Sample"/> -<oaf_attribute name="trilobite:version" type="string" value="0.1"/> -<oaf_attribute name="trilobite:vendor_name" type="string" value="Eazel, Inc."/> -<oaf_attribute name="trilobite:vendor_url" type="string" value="http://www.eazel.com"/> -<oaf_attribute name="trilobite:info_url" type="string" value="http://www.eazel.com/sample/"/> -<oaf_attribute name="trilobite:icon" type="string" value="gnome-default-dlg.png"/> -<oaf_attribute name="trilobite:uri_scheme" type="string" value="eazel-sample:"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="eazel-sample:"/> -</oaf_attribute> + <oaf_attribute name="trilobite:name" type="string" _value="Sample"/> + <oaf_attribute name="trilobite:version" type="string" value="0.1"/> + <oaf_attribute name="trilobite:vendor_name" type="string" value="Eazel, Inc."/> + <oaf_attribute name="trilobite:vendor_url" type="string" value="http://www.eazel.com"/> + <oaf_attribute name="trilobite:info_url" type="string" value="http://www.eazel.com/sample/"/> + <oaf_attribute name="trilobite:icon" type="string" value="gnome-default-dlg.png"/> + <oaf_attribute name="trilobite:uri_scheme" type="string" value="eazel-sample:"/> + <oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> + <item value="eazel-sample:"/> + </oaf_attribute> </oaf_server> diff --git a/components/services/trilobite/sample/service/trilobite-eazel-sample-service.oafinfo b/components/services/trilobite/sample/service/trilobite-eazel-sample-service.oafinfo deleted file mode 100644 index 6ea722c3d..000000000 --- a/components/services/trilobite/sample/service/trilobite-eazel-sample-service.oafinfo +++ /dev/null @@ -1,30 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:trilobite_eazel_sample_service_factory:19084a03-2f85-456e-95ed-bcebf8141e97" type="exe" location="trilobite-eazel-sample-service"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for the sample service"/> -</oaf_server> - -<oaf_server iid="OAFIID:trilobite_eazel_sample_service:3d972cc6-d42d-4669-bd42-966998b3c306" type="factory" location="OAFIID:trilobite_eazel_sample_service_factory:19084a03-2f85-456e-95ed-bcebf8141e97"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:Bonobo/Unknown:1.0"/> -<item value="IDL:Trilobite/Service:1.0"/> -<item value="IDL:Trilobite/Eazel/Sample:1.0"/> -</oaf_attribute> - -<oaf_attribute name="trilobite:name" type="string" value="Sample"/> -<oaf_attribute name="trilobite:version" type="string" value="0.1"/> -<oaf_attribute name="trilobite:vendor_name" type="string" value="Eazel, Inc."/> -<oaf_attribute name="trilobite:vendor_url" type="string" value="http://www.eazel.com"/> -<oaf_attribute name="trilobite:info_url" type="string" value="http://www.eazel.com/sample/"/> -<oaf_attribute name="trilobite:icon" type="string" value="gnome-default-dlg.png"/> -<oaf_attribute name="trilobite:uri_scheme" type="string" value="eazel-sample:"/> -<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv"> -<item value="eazel-sample:"/> -</oaf_attribute> - -</oaf_server> - -</oaf_info> diff --git a/components/text/.cvsignore b/components/text/.cvsignore index 6f8fdd767..ca907d0e3 100644 --- a/components/text/.cvsignore +++ b/components/text/.cvsignore @@ -3,3 +3,4 @@ Makefile Makefile.in nautilus-text-view +Nautilus_View_text.oaf diff --git a/components/text/Makefile.am b/components/text/Makefile.am index 8bb38331d..1cca0503e 100644 --- a/components/text/Makefile.am +++ b/components/text/Makefile.am @@ -16,13 +16,6 @@ INCLUDES = \ $(BONOBO_CFLAGS) \ $(VFS_CFLAGS) -oafdir = $(datadir)/oaf -oaf_DATA = \ - nautilus-text-view.oafinfo - -uidir = $(datadir)/gnome/ui -ui_DATA = nautilus-text-view-ui.xml - bin_PROGRAMS = \ nautilus-text-view @@ -42,7 +35,17 @@ nautilus_text_view_LDADD = \ OBJECT_DIRECTORY_LIBS = $(GNOME_LIBS) $(OAF_LIBS) -EXTRA_DIST = \ - $(oaf_DATA) \ - $(ui_DATA) \ +uidir = $(datadir)/gnome/ui +ui_DATA = nautilus-text-view-ui.xml + +oafdir = $(datadir)/oaf +oaf_in_files = \ + Nautilus_View_text.oaf.in \ $(NULL) +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ + +EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA) + + diff --git a/components/text/Nautilus_View_text.oaf.in b/components/text/Nautilus_View_text.oaf.in index c2b05b0b1..1d056f47b 100644 --- a/components/text/Nautilus_View_text.oaf.in +++ b/components/text/Nautilus_View_text.oaf.in @@ -1,30 +1,30 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21" 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="Music view factory"/> -<oaf_attribute name="description" type="string" value="Factory for music 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:fa466311-17c1-435c-8231-c9fc434b6437" type="factory" location="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21"> -<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="bonobo:supported_uri_schemes" type="stringv"> -<item value="file"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Text"/> + <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="bonobo:supported_uri_schemes" type="stringv"> + <item value="file"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Text"/> </oaf_server> </oaf_info> diff --git a/components/text/Nautilus_View_text.server.in b/components/text/Nautilus_View_text.server.in index c2b05b0b1..1d056f47b 100644 --- a/components/text/Nautilus_View_text.server.in +++ b/components/text/Nautilus_View_text.server.in @@ -1,30 +1,30 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21" 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="Music view factory"/> -<oaf_attribute name="description" type="string" value="Factory for music 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:fa466311-17c1-435c-8231-c9fc434b6437" type="factory" location="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21"> -<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="bonobo:supported_uri_schemes" type="stringv"> -<item value="file"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Text"/> + <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="bonobo:supported_uri_schemes" type="stringv"> + <item value="file"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Text"/> </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 c2b05b0b1..1d056f47b 100644 --- a/components/text/Nautilus_View_text.server.in.in +++ b/components/text/Nautilus_View_text.server.in.in @@ -1,30 +1,30 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21" 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="Music view factory"/> -<oaf_attribute name="description" type="string" value="Factory for music 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:fa466311-17c1-435c-8231-c9fc434b6437" type="factory" location="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21"> -<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="bonobo:supported_uri_schemes" type="stringv"> -<item value="file"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Text"/> + <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="bonobo:supported_uri_schemes" type="stringv"> + <item value="file"/> + </oaf_attribute> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Text"/> </oaf_server> </oaf_info> diff --git a/components/text/nautilus-text-view.oafinfo b/components/text/nautilus-text-view.oafinfo deleted file mode 100644 index c2b05b0b1..000000000 --- a/components/text/nautilus-text-view.oafinfo +++ /dev/null @@ -1,37 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21" 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="Music view factory"/> -<oaf_attribute name="description" type="string" value="Factory for music view"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_text_view:fa466311-17c1-435c-8231-c9fc434b6437" type="factory" location="OAFIID:nautilus_text_view_factory:124ae209-d356-418f-8757-54e071cb3a21"> -<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="bonobo:supported_uri_schemes" type="stringv"> -<item value="file"/> -</oaf_attribute> -<oaf_attribute name="nautilus:view_as_name" type="string" value="Text"/> -</oaf_server> - -</oaf_info> - - - - - - - diff --git a/components/tree/.cvsignore b/components/tree/.cvsignore index 6568db933..4f52c48c3 100644 --- a/components/tree/.cvsignore +++ b/components/tree/.cvsignore @@ -5,3 +5,4 @@ Makefile.in nautilus-tree-view *.lo *.la +Nautilus_View_tree.oaf diff --git a/components/tree/Makefile.am b/components/tree/Makefile.am index 4dfa71895..ead973cf7 100644 --- a/components/tree/Makefile.am +++ b/components/tree/Makefile.am @@ -13,8 +13,6 @@ INCLUDES = \ $(BONOBO_CFLAGS) \ $(NULL) -oafdir = $(datadir)/oaf - TREE_VIEW_COMMON_SOURCES = \ nautilus-tree-change-queue.c \ nautilus-tree-change-queue.h \ @@ -34,22 +32,6 @@ TREE_VIEW_COMMON_SOURCES = \ $(NULL) -if TREE_VIEW_EXE_SERVER - -OAFINFO_FILE = nautilus-tree-view.oafinfo.exe - -bin_PROGRAMS = \ - nautilus-tree-view - -nautilus_tree_view_SOURCES = \ - $(TREE_VIEW_COMMON_SOURCES) \ - main.c \ - $(NULL) - -else - -OAFINFO_FILE = nautilus-tree-view.oafinfo.shlib - lib_LTLIBRARIES = \ libnautilus-tree-view.la @@ -58,31 +40,11 @@ libnautilus_tree_view_la_SOURCES = \ libmain.c \ $(NULL) -endif - - - - -nautilus_tree_view_LDADD = \ - $(top_builddir)/libnautilus/libnautilus.la \ - $(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \ - $(GNOMEUI_LIBS) \ - $(BONOBO_LIBS) \ - $(GCONF_LIBS) \ - $(VFS_LIBS) \ - $(OAF_LIBS) \ - $(NULL) - -EXTRA_DIST = nautilus-tree-view.oafinfo.shlib nautilus-tree-view.oafinfo.exe - -install-data-hook: $(oaf_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(oafdir) - $(INSTALL_DATA) $(srcdir)/$(OAFINFO_FILE) $(DESTDIR)$(oafdir)/nautilus-tree-view.oafinfo - -uninstall-local: - @$(NORMAL_UNINSTALL) - rm -f $(DESTDIR)$(oafdir)/nautilus-tree-view.oafinfo; +oafdir = $(datadir)/oaf +oaf_in_files = Nautilus_View_tree.oaf.in +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) +@XML_I18N_MERGE_OAF_RULE@ +EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) diff --git a/components/tree/Nautilus_View_tree.oaf.in b/components/tree/Nautilus_View_tree.oaf.in index 60e7e2e17..8db9d74a0 100644 --- a/components/tree/Nautilus_View_tree.oaf.in +++ b/components/tree/Nautilus_View_tree.oaf.in @@ -1,14 +1,14 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_tree_view:2d826a6e-1669-4a45-94b8-23d65d22802d" type="shlib" location="libnautilus-tree-view.so"> -<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="Nautilus Tree view"/> -<oaf_attribute name="description" type="string" value="Nautilus Tree sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Tree"/> + <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="Nautilus Tree view"/> + <oaf_attribute name="description" type="string" _value="Nautilus Tree sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Tree"/> </oaf_server> </oaf_info> diff --git a/components/tree/Nautilus_View_tree.server.in b/components/tree/Nautilus_View_tree.server.in index 60e7e2e17..8db9d74a0 100644 --- a/components/tree/Nautilus_View_tree.server.in +++ b/components/tree/Nautilus_View_tree.server.in @@ -1,14 +1,14 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_tree_view:2d826a6e-1669-4a45-94b8-23d65d22802d" type="shlib" location="libnautilus-tree-view.so"> -<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="Nautilus Tree view"/> -<oaf_attribute name="description" type="string" value="Nautilus Tree sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Tree"/> + <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="Nautilus Tree view"/> + <oaf_attribute name="description" type="string" _value="Nautilus Tree sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Tree"/> </oaf_server> </oaf_info> diff --git a/components/tree/Nautilus_View_tree.server.in.in b/components/tree/Nautilus_View_tree.server.in.in index 60e7e2e17..8db9d74a0 100644 --- a/components/tree/Nautilus_View_tree.server.in.in +++ b/components/tree/Nautilus_View_tree.server.in.in @@ -1,14 +1,14 @@ <oaf_info> <oaf_server iid="OAFIID:nautilus_tree_view:2d826a6e-1669-4a45-94b8-23d65d22802d" type="shlib" location="libnautilus-tree-view.so"> -<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="Nautilus Tree view"/> -<oaf_attribute name="description" type="string" value="Nautilus Tree sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Tree"/> + <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="Nautilus Tree view"/> + <oaf_attribute name="description" type="string" _value="Nautilus Tree sidebar panel"/> + <oaf_attribute name="nautilus:sidebar_panel_name" type="string" _value="Tree"/> </oaf_server> </oaf_info> diff --git a/components/tree/nautilus-tree-view.oafinfo.exe b/components/tree/nautilus-tree-view.oafinfo.exe deleted file mode 100644 index 53361385c..000000000 --- a/components/tree/nautilus-tree-view.oafinfo.exe +++ /dev/null @@ -1,22 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_tree_view_factory:79f93d13-d404-4ef6-8de2-b8a0045a96ab" type="exe" location="nautilus-tree-view"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/GenericFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="name" type="string" value="Nautilus Tree view factory"/> -<oaf_attribute name="description" type="string" value="Tree sidebar panel's factory"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_tree_view:2d826a6e-1669-4a45-94b8-23d65d22802d" type="factory" location="OAFIID:nautilus_tree_view_factory:79f93d13-d404-4ef6-8de2-b8a0045a96ab"> -<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="Nautilus Tree view"/> -<oaf_attribute name="description" type="string" value="Nautilus Tree sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Tree"/> -</oaf_server> - -</oaf_info> diff --git a/components/tree/nautilus-tree-view.oafinfo.shlib b/components/tree/nautilus-tree-view.oafinfo.shlib deleted file mode 100644 index 60e7e2e17..000000000 --- a/components/tree/nautilus-tree-view.oafinfo.shlib +++ /dev/null @@ -1,14 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_tree_view:2d826a6e-1669-4a45-94b8-23d65d22802d" type="shlib" location="libnautilus-tree-view.so"> -<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="Nautilus Tree view"/> -<oaf_attribute name="description" type="string" value="Nautilus Tree sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Tree"/> -</oaf_server> - -</oaf_info> diff --git a/components/websearch/.cvsignore b/components/websearch/.cvsignore deleted file mode 100644 index 2d652d5df..000000000 --- a/components/websearch/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -ntl-web-search diff --git a/components/websearch/Makefile.am b/components/websearch/Makefile.am deleted file mode 100644 index 6aac34eff..000000000 --- a/components/websearch/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -bin_PROGRAMS=ntl-web-search - -INCLUDES=\ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -DWEB_SEARCH_DATADIR=\""$(datadir)/websearch"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(GNOMEUI_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(BONOBO_CFLAGS) - -LDADD=\ - $(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \ - $(top_builddir)/libnautilus/libnautilus.la \ - $(BONOBO_LIBS) \ - $(GCONF_LIBS) \ - $(GNOMEUI_LIBS) - -ntl_web_search_SOURCES=ntl-web-search.c - -oafdir=$(datadir)/oaf -oaf_DATA=ntl-web-search.oafinfo - -enginesdir=$(datadir)/websearch -engines_DATA=standard.eng - -EXTRA_DIST=$(oaf_DATA) $(engines_DATA) diff --git a/components/websearch/ntl-web-search.c b/components/websearch/ntl-web-search.c deleted file mode 100644 index 680362ffa..000000000 --- a/components/websearch/ntl-web-search.c +++ /dev/null @@ -1,246 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ - -/* - * Nautilus - * - * Copyright (C) 1999, 2000 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this library; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Author: Elliot Lee <sopwith@redhat.com> - * - */ -/* ntl-web-search.c: Rewrite KWebSearch using Gtk+ and Nautilus */ - -#include <config.h> -#include <gnome.h> -#include <liboaf/liboaf.h> -#include <limits.h> -#include <ctype.h> - -#include <libnautilus/libnautilus.h> -#include <libnautilus/nautilus-clipboard.h> -#include <libnautilus-extensions/nautilus-undo-signal-handlers.h> - - - -typedef struct { - char *name, *url_head, *url_tail; -} EngineInfo; - -typedef struct { - NautilusView *view; - - GtkCList *clist; - - GtkWidget *btn_search; - GtkWidget *ent_params; - GtkWidget *opt_engine; - GtkWidget *menu_engine; - - EngineInfo *last_sel; - - BonoboUIHandler *uih; -} WebSearchView; - -static int object_count = 0; - -static void -do_search(GtkWidget *widget, WebSearchView *hview) -{ - char uri[PATH_MAX], real_query[PATH_MAX], *ctmp; - int i, j; - EngineInfo *ei; - - ctmp = gtk_entry_get_text(GTK_ENTRY(hview->ent_params)); - g_return_if_fail(ctmp); - - ei = hview->last_sel; - for(i = j = 0; ctmp[i]; i++) - { - if(isalnum(ctmp[i])) - real_query[j++] = ctmp[i]; - else - { - char dump[4]; - g_snprintf(dump, sizeof(dump), "%%%02x", (guint)ctmp[i]); - real_query[j] = '\0'; - strcat(&real_query[j], dump); - j += 3; - } - } - real_query[j] = '\0'; - g_snprintf(uri, sizeof(uri), "%s%s%s", ei->url_head?ei->url_head:"", real_query, ei->url_tail?ei->url_tail:""); - - nautilus_view_open_location(hview->view, uri); -} - -static void -do_destroy(GtkObject *obj) -{ - object_count--; - if(object_count <= 0) - gtk_main_quit(); -} - -static void -select_item(GtkObject *item, WebSearchView *hview) -{ - hview->last_sel = gtk_object_get_data(item, "EngineInfo"); -} - -static void -web_search_populate_engines(WebSearchView *hview) -{ - FILE *fh; - char aline[LINE_MAX]; - - fh = fopen(WEB_SEARCH_DATADIR "/standard.eng", "r"); - g_return_if_fail(fh); - - while(fgets(aline, sizeof(aline), fh)) - { - EngineInfo *ei; - char **pieces; - GtkWidget *w; - - g_strstrip(aline); - - if(aline[0] == '#' || !aline[0]) - continue; - - pieces = g_strsplit(aline, "|", 3); - - if(!pieces || !pieces[0] || !pieces[1]) - { - g_strfreev(pieces); - continue; - } - - ei = g_new0(EngineInfo, 1); - ei->name = pieces[0]; - ei->url_head = pieces[1]; - ei->url_tail = pieces[2]; - g_free(pieces); - - w = gtk_menu_item_new_with_label(ei->name); - gtk_signal_connect(GTK_OBJECT(w), "activate", select_item, hview); - gtk_object_set_data(GTK_OBJECT(w), "EngineInfo", ei); - - gtk_container_add(GTK_CONTAINER(hview->menu_engine), w); - gtk_widget_show(w); - if(!hview->last_sel) { - hview->last_sel = ei; - gtk_option_menu_set_history(GTK_OPTION_MENU(hview->opt_engine), 0); - } - } -} - -static BonoboObject * -make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure) -{ - GtkWidget *vbox; - WebSearchView *hview; - - g_return_val_if_fail(!strcmp(goad_id, "OAFIID:ntl_websearch_view:8216e1e4-6b01-4a28-82d9-5df30ed7d044"), NULL); - - hview = g_new0(WebSearchView, 1); - - - vbox = gtk_vbox_new(FALSE, GNOME_PAD); - - hview->btn_search = gnome_pixmap_button(gnome_stock_pixmap_widget (vbox, GNOME_STOCK_PIXMAP_SEARCH), _("Search")); - gtk_signal_connect(GTK_OBJECT(hview->btn_search), "clicked", do_search, hview); - gtk_box_pack_start(GTK_BOX(vbox), hview->btn_search, FALSE, FALSE, GNOME_PAD); - - hview->opt_engine = gtk_option_menu_new(); - hview->menu_engine = gtk_menu_new(); - gtk_option_menu_set_menu(GTK_OPTION_MENU(hview->opt_engine), hview->menu_engine); - gtk_container_add(GTK_CONTAINER(vbox), hview->opt_engine); - - web_search_populate_engines(hview); - - hview->ent_params = nautilus_entry_new(); - nautilus_undo_editable_set_undo_key ( GTK_EDITABLE (hview->ent_params), TRUE); - - gtk_signal_connect(GTK_OBJECT(hview->ent_params), "activate", do_search, hview); - gtk_container_add(GTK_CONTAINER(vbox), hview->ent_params); - -#if 0 - /* For now we just display the results as HTML */ - /* Results list */ - col_titles[0] = _("Results"); - clist = gtk_clist_new_with_titles(1, col_titles); - gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_BROWSE); - gtk_clist_columns_autosize(GTK_CLIST(clist)); - wtmp = gtk_scrolled_window_new(gtk_clist_get_hadjustment(GTK_CLIST(clist)), - gtk_clist_get_vadjustment(GTK_CLIST(clist))); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(wtmp), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(vbox), wtmp); - gtk_container_add(GTK_CONTAINER(wtmp), clist); - gtk_signal_connect(GTK_OBJECT(clist), "select_row", web_search_select_row, hview); -#endif - - gtk_widget_show_all(vbox); - - hview->clist = NULL; - - - /* create CORBA object */ - - hview->view = nautilus_view_new (vbox); - gtk_signal_connect(GTK_OBJECT (hview->view), "destroy", do_destroy, NULL); - object_count++; - - /* handle selections */ - nautilus_clipboard_set_up_editable (GTK_EDITABLE (hview->ent_params), - nautilus_view_get_bonobo_control (hview->view)); - - return BONOBO_OBJECT (hview->view); -} - -int main(int argc, char *argv[]) -{ - BonoboGenericFactory *factory; - CORBA_ORB orb; - char *registration_id; - - /* Initialize gettext support */ -#ifdef ENABLE_NLS /* sadly we need this ifdef because otherwise the following get empty statement warnings */ - bindtextdomain (PACKAGE, GNOMELOCALEDIR); - textdomain (PACKAGE); -#endif - - gnome_init_with_popt_table("ntl-web-search", VERSION, - argc, argv, - oaf_popt_options, 0, NULL); - - orb = oaf_init (argc, argv); - - bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL); - - - registration_id = oaf_make_registration_id ("OAFIID:ntl_websearch_view_factory:c69658b2-732c-4a04-a493-4efe57051291", g_getenv ("DISPLAY")); - factory = bonobo_generic_factory_new_multi (registration_id, make_obj, NULL); - g_free (registration_id); - - do { - bonobo_main(); - } while(object_count > 0); - - return 0; -} diff --git a/components/websearch/ntl-web-search.oafinfo b/components/websearch/ntl-web-search.oafinfo deleted file mode 100644 index 8480c05fd..000000000 --- a/components/websearch/ntl-web-search.oafinfo +++ /dev/null @@ -1,25 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:ntl_websearch_view_factory:c69658b2-732c-4a04-a493-4efe57051291" type="exe" location="ntl-web-search"> -<oaf_attribute name="repo_ids" type="stringv"> -<item value="IDL:GNOME/ObjectFactory:1.0"/> -</oaf_attribute> -<oaf_attribute name="description" type="string" value="Factory for history views"/> -</oaf_server> - -<oaf_server iid="OAFIID:ntl_websearch_view:8216e1e4-6b01-4a28-82d9-5df30ed7d044" type="factory" location="OAFIID:ntl_websearch_view_factory:c69658b2-732c-4a04-a493-4efe57051291"> -<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="description" type="string" value="Web Search sidebar panel for Nautilus"/> -<oaf_attribute name="name" type="string" value="Web Search sidebar panel"/> -<oaf_attribute name="nautilus:sidebar_panel_name" type="string" value="Web Search"/> -<oaf_attribute name="nautilus:recommended_uri_schemes" type="stringv"> -<item value="http"/> -</oaf_attribute> -</oaf_server> - -</oaf_info> - diff --git a/components/websearch/standard.eng b/components/websearch/standard.eng deleted file mode 100644 index 2cfde1e80..000000000 --- a/components/websearch/standard.eng +++ /dev/null @@ -1,25 +0,0 @@ -Altavista (WWW)|http://www.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=| -Goto (WWW)|http://service.bfast.com/bfast/click/goto?bfsiteid=401829&bfpage=search&Keywords=| -Lycos (WWW)|http://www.lycos.com/cgi-bin/pursuit?cat=dir&query=| -Google (WWW)|http://www.google.com/search?q=| -Northern Light (WWW)|http://www.northernlight.com/nlquery.fcg?qr=| -HotBot (WWW)|http://www.hotbot.com/?MT=|&SM=MC&DV=0&LG=any&DC=10&DE=2&_v=2&OPs=MDRTP -WebCrawler (WWW)|http://www.webcrawler.com/cgi-bin/WebQuery?searchText=| -Lycos FTP Search (Anonymous FTP Servers)|http://ftpsearch.lycos.com/cgi-bin/search?form=lycosnet&doit=Go+Get+It%21&filetype=All+files&query=| -Datahit (Meta engine)|http://www.datahit.com/cgi-bin/DH-engine?q=|&o=0&a=y&s=1&d=y&t=5&h=20&n=0&r=0001000001&zref=kwebsearch.linux.$VERSION$ -Ask Jeeves (Ask a Question)|http://www.ask.com/main/askJeeves.asp?origin=0&qSource=4&site_name=jeeves&metasearch=yes&ask=| -Yahoo (Catalogue)|http://search.yahoo.com/bin/search?p=| -Open Directory Project (Catalogue)|http://search.dmoz.org/cgi-bin/search?search=| -Deja (Usenet)|http://www.deja.com/qs.xp?OP=dnquery.xp&ST=QS&DBS=2&QRY=| -Audiofind (MP3s)|http://www.audiofind.com:70/?audiofindsize=0&audiofindsearch=| -Icecast (MP3 Streaming Servers)|http://yp.icecast.org/index.html?search=| -CDDB (Database of Song Titles, Albums etc.)|http://www.cddb.com/xm/search?q=|&f=artist&f=disc&f=track -Sunsite RFC Search (Internet RFCs)|http://sunsite.auc.dk:8765/query.html?col=sunsite&nh=10&lk=1&rf=0&qm=0&rq=1&oq=+url:sunsite.auc.dk/RFC/rfc/&qt=| -Webopedia (Encyclopedia about Internet Technique)|http://www.webopedia.com/search?keywords=| -Ebay (Internet Auction Items)|http://search.ebay.com/cgi-bin/texis/ebay/results.html?query=|&maxRecordsReturned=300&maxRecordsPerPage=50&SortProperty=MetaEndSort -Freshmeat (Linux Software)|http://core.freshmeat.net/search/search.php3?query=| -Linuxapps (Linux Software)|http://www.linuxapps.com/search.html?search=| -Filewatcher (Linux Software)|http://www.filewatcher.org/description-search/?q=| -Slashdot (Linux, Geek and ANTI-MS News)|http://slashdot.org/search.pl?query=| -Neworder (Hacking, security etc.)|http://neworder.box.sk/box.php3?act=2&prj=neworder&gfx=neworder&srch=| -KDE Mailing List Archives (only Subjects)|http://lists.kde.org/?w=2&r=1&s=|&q=t diff --git a/configure.in b/configure.in index ca186d4c8..26dca76be 100644 --- a/configure.in +++ b/configure.in @@ -14,6 +14,8 @@ AM_MAINTAINER_MODE AM_DISABLE_STATIC AM_PROG_LIBTOOL +AM_PROG_XML_I18N_TOOLS + AM_SANITY_CHECK AC_PROG_CC AC_PROG_CPP @@ -56,17 +58,6 @@ AC_CHECK_FUNCS(setmntent endmntent setenv unsetenv putenv) AC_CHECK_HEADERS(sys/mnttab.h sys/vfstab.h) -dnl Tree view build as executable - -TREE_VIEW_EXE_SERVER=0 - -AC_ARG_ENABLE(tree-view-exe-server, -[ --enable-tree-view-exe-server Build tree as executable component instead of shlib], -TREE_VIEW_EXE_SERVER="$enableval", -TREE_VIEW_EXE_SERVER=0) - -AM_CONDITIONAL(TREE_VIEW_EXE_SERVER, test "x$TREE_VIEW_EXE_SERVER" = "x1") - dnl ==================================== dnl = Begin tests for eazel-services @@ -827,11 +818,6 @@ components/services/summary/nautilus-view/icons/Makefile components/services/summary/nautilus-view/icons/gray_tab_pieces/Makefile components/services/vault/Makefile components/services/vault/command-line/Makefile -components/services/time/Makefile -components/services/time/service/Makefile -components/services/time/command-line/Makefile -components/services/time/nautilus-view/Makefile -components/services/time/idl/Makefile components/text/Makefile components/text/services/Makefile components/loser/Makefile @@ -888,17 +874,7 @@ echo " Eazel services : NO" ;; esac -dnl <= Tree view as exe or shlib => -case "X$TREE_VIEW_EXE_SERVER" in -X1) -echo " -Tree View : Executable" -;; -*) -echo " -Tree View : Shared Library" -;; -esac + echo "=>" dnl <= Profile support? => case "X$ENABLE_PROFILER" in diff --git a/po/POTFILES.in b/po/POTFILES.in index 983098d0e..0beafe6c5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,26 +1,39 @@ +#helper-utilities/error-dialog/nautilus-error-dialog.c applets/launcher/nautilus-launcher-applet.c +components/adapter/Nautilus_ComponentAdapterFactory_std.oaf.in +components/hardware/Nautilus_View_hardware.oaf.in components/hardware/nautilus-hardware-view.c +components/help/Nautilus_View_help.oaf.in components/help/converters/gnome-db2html2/gdb3html.c components/help/converters/gnome-db2html2/sect-elements.c components/help/converters/gnome-db2html2/toc-elements.c components/help/hyperbola-filefmt.c components/help/hyperbola-nav-index.c components/help/hyperbola-types.h +components/history/Nautilus_View_history.oaf.in components/history/nautilus-history-view.c +components/image-viewer/Nautilus_View_image.oaf.in components/image-viewer/nautilus-image-view.c +components/loser/content/Nautilus_View_content-loser.oaf.in components/loser/content/nautilus-content-loser-ui.xml components/loser/content/nautilus-content-loser.c +components/loser/sidebar/Nautilus_View_sidebar-loser.oaf.in components/loser/sidebar/nautilus-sidebar-loser-ui.xml components/loser/sidebar/nautilus-sidebar-loser.c +components/mozilla/Nautilus_View_mozilla.oaf.in components/mozilla/mozilla-preferences.cpp components/mozilla/nautilus-mozilla-content-view.c components/mozilla/nautilus-mozilla-ui.xml +components/music/Nautilus_View_music.oaf.in components/music/mpg123.c components/music/nautilus-music-view.c +components/notes/Nautilus_View_notes.oaf.in components/notes/nautilus-notes.c +components/rpmview/Nautilus_View_rpm.oaf.in components/rpmview/nautilus-rpm-verify-window.c components/rpmview/nautilus-rpm-view-install.c components/rpmview/nautilus-rpm-view.c +components/sample/Nautilus_View_sample.oaf.in components/sample/nautilus-sample-content-view-ui.xml components/sample/nautilus-sample-content-view.c components/services/install/command-line/eazel-alt-install-corba.c @@ -37,9 +50,13 @@ components/services/install/lib/eazel-package-system-rpm3.c components/services/install/lib/eazel-package-system-types.c components/services/install/lib/eazel-package-system.c components/services/install/lib/eazel-softcat.c +components/services/install/nautilus-view/Nautilus_View_install.oaf.in components/services/install/nautilus-view/nautilus-service-install-view.c +components/services/install/server/Trilobite_Service_install.oaf.in +components/services/login/nautilus-view/Nautilus_View_change-password.oaf.in components/services/login/nautilus-view/nautilus-change-password-view.c components/services/summary/lib/eazel-summary-shared.c +components/services/summary/nautilus-view/Nautilus_View_services-summary.oaf.in components/services/summary/nautilus-view/nautilus-summary-dialogs.c components/services/summary/nautilus-view/nautilus-summary-view-private.h components/services/summary/nautilus-view/nautilus-summary-view-ui.xml @@ -50,14 +67,18 @@ components/services/time/nautilus-view/trilobite-eazel-time-view.c components/services/time/service/main.c components/services/time/service/trilobite-eazel-time-service.c components/services/trilobite/libtrilobite/trilobite-core-utils.c +components/services/trilobite/sample/nautilus-view/Nautilus_View_service-sample.oaf.in +components/services/trilobite/sample/service/Trilobite_Service_sample.oaf.in components/services/vault/command-line/main.c +components/shell/Nautilus_View_shell.oaf.in +components/text/Nautilus_View_text.oaf.in +components/tree/Nautilus_View_tree.oaf.in data/browser.xml data/linksets/apps.xml data/linksets/desktop.xml data/linksets/portals.xml data/linksets/search_engines.xml data/static_bookmarks.xml -#helper-utilities/error-dialog/nautilus-error-dialog.c icons/ardmore/ardmore.xml icons/arlo/arlo.xml icons/default.xml @@ -92,6 +113,7 @@ libnautilus-extensions/nautilus-user-level-manager.c libnautilus-extensions/nautilus-volume-monitor.c libnautilus/nautilus-clipboard-ui.xml libnautilus/nautilus-clipboard.c +src/Nautilus_shell.oaf.in src/file-manager/fm-desktop-icon-view.c src/file-manager/fm-directory-view.c src/file-manager/fm-error-reporting.c diff --git a/po/README.tools b/po/README.tools deleted file mode 100644 index 4ec99c164..000000000 --- a/po/README.tools +++ /dev/null @@ -1,58 +0,0 @@ -The po/ directory includes two perlscripts, which is done to help -making the translations fully uptodate. - -The first script is called update.pl and is supposed to be run like this: - - ./update.pl [OPTIONS] ...LANGCODE - -This will updates the pot file (the po template, generated from the source code) -and merge them with the translations po files. - -For instance to do this for Danish, type the following - - ./update.pl da - - -The update.pl script also supports other options, they are: - - -V, --version shows the version - -H, --help shows this help page - -P, --pot only generates the potfile - -M, --maintain search for missing files in POTFILES.in - -Especially the --maintain option is very handy for package maintainer, to check -if you included all the files that have marked strings in the POTFILES.in, so -they will be in the generated po template, the socalled pot file. - -There is though one thing to take notice of with this option, please check the -configure.in file to make sure that the files you add to POTFILES.in are being -build, otherwise this can leed to "make dist" throuble. - - -The other utility is the desk.pl script, which will check the cvs module for -missing translation in files like *.desktop, *.directory, *.soundlist and so on. - -Run the script like this: - - ./desk.pl [OPTIONS] ...LANGCODE ENTRY - -An example use could be. - - ./desk.pl da - -which will check all the files for missing Name[da] entries, or - - ./desk.pl no Comment - -which will check all the files for missing Comment[no] entries. "Comment" can -here be replaced with whatever you like - -All scripts support the --help option for further help, though it's not very -extensive for the moment. - -Kenneth Christiansen - -kenneth@gnu.org -kenneth@gnome.org - -Both scripts are copyright 2000 The Free Software Foundation and me. diff --git a/po/ui-extract.pl b/po/ui-extract.pl deleted file mode 100755 index 7d9aaa984..000000000 --- a/po/ui-extract.pl +++ /dev/null @@ -1,255 +0,0 @@ -#!/usr/bin/perl -w - -# -# The XML UI Translation Extractor -# -# Copyright (C) 2000 Free Software Foundation. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This script is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this library; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# Authors: Kenneth Christiansen <kenneth@gnu.org> -# - - - -use strict; -use File::Basename; -use Getopt::Long; - -#--------------------------- - -my $VERSION = "0.8"; - -#--------------------------- - -my $LOCAL_ARG = "0"; -my $HELP_ARG = "0"; -my $VERSION_ARG = "0"; -my $UPDATE_ARG = "0"; - -#--------------------------- - -my $FILE; -my $OUTFILE; - -#--------------------------- - -my %string = (); -my @elements; -my $n; - -#--------------------------- - -$| = 1; - -GetOptions ( - "local|l" => \$LOCAL_ARG, - "help|h|?" => \$HELP_ARG, - "version|v" => \$VERSION_ARG, - "update" => \$UPDATE_ARG, - ) or &Error; - -&SplitOnArgument; - - -#--------------------------------------------------- -# Check for options. -# This section will check for the different options. -#--------------------------------------------------- - -sub SplitOnArgument { - - if ($VERSION_ARG) { - &Version; - - } elsif ($HELP_ARG) { - &Help; - - } elsif ($LOCAL_ARG) { - &PlaceLocal; - &Preparation; - &WriteFile; - - } elsif ($UPDATE_ARG) { - &PlaceNormal; - &Preparation; - &WriteFile; - - } elsif (@ARGV > 0) { - &PlaceNormal; - &Message; - &Preparation; - &WriteFile; - - } else { - &Help; - - } -} - -sub PlaceNormal { - $FILE = $ARGV[0]; - $OUTFILE = "$FILE.h"; -} - -sub PlaceLocal { - $FILE = $ARGV[0]; - $OUTFILE = fileparse($FILE, ()); - if (!-e "tmp/") { - system("mkdir tmp/"); - } - $OUTFILE = "./tmp/$OUTFILE.h" -} - - -#------------------- -sub Version{ - print "The XML UI Translations Extractor $VERSION\n"; - print "Written by Kenneth Christiansen, 2000.\n\n"; - print "Copyright (C) 2000 Free Software Foundation, Inc.\n"; - print "This is free software; see the source for copying conditions. There is NO\n"; - print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; - exit; -} - -#------------------- -sub Help{ - print "Usage: ui-extract.pl [FILENAME] [OPTIONS] ...\n"; - print "Generates a headerfile from an xml source.\n\nGraps all strings "; - print "between <_translatable_node> and it's end tag,\nwhere tag are all allowed "; - print "xml tags. Read the docs for more info.\n\n"; - print " -V, --version shows the version\n"; - print " -H, --help shows this help page\n"; - print "\nReport bugs to <kenneth\@gnu.org>.\n"; - exit; -} - -#------------------- -sub Error{ -# print "ui-extract: invalid option @ARGV\n"; - print "Try `ui-extract.pl --help' for more information.\n"; - exit; -} - -sub Message { - print "Generating headerfile for XML translation.\n"; -} - -sub Preparation { - - if (-s "$OUTFILE"){ - unlink "$OUTFILE"; - } - - &Convert ($FILE); -} - -sub WriteFile { - - open OUT, ">>$OUTFILE"; - &addMessages; - close OUT; - - print "Wrote $OUTFILE\n"; -} - -#------------------- -sub Convert($) { - - #----------------- - # Reading the file - #----------------- - my $input; { - local (*IN); - local $/; #slurp mode - open (IN, "<$FILE") || die "can't open $FILE: $!"; - $input = <IN>; - } - - if (!-s "$OUTFILE"){ - open OUT, ">$OUTFILE"; - close OUT; - } - - ### For generic translatable XML files ### - - if ($FILE =~ /xml$/sg){ - while ($input =~ /[\t\n\s]_[a-zA-Z0-9_]+=\"([^\"]+)\"/sg) { - $string{$1} = []; - } - - while ($input =~ /<_[a-zA-Z0-9_]+>(..[^_]*)<\/_[a-zA-Z0-9_]+>/sg) { - $string{$1} = []; - }} - - ### For translatable Glade XML files ### - - if ($FILE =~ /glade$/sg){ - my $translate = "label|title|text|format|copyright|comments|preview_text|tooltip"; - - while ($input =~ /<($translate)>(..[^<]*)<\/($translate)>/sg) { - - # Glade has some bugs, especially it uses translations tags to contain little - # non-translatable content. We work around this, by not including these - # strings that only includes something like: label4, and window1 - if ($2 =~ /^(window|label)[0-9]$/g) { - } else { - $string{$2} = []; - } - }} - } - -sub addMessages{ - - foreach my $theMessage (sort keys %string) { - my ($lineNo,$fileName) = @{ $string{$theMessage} }; - - if ($theMessage =~ /\n/) { - - $n = 1; - - @elements = split (/\n/, $theMessage); - for ($n = 0; $n < @elements; $n++) { - - # Replace XML codes for special chars to - # geniune gettext syntax - #--------------------------------------- - $elements[$n] =~ s/"/\\"/mg; - - if ($n == 0) { - print OUT "char *s = N_"; - print OUT "(\"$elements[$n]\\n\");\n"; - } - - elsif ($n == @elements - 1) { - print OUT " "; - print OUT "(\"$elements[$n]\");\n"; - } - - elsif ($n > 0) { - print OUT " "; - print OUT "(\"$elements[$n]\\n\");\n"; - } - } - - } else { - - print OUT "char *s = N_(\"$theMessage\");\n"; - - } - - } -} - diff --git a/po/ui-testcases.glade b/po/ui-testcases.glade deleted file mode 100644 index 040ddcb6b..000000000 --- a/po/ui-testcases.glade +++ /dev/null @@ -1,3 +0,0 @@ -<title><bla>This is eviltest 1</bla></title> -<title>This is test 1</title> -<_link>This is eviltest 2<\_link> diff --git a/po/ui-testcases.xml b/po/ui-testcases.xml deleted file mode 100644 index 10cb01231..000000000 --- a/po/ui-testcases.xml +++ /dev/null @@ -1,5 +0,0 @@ -<node1 _test="This is test 1: lalalala"\> -<node2_do_not_translate="This is eviltest 1"\> -<node3 _test="This is test 2: tabtest"\> -<node4 -_test="This is test 3: newline"\> diff --git a/po/update.pl b/po/update.pl deleted file mode 100755 index 2e6a6d331..000000000 --- a/po/update.pl +++ /dev/null @@ -1,339 +0,0 @@ -#!/usr/bin/perl -w - -# -# GNOME PO Update Utility -# -# Copyright (C) 2000 Free Software Foundation. -# -# This script is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This script is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this library; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -# Authors: Kenneth Christiansen <kenneth@gnu.org> -# - -# NOTICE: Please remember to change the variable $PACKAGE to reflect -# the package this script is used within. - - - -use File::Basename; - -# Declare global variables -#------------------------- -my $VERSION = "1.5 beta 7"; -my $LANG = $ARGV[0]; - -# Always print as the first thing -#-------------------------------- -$| = 1; - -# Figure out what package that is in use -#--------------------------------------- -open FILE, "../configure.in"; - while (<FILE>) { - next if /^dnl/; #ignore comments - if ($_=~/AM_INIT_AUTOMAKE\((.*),(.*)\)/o){ - $PACKAGE=$1; - last; #stop when found - } - if ($_=~/PACKAGE\((.*)\)/o){ - $PACKAGE=$1; - last; #stop when found - } - } -close FILE; - - -# Give error if script is run without an argument -#------------------------------------------------ -if (! $LANG){ - print "update.pl: missing file arguments\n"; - print "Try `update.pl --help' for more information.\n"; - exit; -} - -# Use the supplied arguments -#--------------------------- -if ($LANG=~/^-(.)*/){ - - if ("$LANG" eq "--version" || "$LANG" eq "-V"){ - &Version; - } - elsif ($LANG eq "--help" || "$LANG" eq "-H"){ - &Help; - } - elsif ($LANG eq "--dist" || "$LANG" eq "-D"){ - &Merging; - } - elsif ($LANG eq "--pot" || "$LANG" eq "-P"){ - &GenHeaders; - &GeneratePot; - exit; - } - elsif ($LANG eq "--headers" || "$LANG" eq "-S"){ - &GenHeaders; - exit; - } - elsif ($LANG eq "--maintain" || "$LANG" eq "-M"){ - &Maintain; - } - else { - &InvalidOption; - } - -} else { - - # Run standard procedure - #----------------------- - if(-s "$LANG.po"){ - &GenHeaders; - &GeneratePot; - &Merging; - &Status; - } - - # Report error if the language file supplied - # to the command line is non-existent - #------------------------------------------- - else { - &NotExisting; - } -} - -sub Version{ - - # Print version information - #-------------------------- - print "GNOME PO Updater $VERSION\n"; - print "Written by Kenneth Christiansen <kenneth\@gnome.org>, 2000.\n\n"; - print "Copyright (C) 2000 Free Software Foundation, Inc.\n"; - print "This is free software; see the source for copying conditions. There is NO\n"; - print "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"; - exit; -} - -sub Help{ - - # Print usage information - #------------------------ - print "Usage: ./update.pl [OPTIONS] ...LANGCODE\n"; - print "Updates pot files and merge them with the translations.\n\n"; - print " -H, --help shows this help page\n"; - print " -P, --pot generate the pot file only\n"; - print " -S, --headers generate the XML headerfiles in POTFILES.in\n"; - print " -M, --maintain search for missing files in POTFILES.in\n"; - print " -V, --version shows the version\n"; - print "\nExamples of use:\n"; - print "update.sh --pot just creates a new pot file from the source\n"; - print "update.sh da created new pot file and updated the da.po file\n\n"; - print "Report bugs to <kenneth\@gnome.org>.\n"; - exit; -} - -sub Maintain{ - - # Search and fine, all translatable files - # --------------------------------------- - $i18nfiles="find ../ -print | egrep '.*\\.(c|y|cc|c++|h|gob)' "; - - open(BUF2, "POTFILES.in") || die "update.pl: there's no POTFILES.in!!!\n"; - - print "Searching for missing _(\" \") entries...\n"; - - open(BUF1, "$i18nfiles|"); - - @buf1_1 = <BUF1>; - @buf1_2 = <BUF2>; - - # Check if we should ignore some found files, when - # comparing with POTFILES.in - #------------------------------------------------- - if (-s ".potignore"){ - open FILE, ".potignore"; - while (<FILE>) { - if ($_=~/^[^#]/o){ - push @bup, $_; - } - } - print "Found .potignore: Ignoring files...\n"; - @buf1_2 = (@bup, @buf1_2); - } - - foreach my $file (@buf1_1){ - open FILE, "<$file"; - while (<FILE>) { - if ($_=~/_\(\"/o){ - $file = unpack("x3 A*",$file) . "\n"; - push @buf2_1, $file; - last; - } - } - } - - @buf3_1 = sort (@buf2_1); - @buf3_2 = sort (@buf1_2); - - my %in2; - foreach (@buf3_2) { - $in2{$_} = 1; - } - - foreach (@buf3_1){ - if (!exists($in2{$_})){ - push @result, $_ - } - } - - # Save file with information about the files missing - # if any, and give information about this proceedier - #--------------------------------------------------- - if(@result){ - open OUT, ">missing"; - print OUT @result; - print "\nHere is the result:\n\n", @result, "\n"; - print "The file \"missing\" has been placed in the current directory.\n"; - print "Files supposed to be ignored should be placed in \".potignore\"\n"; - } - - # If there is nothing to complain about, notice the user - #------------------------------------------------------- - else{ - print "\nWell, it's all perfect! Congratulation!\n"; - } -} - -sub InvalidOption{ - - # Handle invalid arguments - #------------------------- - print "update.pl: invalid option -- $LANG\n"; - print "Try `update.pl --help' for more information.\n"; -} - -sub GenHeaders{ - - # Generate the .h header files, so we can allow glade and - # xml translation support - #-------------------------------------------------------- - if(-s "ui-extract.pl"){ - - print "Found ui-extract.pl script\nRunning ui-extract...\n"; - - open FILE, "<POTFILES.in"; - while (<FILE>) { - - # Find .xml files in POTFILES.in and generate the - # files with help from the ui-extract.pl script - #-------------------------------------------------- - if ($_=~ /(.*)(\.xml)/o){ - $filename = "../$1.xml"; - $xmlfiles="perl \.\/ui-extract.pl --local $filename"; - system($xmlfiles); - } - - # Find .glade files in POTFILES.in and generate - # the files with help from the ui-extract.pl script - #-------------------------------------------------- - elsif ($_=~ /(.*)(\.glade)/o){ - $filename = "../$1.glade"; - $xmlfiles="perl \.\/ui-extract.pl --local $filename"; - system($xmlfiles); - } - } - close FILE; - } -} - -sub GeneratePot{ - - # Generate the potfiles from the POTFILES.in file - #------------------------------------------------ - - print "Building the $PACKAGE.pot...\n"; - - system ("mv POTFILES.in POTFILES.in.old"); - - open INFILE, "<POTFILES.in.old"; - open OUTFILE, ">POTFILES.in"; - while (<INFILE>) { - if ($_ =~ /\.(glade|xml)$/) { - s/\.glade$/\.glade\.h/; - s/\.xml$/\.xml\.h/; - $_ = basename($_); - $_ = "po/tmp/$_\n"; - } - print OUTFILE $_; - } - close OUTFILE; - close INFILE; - - $GETTEXT ="xgettext --default-domain\=$PACKAGE --directory\=\.\." - ." --add-comments --keyword\=\_ --keyword\=N\_" - ." --files-from\=\.\/POTFILES\.in "; - $GTEST ="test \! -f $PACKAGE\.po \|\| \( rm -f \.\/$PACKAGE\.pot " - ."&& mv $PACKAGE\.po \.\/$PACKAGE\.pot \)"; - - system($GETTEXT); - system($GTEST); - print "Wrote $PACKAGE.pot\n"; - system("mv POTFILES.in.old POTFILES.in"); - -} - -sub Merging{ - - if ($ARGV[1]){ - $LANG = $ARGV[1]; - } else { - $LANG = $ARGV[0]; - } - - if ($ARGV[0] ne "--dist" && $ARGV[0] ne "-D") { - print "Merging $LANG.po with $PACKAGE.pot..."; - } - - $MERGE="cp $LANG.po $LANG.po.old && msgmerge $LANG.po.old $PACKAGE.pot -o $LANG.po"; - - system($MERGE); - - if ($ARGV[0] ne "--dist" && $ARGV[0] ne "-D") { - print "\n\n"; - } - - # Remove the "messages" trash file generated - # by gettext, aswell as the backup file - #------------------------------------------- - unlink "messages"; - unlink "$LANG.po.old"; -} - -sub NotExisting{ - - # Report error if supplied language - # file is non-existant - #---------------------------------- - print "update.pl: sorry, $LANG.po does not exist!\n"; - print "Try `update.pl --help' for more information.\n"; - exit; -} - -sub Status{ - - # Print status information about the po file - #------------------------------------------- - $STATUS="msgfmt --statistics $LANG.po"; - - system($STATUS); - print "\n"; -} diff --git a/po/update.sh b/po/update.sh deleted file mode 100755 index 901d2cebf..000000000 --- a/po/update.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -VERSION="1.2.5" -PACKAGE="nautilus" - -if [ "x$1" = "x--help" ]; then - -echo Usage: ./update.sh langcode -echo --help display this help and exit -echo --missing search for missing files in POTFILES.in -echo --version shows the version -echo -echo Examples of use: -echo ./update.sh ----- just creates a new pot file from the source -echo ./update.sh da -- created new pot file and updated the da.po file - -elif [ "x$1" = "x--version" ]; then - -echo "update.sh release $VERSION" - -elif [ "x$1" = "x--missing" ]; then - -echo "Searching for files containing _( ) but missing in POTFILES.in..." -echo -find ../ -print | egrep '.*\.(c|y|cc|c++|h|gob)' | xargs grep _\( | cut -d: -f1 | uniq | cut -d/ -f2- > POTFILES.in.missing -wait - -echo "Sorting data..." -sort -d POTFILES.in -o POTFILES.in && -sort -d POTFILES.in.missing -o POTFILES.in.missing -wait -echo "Comparing data..." -diff POTFILES.in POTFILES.in.missing -u0 | grep '^+' |grep -v '^+++'|grep -v '^@@' > POTFILES.in.missing -wait - -if [ -s POTFILES.ignore ]; then - -sort -d POTFILES.ignore -o POTFILES.tmp -echo "Evaluating ignored files..." -wait -diff POTFILES.tmp POTFILES.in.missing -u0 | grep '^+' |grep -v '^+++'|grep -v '^@@' > POTFILES.in.missing -rm POTFILES.tmp - -fi - -if [ -s POTFILES.in.missing ]; then - -echo && echo "Here are the results:" -echo && cat POTFILES.in.missing -echo && echo "File POTFILES.in.missing is being placed in directory..." -echo "Please add the files that should be ignored in POTFILES.ignore" - -else - -echo &&echo "There are no missing files, thanks God!" -rm POTFILES.in.missing - -fi - -elif [ "x$1" = "x" ]; then - -echo "Building the $PACKAGE.pot ..." - -xgettext --default-domain=$PACKAGE --directory=.. \ - --add-comments --keyword=_ --keyword=N_ \ - --files-from=./POTFILES.in \ -&& test ! -f $PACKAGE.po \ - || ( rm -f ./$PACKAGE.pot \ -&& mv $PACKAGE.po ./$PACKAGE.pot ); - -else - -if [ -s $1.po ]; then - -xgettext --default-domain=$PACKAGE --directory=.. \ - --add-comments --keyword=_ --keyword=N_ \ - --files-from=./POTFILES.in \ -&& test ! -f $PACKAGE.po \ - || ( rm -f ./PACKAGE.pot \ -&& mv $PACKAGE.po ./$PACKAGE.pot ); - -echo "Building the $PACKAGE.pot ..." -echo "Now merging $1.po with $PACKAGE.pot, and creating an updated $1.po ..." - -mv $1.po $1.po.old && msgmerge $1.po.old $PACKAGE.pot -o $1.po \ -&& rm $1.po.old; - -msgfmt --statistics $1.po - -else - -echo Sorry $1.po does not exist! - -fi; - -fi; diff --git a/src/.cvsignore b/src/.cvsignore index 95ce69855..2f06aef59 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -9,3 +9,4 @@ nautilus-shell-interface-stubs.c nautilus-shell-interface.h nautilus-shell-ui.xml.h nautilus_shell_interface_idl_stamp +Nautilus_shell.oaf diff --git a/src/Makefile.am b/src/Makefile.am index 1d3f0040d..7eecf6c20 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -143,7 +143,10 @@ nautilus_shell_interface_idl_stamp: $(ORBIT_IDL) nautilus-shell-interface.idl $( TESTS=check-nautilus oafdir = $(datadir)/oaf -oaf_DATA = nautilus.oafinfo +oaf_in_files = Nautilus_shell.oaf.in +oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) + +@XML_I18N_MERGE_OAF_RULE@ uidir = $(datadir)/gnome/ui ui_DATA = \ @@ -156,7 +159,8 @@ CLEANFILES = \ nautilus_shell_interface_idl_stamp \ $(NULL) -EXTRA_DIST = \ +EXTRA_DIST = \ + $(oaf_in_files) \ $(oaf_DATA) \ $(ui_DATA) \ check-nautilus \ diff --git a/src/Nautilus_shell.oaf.in b/src/Nautilus_shell.oaf.in index b7f7a2a49..e6303eb3a 100644 --- a/src/Nautilus_shell.oaf.in +++ b/src/Nautilus_shell.oaf.in @@ -4,8 +4,8 @@ <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus factory"/> - <oaf_attribute name="description" type="string" value="Factory for Nautilus shell and file manager"/> + <oaf_attribute name="name" type="string" _value="Nautilus factory"/> + <oaf_attribute name="description" type="string" _value="Factory for Nautilus shell and file manager"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> @@ -14,8 +14,8 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus file manager icon view"/> - <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows a two-dimensional icon space"/> + <oaf_attribute name="name" type="string" _value="Nautilus file manager icon view"/> + <oaf_attribute name="description" type="string" _value="Nautilus file manager component that shows a two-dimensional icon space"/> <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> <item value="x-directory/normal"/> <item value="x-directory/webdav"/> @@ -24,7 +24,7 @@ <item value="gnome-trash"/> <item value="trash"/> </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Icons"/> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Icons"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_file_manager_desktop_icon_view:8d8121b1-0f1e-400b-bf0d-5b0f4555f5e1" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> @@ -33,8 +33,8 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus file manager desktop icon view"/> - <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows icons on the the desktop"/> + <oaf_attribute name="name" type="string" _value="Nautilus file manager desktop icon view"/> + <oaf_attribute name="description" type="string" _value="Nautilus file manager component that shows icons on the the desktop"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> @@ -43,8 +43,8 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus file manager list view"/> - <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows a scrollable list"/> + <oaf_attribute name="name" type="string" _value="Nautilus file manager list view"/> + <oaf_attribute name="description" type="string" _value="Nautilus file manager component that shows a scrollable list"/> <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> <item value="x-directory/normal"/> <item value="x-directory/webdav"/> @@ -53,7 +53,7 @@ <item value="gnome-trash"/> <item value="trash"/> </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="List"/> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="List"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_file_manager_search_list_view:b186e381-198e-43cf-9c46-60b6bb35db0b" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> @@ -62,12 +62,12 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus file manager search results list view"/> - <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows a scrollable list for search results"/> + <oaf_attribute name="name" type="string" _value="Nautilus file manager search results list view"/> + <oaf_attribute name="description" type="string" _value="Nautilus file manager component that shows a scrollable list for search results"/> <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> <item value="x-directory/search"/> </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Search List"/> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Search List"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_shell:cd5183b2-3913-4b74-9b8e-10528b0de08d" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> @@ -75,8 +75,8 @@ <item value="IDL:Bonobo/Unknown:1.0"/> <item value="IDL:Nautilus/Shell:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus shell"/> - <oaf_attribute name="description" type="string" value="Nautilus shell operations that can be done from subsequent command-line invocations"/> + <oaf_attribute name="name" type="string" _value="Nautilus shell"/> + <oaf_attribute name="description" type="string" _value="Nautilus shell operations that can be done from subsequent command-line invocations"/> </oaf_server> </oaf_info> diff --git a/src/Nautilus_shell.server.in b/src/Nautilus_shell.server.in index b7f7a2a49..e6303eb3a 100644 --- a/src/Nautilus_shell.server.in +++ b/src/Nautilus_shell.server.in @@ -4,8 +4,8 @@ <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus factory"/> - <oaf_attribute name="description" type="string" value="Factory for Nautilus shell and file manager"/> + <oaf_attribute name="name" type="string" _value="Nautilus factory"/> + <oaf_attribute name="description" type="string" _value="Factory for Nautilus shell and file manager"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> @@ -14,8 +14,8 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus file manager icon view"/> - <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows a two-dimensional icon space"/> + <oaf_attribute name="name" type="string" _value="Nautilus file manager icon view"/> + <oaf_attribute name="description" type="string" _value="Nautilus file manager component that shows a two-dimensional icon space"/> <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> <item value="x-directory/normal"/> <item value="x-directory/webdav"/> @@ -24,7 +24,7 @@ <item value="gnome-trash"/> <item value="trash"/> </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Icons"/> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Icons"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_file_manager_desktop_icon_view:8d8121b1-0f1e-400b-bf0d-5b0f4555f5e1" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> @@ -33,8 +33,8 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus file manager desktop icon view"/> - <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows icons on the the desktop"/> + <oaf_attribute name="name" type="string" _value="Nautilus file manager desktop icon view"/> + <oaf_attribute name="description" type="string" _value="Nautilus file manager component that shows icons on the the desktop"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> @@ -43,8 +43,8 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus file manager list view"/> - <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows a scrollable list"/> + <oaf_attribute name="name" type="string" _value="Nautilus file manager list view"/> + <oaf_attribute name="description" type="string" _value="Nautilus file manager component that shows a scrollable list"/> <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> <item value="x-directory/normal"/> <item value="x-directory/webdav"/> @@ -53,7 +53,7 @@ <item value="gnome-trash"/> <item value="trash"/> </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="List"/> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="List"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_file_manager_search_list_view:b186e381-198e-43cf-9c46-60b6bb35db0b" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> @@ -62,12 +62,12 @@ <item value="IDL:Bonobo/Control:1.0"/> <item value="IDL:Nautilus/View:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus file manager search results list view"/> - <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows a scrollable list for search results"/> + <oaf_attribute name="name" type="string" _value="Nautilus file manager search results list view"/> + <oaf_attribute name="description" type="string" _value="Nautilus file manager component that shows a scrollable list for search results"/> <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> <item value="x-directory/search"/> </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Search List"/> + <oaf_attribute name="nautilus:view_as_name" type="string" _value="Search List"/> </oaf_server> <oaf_server iid="OAFIID:nautilus_shell:cd5183b2-3913-4b74-9b8e-10528b0de08d" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> @@ -75,8 +75,8 @@ <item value="IDL:Bonobo/Unknown:1.0"/> <item value="IDL:Nautilus/Shell:1.0"/> </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus shell"/> - <oaf_attribute name="description" type="string" value="Nautilus shell operations that can be done from subsequent command-line invocations"/> + <oaf_attribute name="name" type="string" _value="Nautilus shell"/> + <oaf_attribute name="description" type="string" _value="Nautilus shell operations that can be done from subsequent command-line invocations"/> </oaf_server> </oaf_info> diff --git a/src/nautilus.oafinfo b/src/nautilus.oafinfo deleted file mode 100644 index b7f7a2a49..000000000 --- a/src/nautilus.oafinfo +++ /dev/null @@ -1,82 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3" type="exe" location="nautilus"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/ObjectFactory:1.0"/> - </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus factory"/> - <oaf_attribute name="description" type="string" value="Factory for Nautilus shell and file manager"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> - <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="Nautilus file manager icon view"/> - <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows a two-dimensional icon space"/> - <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> - <item value="x-directory/normal"/> - <item value="x-directory/webdav"/> - </oaf_attribute> - <oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> - <item value="gnome-trash"/> - <item value="trash"/> - </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Icons"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_file_manager_desktop_icon_view:8d8121b1-0f1e-400b-bf0d-5b0f4555f5e1" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> - <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="Nautilus file manager desktop icon view"/> - <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows icons on the the desktop"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> - <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="Nautilus file manager list view"/> - <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows a scrollable list"/> - <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> - <item value="x-directory/normal"/> - <item value="x-directory/webdav"/> - </oaf_attribute> - <oaf_attribute name="bonobo:additional_uri_schemes" type="stringv"> - <item value="gnome-trash"/> - <item value="trash"/> - </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="List"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_file_manager_search_list_view:b186e381-198e-43cf-9c46-60b6bb35db0b" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> - <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="Nautilus file manager search results list view"/> - <oaf_attribute name="description" type="string" value="Nautilus file manager component that shows a scrollable list for search results"/> - <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> - <item value="x-directory/search"/> - </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" value="Search List"/> -</oaf_server> - -<oaf_server iid="OAFIID:nautilus_shell:cd5183b2-3913-4b74-9b8e-10528b0de08d" type="factory" location="OAFIID:nautilus_factory:bd1e1862-92d7-4391-963e-37583f0daef3"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:Bonobo/Unknown:1.0"/> - <item value="IDL:Nautilus/Shell:1.0"/> - </oaf_attribute> - <oaf_attribute name="name" type="string" value="Nautilus shell"/> - <oaf_attribute name="description" type="string" value="Nautilus shell operations that can be done from subsequent command-line invocations"/> -</oaf_server> - -</oaf_info> |