diff options
| author | Michael Meeks <michael@ximian.com> | 2002-04-18 18:39:01 +0000 |
|---|---|---|
| committer | Michael Meeks <michael@src.gnome.org> | 2002-04-18 18:39:01 +0000 |
| commit | e72152dd8e25e3d6309cbf2928e240fc99e1dd72 (patch) | |
| tree | aa041c91718519fd813ab3edd95d6cc2315fd357 /libnautilus-private/nautilus-mime-actions.c | |
| parent | 2af5520c56649f581d316824cdbaaafe80d3d2d1 (diff) | |
| download | nautilus-e72152dd8e25e3d6309cbf2928e240fc99e1dd72.tar.gz | |
replace all the OAFIIDs with more sensibly named ones, that follow the
2002-04-18 Michael Meeks <michael@ximian.com>
* *.server.in, *.c: replace all the OAFIIDs with more
sensibly named ones, that follow the namespacing
guidelines in the libbonobo/docs/FAQ. Needs a new
gnome-vfs to work well.
* src/nautilus-window-toolbars.c
(throbber_set_throbbing): impl.
(throbber_created_callback): upd.
(nautilus_window_allow_stop): upd.
* libnautilus-private/nautilus-mime-actions.c
(nautilus_do_component_query): remove hack around bonobo's
sample text component, we no longer have one.
Diffstat (limited to 'libnautilus-private/nautilus-mime-actions.c')
| -rw-r--r-- | libnautilus-private/nautilus-mime-actions.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c index ef9a56147..276e7d155 100644 --- a/libnautilus-private/nautilus-mime-actions.c +++ b/libnautilus-private/nautilus-mime-actions.c @@ -1537,16 +1537,18 @@ server_matches_content_requirements (Bonobo_ServerInfo *server, } +/* FIXME: do we actually need this it would seem to me that the + * test_only attribute handles this + */ static char *nautilus_sort_criteria[] = { /* Prefer anything else over the loser view. */ - "iid != 'OAFIID:nautilus_content_loser:95901458-c68b-43aa-aaca-870ced11062d'", + "iid != 'OAFIID:Nautilus_Content_Loser'", /* Prefer anything else over the sample view. */ - "iid != 'OAFIID:nautilus_sample_content_view:45c746bc-7d64-4346-90d5-6410463b43ae'", + "iid != 'OAFIID:Nautilus_Sample_Content_View'", /* Sort alphabetically */ "name", - NULL}; - - + NULL +}; static GList * nautilus_do_component_query (const char *mime_type, @@ -1596,10 +1598,7 @@ nautilus_do_component_query (const char *mime_type, if (ignore_content_mime_types || server_matches_content_requirements (server, content_types, explicit_iids)) { - /* Hack to suppress the Bonobo_Sample_Text component, since the Nautilus text - * view is a superset and it's confusing for the user to be presented with both - */ - if (server->iid != NULL && strcmp (server->iid, "OAFIID:Bonobo_Sample_Text") != 0) { + if (server->iid != NULL) { retval = g_list_prepend (retval, Bonobo_ServerInfo_duplicate (server)); |