Added option for eog. (Sorry Maciej, I had done it before I got your

* HACKING: Added option for eog. (Sorry Maciej, I had done it
	before I got your mail.)
        * src/ntl-uri-map.c (make_oaf_query_with_known_mime_type),
        (make_oaf_query_with_uri_scheme_only): Improved comments and
	formatting a little big more. (Sorry again, Maciej. You can
	merge it however you want!)
This commit is contained in:
Darin Adler 2000-05-01 21:42:47 +00:00
parent 30499d5778
commit ee569ce5d0
4 changed files with 48 additions and 25 deletions

View file

@ -1,3 +1,12 @@
2000-05-01 Darin Adler <darin@eazel.com>
* HACKING: Added option for eog. (Sorry Maciej, I had done it
before I got your mail.)
* src/ntl-uri-map.c (make_oaf_query_with_known_mime_type),
(make_oaf_query_with_uri_scheme_only): Improved comments and
formatting a little big more. (Sorry again, Maciej. You can
merge it however you want!)
2000-05-01 Maciej Stachowiak <mjs@eazel.com>
* libnautilus/nautilus-zoomable.c: Remove FIXME comment for #681;

View file

@ -25,7 +25,7 @@ bonobo: HEAD (with --enable-oaf=yes)
gnome-vfs: HEAD (with --enable-oaf=yes)
libglade: HEAD
gtkhtml: HEAD (with --without-bonobo)
eog: HEAD
eog: HEAD (with --enable-oaf=yes)
gnet: HEAD
ORBit requires you to install popt-1.5, which can be fetched from:

View file

@ -254,14 +254,18 @@ make_oaf_query_with_known_mime_type (NautilusNavigationInfo *navinfo)
(
/* Check if the component has the interfaces we need.
* We can work with either a Nautilus ContentView, or
* with a Bonobo Control or Embeddable that works on
* a file, which is indicated by Bonobo PersistFile.
* with a Bonobo Control or Embeddable that supports
* one of the three persistence interfaces:
* PersistStream, ProgressiveDataSink, or
* PersistFile.
*/
"(repo_ids.has_all(['IDL:Bonobo/Control:1.0','IDL:Nautilus/ContentView:1.0'])"
"OR (repo_ids.has_one(['IDL:Bonobo/Control:1.0','IDL:Bonobo/Embeddable:1.0'])"
"AND repo_ids.has_one(['IDL:Bonobo/PersistStream:1.0',"
"'IDL:Bonobo/ProgressiveDataSink:1.0',"
"'IDL:Bonobo/PersistFile:1.0'])))"
"(repo_ids.has_all(['IDL:Bonobo/Control:1.0',"
"'IDL:Nautilus/ContentView:1.0'])"
"OR (repo_ids.has_one(['IDL:Bonobo/Control:1.0',"
"'IDL:Bonobo/Embeddable:1.0'])"
"AND repo_ids.has_one(['IDL:Bonobo/PersistStream:1.0',"
"'IDL:Bonobo/ProgressiveDataSink:1.0',"
"'IDL:Bonobo/PersistFile:1.0'])))"
/* Check that the component either has a specific
* MIME type or URI scheme. If neither is specified,
@ -287,9 +291,10 @@ make_oaf_query_with_known_mime_type (NautilusNavigationInfo *navinfo)
"OR bonobo:supported_uri_schemes.has('%s')"
"OR bonobo:supported_uri_schemes.has('*'))"
/* Check that the component makes it clear that it's intended for
* Nautilus by providing a "view_as" name. We could instead support
* a default, but that would make components that are untested with
/* Check that the component makes it clear that it's
* intended for Nautilus by providing a "view_as"
* name. We could instead support a default, but
* that would make components that are untested with
* Nautilus appear.
*/
"AND nautilus:view_as_name.defined()"
@ -320,8 +325,10 @@ make_oaf_query_with_uri_scheme_only (NautilusNavigationInfo *navinfo)
* with a Bonobo Control or Embeddable that works on
* a file, which is indicated by Bonobo PersistFile.
*/
"(repo_ids.has_all(['IDL:Bonobo/Control:1.0','IDL:Nautilus/ContentView:1.0'])"
"OR (repo_ids.has_one(['IDL:Bonobo/Control:1.0','IDL:Bonobo/Embeddable:1.0'])"
"(repo_ids.has_all(['IDL:Bonobo/Control:1.0',"
"'IDL:Nautilus/ContentView:1.0'])"
"OR (repo_ids.has_one(['IDL:Bonobo/Control:1.0',"
"'IDL:Bonobo/Embeddable:1.0'])"
"AND repo_ids.has('IDL:Bonobo/PersistFile:1.0')))"
/* Check if the component supports this particular

View file

@ -254,14 +254,18 @@ make_oaf_query_with_known_mime_type (NautilusNavigationInfo *navinfo)
(
/* Check if the component has the interfaces we need.
* We can work with either a Nautilus ContentView, or
* with a Bonobo Control or Embeddable that works on
* a file, which is indicated by Bonobo PersistFile.
* with a Bonobo Control or Embeddable that supports
* one of the three persistence interfaces:
* PersistStream, ProgressiveDataSink, or
* PersistFile.
*/
"(repo_ids.has_all(['IDL:Bonobo/Control:1.0','IDL:Nautilus/ContentView:1.0'])"
"OR (repo_ids.has_one(['IDL:Bonobo/Control:1.0','IDL:Bonobo/Embeddable:1.0'])"
"AND repo_ids.has_one(['IDL:Bonobo/PersistStream:1.0',"
"'IDL:Bonobo/ProgressiveDataSink:1.0',"
"'IDL:Bonobo/PersistFile:1.0'])))"
"(repo_ids.has_all(['IDL:Bonobo/Control:1.0',"
"'IDL:Nautilus/ContentView:1.0'])"
"OR (repo_ids.has_one(['IDL:Bonobo/Control:1.0',"
"'IDL:Bonobo/Embeddable:1.0'])"
"AND repo_ids.has_one(['IDL:Bonobo/PersistStream:1.0',"
"'IDL:Bonobo/ProgressiveDataSink:1.0',"
"'IDL:Bonobo/PersistFile:1.0'])))"
/* Check that the component either has a specific
* MIME type or URI scheme. If neither is specified,
@ -287,9 +291,10 @@ make_oaf_query_with_known_mime_type (NautilusNavigationInfo *navinfo)
"OR bonobo:supported_uri_schemes.has('%s')"
"OR bonobo:supported_uri_schemes.has('*'))"
/* Check that the component makes it clear that it's intended for
* Nautilus by providing a "view_as" name. We could instead support
* a default, but that would make components that are untested with
/* Check that the component makes it clear that it's
* intended for Nautilus by providing a "view_as"
* name. We could instead support a default, but
* that would make components that are untested with
* Nautilus appear.
*/
"AND nautilus:view_as_name.defined()"
@ -320,8 +325,10 @@ make_oaf_query_with_uri_scheme_only (NautilusNavigationInfo *navinfo)
* with a Bonobo Control or Embeddable that works on
* a file, which is indicated by Bonobo PersistFile.
*/
"(repo_ids.has_all(['IDL:Bonobo/Control:1.0','IDL:Nautilus/ContentView:1.0'])"
"OR (repo_ids.has_one(['IDL:Bonobo/Control:1.0','IDL:Bonobo/Embeddable:1.0'])"
"(repo_ids.has_all(['IDL:Bonobo/Control:1.0',"
"'IDL:Nautilus/ContentView:1.0'])"
"OR (repo_ids.has_one(['IDL:Bonobo/Control:1.0',"
"'IDL:Bonobo/Embeddable:1.0'])"
"AND repo_ids.has('IDL:Bonobo/PersistFile:1.0')))"
/* Check if the component supports this particular