gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-09-19 15:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

OAF conversion. You must now build bonobo and gnome-vfs with --enable-oaf

Browse source 
OAF conversion. You must now build bonobo and gnome-vfs with --enable-oaf

	* configure.in: Check for OAF

	* libnautilus/nautilus-view-component.idl: Inherit from
	Bonobo::Unknown instead of GNOME::Unknown.

	* libnautilus-extensions/nautilus-global-preferences.c,
	libnautilus-extensions/nautilus-global-preferences.h: Refer to
	meta views by OAFIID, not GOAD ID.

	* src/ntl-uri-map.c (my_notify_when_ready): Replaced hardcoded
	list of GOAD IDs with a hardcoded list of OAFIIDs.
	(add_components_from_metadata): Changed the expected format; it is
	now label=component instead of component:label since OAFIIDs
	contain colons.

	* src/ntl-view.c (nautilus_view_destroy_client): unref the
	Zoomable interface of the View, if any.

	* src/file-manager/dfos-corba.c, src/file-manager/dfos.c: replace
	GOAD calls with OAF ones; untested since this code is not really
	used right now.

	* src/ntl-main.c: Use OAF calls to intialize CORBA.

	* src/ntl-app.c: Replace GOAD IDs with OAFIIDs. Use
	Bonobo_Generic_Factory instead of GNOME_Generic_Factory to make
	the linker happy. Register the factory server with OAF, not GOAD.

	* src/nautilus.h: Include <liboaf/liboaf.h> instead of <libgnorba/gnorba.h>


	* components/help/Makefile.am, components/history/Makefile.am,
	components/html/Makefile.am, components/mozilla/Makefile.am,
	components/music/Makefile.am, components/notes/Makefile.am,
	components/rpmview/Makefile.am, components/sample/Makefile.am,
	components/services/startup/Makefile.am,
	components/websearch/Makefile.am, libnautilus/Makefile.am,
	libnautilus-extensions/Makefile.am, src/Makefile.am,
	src/file-manager/Makefile.am: Updated for OAF; install .oafinfo
	files instead of .gnorba.

	* components/help/hyperbola-main.c,
	components/history/ntl-history-view.c,
	components/html/ntl-web-browser.c, components/mozilla/main.c,
	components/music/main.c, components/notes/ntl-notes.c,
	components/rpmview/main.c, components/sample/main.c,
	components/services/startup/main.c,
	components/websearch/ntl-web-search.c: Convert to OAF; use OAFIIDs
	and oaf intialization functions.

	* src/nautilus.oafinfo, components/help/hyperbola.oafinfo,
	components/history/ntl-history-view.oafinfo,
	components/html/ntl-web-browser.oafinfo,
	components/music/nautilus-music-view.oafinfo,
	components/notes/ntl-notes.oafinfo,
	components/rpmview/nautilus-rpm-view.oafinfo,
	components/services/startup/nautilus-service-startup-view.oafinfo,
	components/websearch/ntl-web-search.oafinfo,
	components/sample/nautilus-sample-content-view.oafinfo,
	components/mozilla/nautilus-mozilla-content-view.oafinfo: New OAF
	activation records.

	* src/nautilus.goad, components/help/hyperbola.goad,
	components/history/ntl-history-view.goad,
	components/html/ntl-web-browser.goad,
	components/music/nautilus-music-view.goad,
	components/notes/ntl-notes.goad,
	components/rpmview/nautilus-rpm-view.goad,
	components/services/startup/nautilus-service-startup-view.goad,
	components/websearch/ntl-web-search.goad,
	components/sample/nautilus-sample-content-view.goad,
	components/mozilla/nautilus-mozilla-content-view.goad: Removed.
This commit is contained in:
Maciej Stachowiak 2000-04-19 13:11:41 +00:00
parent a3a3e671d1
commit f6e6b47110
86 changed files with 1141 additions and 446 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
ChangeLog
View file

@ -1,3 +1,80 @@
2000-04-19 Maciej Stachowiak <mjs@eazel.com>
OAF conversion. You must now build bonobo and gnome-vfs with --enable-oaf
* configure.in: Check for OAF
* libnautilus/nautilus-view-component.idl: Inherit from
Bonobo::Unknown instead of GNOME::Unknown.
* libnautilus-extensions/nautilus-global-preferences.c,
libnautilus-extensions/nautilus-global-preferences.h: Refer to
meta views by OAFIID, not GOAD ID.
* src/ntl-uri-map.c (my_notify_when_ready): Replaced hardcoded
list of GOAD IDs with a hardcoded list of OAFIIDs.
(add_components_from_metadata): Changed the expected format; it is
now label=component instead of component:label since OAFIIDs
contain colons.
* src/ntl-view.c (nautilus_view_destroy_client): unref the
Zoomable interface of the View, if any.
* src/file-manager/dfos-corba.c, src/file-manager/dfos.c: replace
GOAD calls with OAF ones; untested since this code is not really
used right now.
* src/ntl-main.c: Use OAF calls to intialize CORBA.
* src/ntl-app.c: Replace GOAD IDs with OAFIIDs. Use
Bonobo_Generic_Factory instead of GNOME_Generic_Factory to make
the linker happy. Register the factory server with OAF, not GOAD.
* src/nautilus.h: Include <liboaf/liboaf.h> instead of <libgnorba/gnorba.h>
* components/help/Makefile.am, components/history/Makefile.am,
components/html/Makefile.am, components/mozilla/Makefile.am,
components/music/Makefile.am, components/notes/Makefile.am,
components/rpmview/Makefile.am, components/sample/Makefile.am,
components/services/startup/Makefile.am,
components/websearch/Makefile.am, libnautilus/Makefile.am,
libnautilus-extensions/Makefile.am, src/Makefile.am,
src/file-manager/Makefile.am: Updated for OAF; install .oafinfo
files instead of .gnorba.
* components/help/hyperbola-main.c,
components/history/ntl-history-view.c,
components/html/ntl-web-browser.c, components/mozilla/main.c,
components/music/main.c, components/notes/ntl-notes.c,
components/rpmview/main.c, components/sample/main.c,
components/services/startup/main.c,
components/websearch/ntl-web-search.c: Convert to OAF; use OAFIIDs
and oaf intialization functions.
* src/nautilus.oafinfo, components/help/hyperbola.oafinfo,
components/history/ntl-history-view.oafinfo,
components/html/ntl-web-browser.oafinfo,
components/music/nautilus-music-view.oafinfo,
components/notes/ntl-notes.oafinfo,
components/rpmview/nautilus-rpm-view.oafinfo,
components/services/startup/nautilus-service-startup-view.oafinfo,
components/websearch/ntl-web-search.oafinfo,
components/sample/nautilus-sample-content-view.oafinfo,
components/mozilla/nautilus-mozilla-content-view.oafinfo: New OAF
activation records.
* src/nautilus.goad, components/help/hyperbola.goad,
components/history/ntl-history-view.goad,
components/html/ntl-web-browser.goad,
components/music/nautilus-music-view.goad,
components/notes/ntl-notes.goad,
components/rpmview/nautilus-rpm-view.goad,
components/services/startup/nautilus-service-startup-view.goad,
components/websearch/ntl-web-search.goad,
components/sample/nautilus-sample-content-view.goad,
components/mozilla/nautilus-mozilla-content-view.goad: Removed.
2000-04-18 Ramiro Estrugo <ramiro@eazel.com>
* configure.in,

9
components/help/Makefile.am
View file

@ -26,10 +26,8 @@ hyperbola_SOURCES= \
hyperbola-nav-index.c \
hyperbola-nav-search.c
EXTRA_DIST=pages.map hyperbola.goad help-methods.conf
goaddir=$(sysconfdir)/CORBA/servers
goad_DATA=hyperbola.goad
oafdir=$(datadir)/oaf
oaf_DATA=hyperbola.oafinfo
mapdatadir=$(datadir)/hyperbola/maps
mapdata_DATA=pages.map
@ -43,3 +41,6 @@ libvfs_help_la_LIBADD = $(GLIB_LIBS)
modulesconfdir=$(sysconfdir)/vfs/modules
modulesconf_DATA = help-methods.conf
EXTRA_DIST=pages.map $(oaf_DATA) help-methods.conf

26
components/help/hyperbola-main.c
View file

@ -1,7 +1,9 @@
#include "config.h"
#include <libnautilus/libnautilus.h>
#include <libgnorba/gnorba.h>
#include <config.h>
#include <libnautilus-extensions/libnautilus-extensions.h>
#include <gnome.h>
#include <liboaf/liboaf.h>
/* In hyperbola-nav-tree.c */
extern BonoboObject *hyperbola_navigation_tree_new(void);
@ -26,11 +28,11 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, void *closure)
{
BonoboObject *retval = NULL;
if(!strcmp(goad_id, "hyperbola_navigation_tree"))
if(!strcmp(goad_id, "OAFIID:hyperbola_navigation_tree:57542ce0-71ff-442d-a764-462c92514234"))
retval = hyperbola_navigation_tree_new();
else if(!strcmp(goad_id, "hyperbola_navigation_index"))
else if(!strcmp(goad_id, "OAFIID:hyperbola_navigation_index:0bafadc7-09f1-4f10-8c8e-dad53124fc49"))
retval = hyperbola_navigation_index_new();
else if(!strcmp(goad_id, "hyperbola_navigation_search"))
else if(!strcmp(goad_id, "OAFIID:hyperbola_navigation_search:89b2f3b8-4f09-49c8-9a7b-ccb14d034813"))
retval = hyperbola_navigation_search_new();
if(retval)
@ -48,12 +50,16 @@ int main(int argc, char *argv[])
CORBA_ORB orb;
CORBA_Environment ev;
CORBA_exception_init(&ev);
orb = gnome_CORBA_init_with_popt_table("hyperbola", VERSION, &argc, argv, NULL, 0, NULL,
GNORBA_INIT_SERVER_FUNC, &ev);
gnome_init_with_popt_table("hyperbola", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
factory = bonobo_generic_factory_new_multi("hyperbola_factory", make_obj, NULL);
factory = bonobo_generic_factory_new_multi("OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb", make_obj, NULL);
do {
bonobo_main();

23
components/help/hyperbola.goad
View file

@ -1,23 +0,0 @@
[hyperbola_factory]
location_info=hyperbola
type=exe
description=Internal use only
repo_id=IDL:GNOME/GenericFactory:1.0
[hyperbola_navigation_tree]
location_info=hyperbola_factory
type=factory
description=Help Navigation Tree
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/MetaView:1.0 IDL:Nautilus/View:1.0
[hyperbola_navigation_index]
location_info=hyperbola_factory
type=factory
description=Help Index
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/MetaView:1.0 IDL:Nautilus/View:1.0
[hyperbola_navigation_search]
location_info=hyperbola_factory
type=factory
description=Help Search
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/MetaView:1.0 IDL:Nautilus/View:1.0

37
components/help/hyperbola.oafinfo Normal file
View file

@ -0,0 +1,37 @@
<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/GenericFactory: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:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Help Navigation Tree"/>
</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:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Help Index"/>
</oaf_server>
<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:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Help Search"/>
</oaf_server>
</oaf_info>

6
components/history/Makefile.am
View file

@ -12,6 +12,6 @@ LDADD=\
ntl_history_view_SOURCES=ntl-history-view.c
goaddir=$(sysconfdir)/CORBA/servers
goad_DATA=ntl-history-view.goad
EXTRA_DIST=$(goad_DATA)
oafdir=$(datadir)/oaf
oaf_DATA=ntl-history-view.oafinfo
EXTRA_DIST=$(oaf_DATA)

20
components/history/Nautilus_View_history.oaf.in Normal file
View file

@ -0,0 +1,20 @@
<oaf_info>
<oaf_server iid="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="ntl-history-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for history views"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="History"/>
</oaf_server>
</oaf_info>

20
components/history/Nautilus_View_history.server.in Normal file
View file

@ -0,0 +1,20 @@
<oaf_info>
<oaf_server iid="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="ntl-history-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for history views"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="History"/>
</oaf_server>
</oaf_info>

20
components/history/Nautilus_View_history.server.in.in Normal file
View file

@ -0,0 +1,20 @@
<oaf_info>
<oaf_server iid="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="ntl-history-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for history views"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="History"/>
</oaf_server>
</oaf_info>

19
components/history/nautilus-history-view.c
View file

@ -25,14 +25,15 @@
/* ntl-view.c: Implementation of the object representing a data view,
and its associated CORBA object for proxying requests into this
object. */
#include "config.h"
#include <config.h>
#include <gnome.h>
#include <libnautilus/libnautilus.h>
#include <libnautilus-extensions/nautilus-bookmark.h>
#include <libnautilus-extensions/nautilus-icon-factory.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomevfs/gnome-vfs-init.h>
#include <libgnorba/gnorba.h>
#include <liboaf/liboaf.h>
typedef struct {
NautilusViewFrame *view;
@ -197,7 +198,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure)
GtkCList *clist;
HistoryView *hview;
g_return_val_if_fail(!strcmp(goad_id, "ntl_history_view"), NULL);
g_return_val_if_fail(!strcmp(goad_id, "OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb"), NULL);
hview = g_new0(HistoryView, 1);
@ -244,15 +245,17 @@ int main(int argc, char *argv[])
{
BonoboGenericFactory *factory;
CORBA_ORB orb;
CORBA_Environment ev;
CORBA_exception_init(&ev);
orb = gnome_CORBA_init_with_popt_table("ntl-history-view", VERSION, &argc, argv, NULL, 0, NULL,
GNORBA_INIT_SERVER_FUNC, &ev);
puts ("history view");
gnome_init_with_popt_table("ntl-history-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
gnome_vfs_init ();
factory = bonobo_generic_factory_new_multi("ntl_history_view_factory", make_obj, NULL);
factory = bonobo_generic_factory_new_multi("OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e", make_obj, NULL);
do {
bonobo_main();

20
components/history/nautilus-history-view.oafinfo Normal file
View file

@ -0,0 +1,20 @@
<oaf_info>
<oaf_server iid="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="ntl-history-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for history views"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="History"/>
</oaf_server>
</oaf_info>

19
components/history/ntl-history-view.c
View file

@ -25,14 +25,15 @@
/* ntl-view.c: Implementation of the object representing a data view,
and its associated CORBA object for proxying requests into this
object. */
#include "config.h"
#include <config.h>
#include <gnome.h>
#include <libnautilus/libnautilus.h>
#include <libnautilus-extensions/nautilus-bookmark.h>
#include <libnautilus-extensions/nautilus-icon-factory.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomevfs/gnome-vfs-init.h>
#include <libgnorba/gnorba.h>
#include <liboaf/liboaf.h>
typedef struct {
NautilusViewFrame *view;
@ -197,7 +198,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure)
GtkCList *clist;
HistoryView *hview;
g_return_val_if_fail(!strcmp(goad_id, "ntl_history_view"), NULL);
g_return_val_if_fail(!strcmp(goad_id, "OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb"), NULL);
hview = g_new0(HistoryView, 1);
@ -244,15 +245,17 @@ int main(int argc, char *argv[])
{
BonoboGenericFactory *factory;
CORBA_ORB orb;
CORBA_Environment ev;
CORBA_exception_init(&ev);
orb = gnome_CORBA_init_with_popt_table("ntl-history-view", VERSION, &argc, argv, NULL, 0, NULL,
GNORBA_INIT_SERVER_FUNC, &ev);
puts ("history view");
gnome_init_with_popt_table("ntl-history-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
gnome_vfs_init ();
factory = bonobo_generic_factory_new_multi("ntl_history_view_factory", make_obj, NULL);
factory = bonobo_generic_factory_new_multi("OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e", make_obj, NULL);
do {
bonobo_main();

11
components/history/ntl-history-view.goad
View file

@ -1,11 +0,0 @@
[ntl_history_view_factory]
type=exe
repo_id=IDL:GNOME/GenericFactory:1.0
description=Factory for history views
location_info=ntl-history-view
[ntl_history_view]
type=factory
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/MetaView:1.0 IDL:Nautilus/View:1.0
description=History
location_info=ntl_history_view_factory

20
components/history/ntl-history-view.oafinfo Normal file
View file

@ -0,0 +1,20 @@
<oaf_info>
<oaf_server iid="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e" type="exe" location="ntl-history-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for history views"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb" type="factory" location="OAFIID:ntl_history_view_factory:912d6634-d18f-40b6-bb83-bdfe16f1d15e">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="History"/>
</oaf_server>
</oaf_info>

10
components/html/Makefile.am
View file

@ -12,9 +12,9 @@ INCLUDES = \
$(GTKHTML_CFLAGS) \
$(LIBWWW_CFLAGS)
gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = \
ntl-web-browser.goad
oafdir = $(datadir)/oaf
oaf_DATA = \
ntl-web-browser.oafinfo
bin_PROGRAMS = \
@ -37,7 +37,7 @@ ntl_web_browser_LDFLAGS = \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(VFS_LIBS) \
$(GNORBA_LIBS) \
$(OAF_LIBS) \
$(LIBWWW_LIBS)
EXTRA_DIST = ntl-web-browser.goad
EXTRA_DIST = $(oaf_DATA)

16
components/html/ntl-web-browser.c
View file

@ -24,7 +24,7 @@
#include <gnome.h>
#include <libnautilus/libnautilus.h>
#include <gtkhtml/gtkhtml.h>
#include <libgnorba/gnorba.h>
#include <liboaf/liboaf.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libnautilus-extensions/nautilus-debug.h>
@ -579,7 +579,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, void *closure)
BrowserInfo *bi;
GtkWidget *wtmp;
if(strcmp(goad_id, "ntl_web_browser"))
if(strcmp(goad_id, "OAFIID:ntl_web_browser:0ce1a736-c939-4ac7-b12c-19d72bf1510b"))
return NULL;
bi = g_new0(BrowserInfo, 1);
@ -623,10 +623,11 @@ int main(int argc, char *argv[])
"Nautilus-HTML", "gtkhtml", NULL);
CORBA_exception_init(&ev);
orb = gnome_CORBA_init_with_popt_table("ntl-web-browser", VERSION, &argc, argv, NULL, 0, NULL,
GNORBA_INIT_SERVER_FUNC, &ev);
gnome_init_with_popt_table("ntl-web-browser", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
gnome_vfs_init();
gdk_rgb_init();
@ -634,7 +635,8 @@ int main(int argc, char *argv[])
HTNet_addAfter(request_terminator, NULL, NULL, HT_ALL, HT_FILTER_LAST);
bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
factory = bonobo_generic_factory_new_multi("ntl_web_browser_factory", make_obj, NULL);
factory = bonobo_generic_factory_new_multi("OAFIID:ntl_web_browser_factory:e553fd3e-101d-445d-ae53-a3a59e77fcc9",
make_obj, NULL);
do {
bonobo_main();

11
components/html/ntl-web-browser.goad
View file

@ -1,11 +0,0 @@
[ntl_web_browser_factory]
type=exe
repo_id=IDL:GNOME/GenericFactory:1.0
description=HTML component's factory
location_info=ntl-web-browser
[ntl_web_browser]
type=factory
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/ContentView:1.0 IDL:Nautilus/View:1.0
description=Web browser component
location_info=ntl_web_browser_factory

19
components/html/ntl-web-browser.oafinfo Normal file
View file

@ -0,0 +1,19 @@
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Web browser component"/>
</oaf_server>
</oaf_info>

15
components/mozilla/Makefile.am
View file

@ -12,12 +12,6 @@ INCLUDES = \
$(MOZILLA_COMPONENT_CFLAGS) \
$(NULL)
gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = \
nautilus-mozilla-content-view.goad \
$(NULL)
bin_PROGRAMS =\
nautilus-mozilla-content-view \
$(NULL)
@ -32,12 +26,15 @@ nautilus_mozilla_content_view_LDFLAGS = \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(VFS_LIBS) \
$(GNORBA_LIBS) \
$(OAF_LIBS) \
$(MOZILLA_COMPONENT_LDFLAGS) \
$(MOZILLA_COMPONENT_LIBS) \
$(NULL)
EXTRA_DIST = \
nautilus-mozilla-content-view.goad \
oafdir = $(datadir)/oaf
oaf_DATA = \
nautilus-mozilla-content-view.oafinfo \
$(NULL)
EXTRA_DIST = $(oaf_DATA) $(NULL)

19
components/mozilla/Nautilus_View_mozilla.oaf.in Normal file
View file

@ -0,0 +1,19 @@
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Mozilla content view component"/>
</oaf_server>
</oaf_info>

19
components/mozilla/Nautilus_View_mozilla.server.in Normal file
View file

@ -0,0 +1,19 @@
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Mozilla content view component"/>
</oaf_server>
</oaf_info>

17
components/mozilla/main.c
View file

@ -29,7 +29,7 @@
#include "nautilus-mozilla-content-view.h"
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include <liboaf/liboaf.h>
#include <bonobo.h>
#include <stdlib.h>
@ -54,7 +54,7 @@ mozilla_make_object (BonoboGenericFactory *factory,
NautilusMozillaContentView *view;
NautilusViewFrame *view_frame;
if (strcmp (goad_id, "nautilus_mozilla_content_view")) {
if (strcmp (goad_id, "OAFIID:nautilus_mozilla_content_view:1ee70717-57bf-4079-aae5-922abdd576b1")) {
return NULL;
}
@ -102,13 +102,14 @@ main (int argc, char *argv[])
mozilla_hack_environment ();
CORBA_exception_init(&ev);
orb = gnome_CORBA_init_with_popt_table ("nautilus-mozilla-content-view", VERSION, &argc, argv, NULL, 0, NULL,
GNORBA_INIT_SERVER_FUNC, &ev);
gnome_init_with_popt_table("nautilus-mozilla-content-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
factory = bonobo_generic_factory_new_multi ("nautilus_mozilla_content_view_factory", mozilla_make_object, NULL);
factory = bonobo_generic_factory_new_multi ("OAFIID:nautilus_mozilla_content_view_factory:020a0285-6b96-4685-84a1-4a56eb6baa2b", mozilla_make_object, NULL);
do {
bonobo_main ();

11
components/mozilla/nautilus-mozilla-content-view.goad
View file

@ -1,11 +0,0 @@
[nautilus_mozilla_content_view_factory]
type=exe
repo_id=IDL:GNOME/GenericFactory:1.0
description=Mozilla content view component's factory
location_info=nautilus-mozilla-content-view
[nautilus_mozilla_content_view]
type=factory
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/ContentView:1.0 IDL:Nautilus/View:1.0
description=Mozilla content view component
location_info=nautilus_mozilla_content_view_factory

19
components/mozilla/nautilus-mozilla-content-view.oafinfo Normal file
View file

@ -0,0 +1,19 @@
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Mozilla content view component"/>
</oaf_server>
</oaf_info>

8
components/music/Makefile.am
View file

@ -8,10 +8,10 @@ INCLUDES = \
$(GNOMEUI_CFLAGS) \
$(WERROR)
gnorbadir = $(sysconfdir)/CORBA/servers
oafdir = $(datadir)/oaf
gnorba_DATA = \
nautilus-music-view.goad
oaf_DATA = \
nautilus-music-view.oafinfo
bin_PROGRAMS = \
@ -32,4 +32,4 @@ nautilus_music_view_LDFLAGS = \
$(VFS_LIBS) \
$(GNORBA_LIBS)
EXTRA_DIST = nautilus-music-view.goad
EXTRA_DIST = $(oaf_DATA)

20
components/music/Nautilus_View_music.oaf.in Normal file
View file

@ -0,0 +1,20 @@
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="music view"/>
</oaf_server>
</oaf_info>

20
components/music/Nautilus_View_music.server.in Normal file
View file

@ -0,0 +1,20 @@
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="music view"/>
</oaf_server>
</oaf_info>

20
components/music/Nautilus_View_music.server.in.in Normal file
View file

@ -0,0 +1,20 @@
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="music view"/>
</oaf_server>
</oaf_info>

14
components/music/main.c
View file

@ -28,7 +28,7 @@
#include <gnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libgnorba/gnorba.h>
#include <liboaf/liboaf.h>
#include <bonobo.h>
static int object_count = 0;
@ -50,7 +50,7 @@ music_view_make_object (BonoboGenericFactory *factory,
NautilusMusicView *music_view;
NautilusViewFrame *view_frame;
if (strcmp (goad_id, "nautilus_music_view")) {
if (strcmp (goad_id, "OAFIID:nautilus_music_view:9456b5d2-60a8-407f-a56e-d561e1821391")) {
return NULL;
}
@ -72,8 +72,11 @@ int main(int argc, char *argv[])
CORBA_exception_init(&ev);
orb = gnome_CORBA_init_with_popt_table ("nautilus-music-view", VERSION, &argc, argv, NULL, 0, NULL,
GNORBA_INIT_SERVER_FUNC, &ev);
gnome_init_with_popt_table("nautilus-music-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
@ -81,7 +84,8 @@ int main(int argc, char *argv[])
g_thread_init (NULL);
gnome_vfs_init ();
factory = bonobo_generic_factory_new_multi ("nautilus_music_view_factory", music_view_make_object, NULL);
factory = bonobo_generic_factory_new_multi ("OAFIID:nautilus_music_view_factory:1be0c129-87cd-4daa-9d3a-94397de9bce2",
music_view_make_object, NULL);
do {
bonobo_main ();

11
components/music/nautilus-music-view.goad
View file

@ -1,11 +0,0 @@
[nautilus_music_view_factory]
type=exe
repo_id=IDL:GNOME/GenericFactory:1.0
description=Factory for music view
location_info=nautilus-music-view
[nautilus_music_view]
type=factory
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/ContentView:1.0 IDL:Nautilus/View:1.0
description=music view
location_info=nautilus_music_view_factory

20
components/music/nautilus-music-view.oafinfo Normal file
View file

@ -0,0 +1,20 @@
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="music view"/>
</oaf_server>
</oaf_info>

6
components/notes/Makefile.am
View file

@ -12,7 +12,7 @@ LDADD=\
ntl_notes_SOURCES=ntl-notes.c
goaddir=$(sysconfdir)/CORBA/servers
goad_DATA=ntl-notes.goad
oafdir=$(datadir)/oaf
oaf_DATA=ntl-notes.oafinfo
EXTRA_DIST=$(goad_DATA)
EXTRA_DIST=$(oaf_DATA)

19
components/notes/Nautilus_View_notes.oaf.in Normal file
View file

@ -0,0 +1,19 @@
<oaf_info>
<oaf_server iid="OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0" type="exe" location="ntl-notes">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for annotation view"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185" type="factory" location="OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Annotation"/>
</oaf_server>
</oaf_info>

19
components/notes/Nautilus_View_notes.server.in Normal file
View file

@ -0,0 +1,19 @@
<oaf_info>
<oaf_server iid="OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0" type="exe" location="ntl-notes">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for annotation view"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185" type="factory" location="OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Annotation"/>
</oaf_server>
</oaf_info>

19
components/notes/Nautilus_View_notes.server.in.in Normal file
View file

@ -0,0 +1,19 @@
<oaf_info>
<oaf_server iid="OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0" type="exe" location="ntl-notes">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for annotation view"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185" type="factory" location="OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Annotation"/>
</oaf_server>
</oaf_info>

29
components/notes/nautilus-notes.c
View file

@ -31,7 +31,7 @@
#include <libnautilus-extensions/nautilus-metadata.h>
#include <gnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libgnorba/gnorba.h>
#include <liboaf/liboaf.h>
#include <limits.h>
#include <ctype.h>
#include <libnautilus-extensions/nautilus-background.h>
@ -132,6 +132,8 @@ do_destroy (GtkObject *obj, Notes *notes)
g_free (notes->uri);
g_free (notes);
puts ("XXX notes: --");
notes_object_count--;
if (notes_object_count <= 0) {
gtk_main_quit();
@ -144,8 +146,8 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl
GtkWidget *vbox;
Notes *notes;
NautilusBackground *background;
g_return_val_if_fail (strcmp (goad_id, "ntl_notes_view") == 0, NULL);
g_return_val_if_fail (strcmp (goad_id, "OAFIID:ntl_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185") == 0, NULL);
notes = g_new0 (Notes, 1);
notes->uri = g_strdup ("");
@ -177,6 +179,10 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl
nautilus_meta_view_frame_set_label (NAUTILUS_META_VIEW_FRAME (notes->view),
_("Notes"));
puts ("XXX notes: ++");
printf ("CREATING notes view: 0x%x\n", (unsigned) notes->view);
return BONOBO_OBJECT (notes->view);
}
@ -185,7 +191,8 @@ main(int argc, char *argv[])
{
BonoboGenericFactory *factory;
CORBA_ORB orb;
CORBA_Environment ev;
puts ("YYY: notes main");
/* Make criticals and warnings stop in the debugger if NAUTILUS_DEBUG is set.
* Unfortunately, this has to be done explicitly for each domain.
@ -196,19 +203,21 @@ main(int argc, char *argv[])
}
/* initialize CORBA and Bonobo */
CORBA_exception_init (&ev);
orb = gnome_CORBA_init_with_popt_table ("ntl-notes", VERSION, &argc, argv,
NULL, 0, NULL,
GNORBA_INIT_SERVER_FUNC, &ev);
gnome_init_with_popt_table("ntl-notes", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
/* initialize gnome-vfs, etc */
g_thread_init (NULL);
gnome_vfs_init ();
factory = bonobo_generic_factory_new_multi ("ntl_notes_view_factory",
factory = bonobo_generic_factory_new_multi ("OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0",
make_notes_view, NULL);
do {
bonobo_main();
} while (notes_object_count > 0);

19
components/notes/nautilus-notes.oafinfo Normal file
View file

@ -0,0 +1,19 @@
<oaf_info>
<oaf_server iid="OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0" type="exe" location="ntl-notes">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for annotation view"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185" type="factory" location="OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Annotation"/>
</oaf_server>
</oaf_info>

29
components/notes/ntl-notes.c
View file

@ -31,7 +31,7 @@
#include <libnautilus-extensions/nautilus-metadata.h>
#include <gnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libgnorba/gnorba.h>
#include <liboaf/liboaf.h>
#include <limits.h>
#include <ctype.h>
#include <libnautilus-extensions/nautilus-background.h>
@ -132,6 +132,8 @@ do_destroy (GtkObject *obj, Notes *notes)
g_free (notes->uri);
g_free (notes);
puts ("XXX notes: --");
notes_object_count--;
if (notes_object_count <= 0) {
gtk_main_quit();
@ -144,8 +146,8 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl
GtkWidget *vbox;
Notes *notes;
NautilusBackground *background;
g_return_val_if_fail (strcmp (goad_id, "ntl_notes_view") == 0, NULL);
g_return_val_if_fail (strcmp (goad_id, "OAFIID:ntl_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185") == 0, NULL);
notes = g_new0 (Notes, 1);
notes->uri = g_strdup ("");
@ -177,6 +179,10 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl
nautilus_meta_view_frame_set_label (NAUTILUS_META_VIEW_FRAME (notes->view),
_("Notes"));
puts ("XXX notes: ++");
printf ("CREATING notes view: 0x%x\n", (unsigned) notes->view);
return BONOBO_OBJECT (notes->view);
}
@ -185,7 +191,8 @@ main(int argc, char *argv[])
{
BonoboGenericFactory *factory;
CORBA_ORB orb;
CORBA_Environment ev;
puts ("YYY: notes main");
/* Make criticals and warnings stop in the debugger if NAUTILUS_DEBUG is set.
* Unfortunately, this has to be done explicitly for each domain.
@ -196,19 +203,21 @@ main(int argc, char *argv[])
}
/* initialize CORBA and Bonobo */
CORBA_exception_init (&ev);
orb = gnome_CORBA_init_with_popt_table ("ntl-notes", VERSION, &argc, argv,
NULL, 0, NULL,
GNORBA_INIT_SERVER_FUNC, &ev);
gnome_init_with_popt_table("ntl-notes", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
/* initialize gnome-vfs, etc */
g_thread_init (NULL);
gnome_vfs_init ();
factory = bonobo_generic_factory_new_multi ("ntl_notes_view_factory",
factory = bonobo_generic_factory_new_multi ("OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0",
make_notes_view, NULL);
do {
bonobo_main();
} while (notes_object_count > 0);

11
components/notes/ntl-notes.goad
View file

@ -1,11 +0,0 @@
[ntl_notes_view_factory]
type=exe
repo_id=IDL:GNOME/GenericFactory:1.0
description=Factory for annotation view
location_info=ntl-notes
[ntl_notes_view]
type=factory
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/MetaView:1.0 IDL:Nautilus/View:1.0
description=Annotation
location_info=ntl_notes_view_factory

19
components/notes/ntl-notes.oafinfo Normal file
View file

@ -0,0 +1,19 @@
<oaf_info>
<oaf_server iid="OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0" type="exe" location="ntl-notes">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Factory for annotation view"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185" type="factory" location="OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Annotation"/>
</oaf_server>
</oaf_info>

10
components/rpmview/Makefile.am
View file

@ -9,10 +9,10 @@ INCLUDES = \
$(GNOMEUI_CFLAGS) \
$(WERROR)
gnorbadir = $(sysconfdir)/CORBA/servers
oafdir = $(datadir)/oaf
gnorba_DATA = \
nautilus-rpm-view.goad
oaf_DATA = \
nautilus-rpm-view.oafinfo
bin_PROGRAMS = \
@ -32,6 +32,6 @@ nautilus_rpm_view_LDFLAGS = \
$(GNOMEUI_LIBS) \
-lrpm \
$(VFS_LIBS) \
$(GNORBA_LIBS)
$(OAF_LIBS)
EXTRA_DIST = nautilus-rpm-view.goad
EXTRA_DIST = $(oaf_DATA)

19
components/rpmview/Nautilus_View_rpm.oaf.in Normal file
View file

@ -0,0 +1,19 @@
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="rpm view"/>
</oaf_server>
</oaf_info>

17
components/rpmview/main.c
View file

@ -28,7 +28,7 @@
#include <gnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libgnorba/gnorba.h>
#include <liboaf/liboaf.h>
#include <bonobo.h>
static int object_count = 0;
@ -50,7 +50,7 @@ rpm_view_make_object (BonoboGenericFactory *factory,
NautilusRPMView *rpm_view;
NautilusViewFrame *view_frame;
if (strcmp (goad_id, "nautilus_rpm_view")) {
if (strcmp (goad_id, "OAFIID:nautilus_rpm_view:22ea002c-11e6-44fd-b13c-9445175a5e70")) {
return NULL;
}
@ -68,12 +68,12 @@ int main(int argc, char *argv[])
{
BonoboGenericFactory *factory;
CORBA_ORB orb;
CORBA_Environment ev;
CORBA_exception_init(&ev);
orb = gnome_CORBA_init_with_popt_table ("nautilus-rpm-view", VERSION, &argc, argv, NULL, 0, NULL,
GNORBA_INIT_SERVER_FUNC, &ev);
gnome_init_with_popt_table("nautilus-rpm-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
@ -81,7 +81,8 @@ int main(int argc, char *argv[])
g_thread_init (NULL);
gnome_vfs_init ();
factory = bonobo_generic_factory_new_multi ("nautilus_rpm_view_factory", rpm_view_make_object, NULL);
factory = bonobo_generic_factory_new_multi ("OAFIID:nautilus_rpm_view_factory:5986d6a5-8840-44ea-84a1-e7f052bd85cf",
rpm_view_make_object, NULL);
do {
bonobo_main ();

11
components/rpmview/nautilus-rpm-view.goad
View file

@ -1,11 +0,0 @@
[nautilus_rpm_view_factory]
type=exe
repo_id=IDL:GNOME/GenericFactory:1.0
description=Factory for rpm view
location_info=nautilus-rpm-view
[nautilus_rpm_view]
type=factory
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/ContentView:1.0 IDL:Nautilus/View:1.0
description=rpm view
location_info=nautilus_rpm_view_factory

19
components/rpmview/nautilus-rpm-view.oafinfo Normal file
View file

@ -0,0 +1,19 @@
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="rpm view"/>
</oaf_server>
</oaf_info>

12
components/sample/Makefile.am
View file

@ -8,10 +8,10 @@ INCLUDES = \
$(GNOMEUI_CFLAGS) \
$(WERROR)
gnorbadir = $(sysconfdir)/CORBA/servers
oafdir = $(datadir)/oaf
gnorba_DATA = \
nautilus-sample-content-view.goad
oaf_DATA = \
nautilus-sample-content-view.oafinfo
bin_PROGRAMS = \
@ -26,9 +26,9 @@ nautilus_sample_content_view_LDFLAGS = \
$(top_builddir)/libnautilus/libnautilus.la \
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
$(top_builddir)/librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNOMEUI_LIBS) \
$(BONOBO_LIBS) \
$(VFS_LIBS) \
$(GNORBA_LIBS)
$(OAF_LIBS)
EXTRA_DIST = nautilus-sample-content-view.goad
EXTRA_DIST = $(oaf_DATA)

20
components/sample/Nautilus_View_sample.oaf.in Normal file
View file

@ -0,0 +1,20 @@
<oaf_info>
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Sample content view component"/>
</oaf_server>
</oaf_info>

20
components/sample/Nautilus_View_sample.server.in Normal file
View file

@ -0,0 +1,20 @@
<oaf_info>
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Sample content view component"/>
</oaf_server>
</oaf_info>

20
components/sample/Nautilus_View_sample.server.in.in Normal file
View file

@ -0,0 +1,20 @@
<oaf_info>
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Sample content view component"/>
</oaf_server>
</oaf_info>

24
components/sample/main.c
View file

@ -28,7 +28,7 @@
#include "nautilus-sample-content-view.h"
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include <liboaf/liboaf.h>
#include <bonobo.h>
static int object_count = 0;
@ -44,15 +44,19 @@ sample_object_destroyed(GtkObject *obj)
static BonoboObject *
sample_make_object (BonoboGenericFactory *factory,
const char *goad_id,
const char *iid,
void *closure)
{
NautilusSampleContentView *view;
NautilusViewFrame *view_frame;
if (strcmp (goad_id, "nautilus_sample_content_view")) {
puts ("Checking IID!");
if (strcmp (iid, "OAFIID:nautilus_sample_content_view:45c746bc-7d64-4346-90d5-6410463b43ae")) {
return NULL;
}
puts ("Trying to make object!");
view = NAUTILUS_SAMPLE_CONTENT_VIEW (gtk_object_new (NAUTILUS_TYPE_SAMPLE_CONTENT_VIEW, NULL));
@ -72,13 +76,21 @@ int main(int argc, char *argv[])
CORBA_Environment ev;
CORBA_exception_init(&ev);
puts ("In component.");
orb = gnome_CORBA_init_with_popt_table ("nautilus-sample-content-view", VERSION, &argc, argv, NULL, 0, NULL,
GNORBA_INIT_SERVER_FUNC, &ev);
gnome_init_with_popt_table("nautilus-sample-content-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
factory = bonobo_generic_factory_new_multi ("nautilus_sample_content_view_factory", sample_make_object, NULL);
factory = bonobo_generic_factory_new_multi ("OAFIID:nautilus_sample_content_view_factory:3df6b028-be44-4a18-95c3-7720f50ca0c5", sample_make_object, NULL);
puts ("About to do main loop.");
do {
bonobo_main ();
} while (object_count > 0);

11
components/sample/nautilus-sample-content-view.goad
View file

@ -1,11 +0,0 @@
[nautilus_sample_content_view_factory]
type=exe
repo_id=IDL:GNOME/GenericFactory:1.0
description=Sample content view component's factory
location_info=nautilus-sample-content-view
[nautilus_sample_content_view]
type=factory
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/ContentView:1.0 IDL:Nautilus/View:1.0
description=Sample content view component
location_info=nautilus_sample_content_view_factory

20
components/sample/nautilus-sample-content-view.oafinfo Normal file
View file

@ -0,0 +1,20 @@
<oaf_info>
<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/GenericFactory:1.0"/>
</oaf_attribute>
<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="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Sample content view component"/>
</oaf_server>
</oaf_info>

10
components/services/startup/Makefile.am
View file

@ -11,10 +11,10 @@ INCLUDES = \
$(GNOMEUI_CFLAGS) \
$(WERROR)
gnorbadir = $(sysconfdir)/CORBA/servers
oafdir = $(datadir)/oaf
gnorba_DATA = \
nautilus-service-startup-view.goad
oaf_DATA = \
nautilus-service-startup-view.oafinfo
bin_PROGRAMS = \
@ -35,6 +35,6 @@ nautilus_service_startup_view_LDFLAGS = \
$(VFS_LIBS) \
-lrpm \
-lghttp \
$(GNORBA_LIBS)
$(OAF_LIBS)
EXTRA_DIST = nautilus-service-startup-view.goad
EXTRA_DIST = $(oaf_DATA)

13
components/services/startup/main.c
View file

@ -28,7 +28,7 @@
#include "nautilus-service-startup-view.h"
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include <liboaf/liboaf.h>
#include <bonobo.h>
static int object_count = 0;
@ -53,7 +53,7 @@ services_make_object (BonoboGenericFactory *factory,
puts ("Trying to create object.");
if (strcmp (goad_id, "nautilus_service_startup_view")) {
if (strcmp (goad_id, "OAFIID:nautilus_service_startup_view:a8f1b0ef-a39f-4f92-84bc-1704f0321a82")) {
return NULL;
}
@ -79,11 +79,14 @@ int main(int argc, char *argv[])
CORBA_exception_init(&ev);
orb = gnome_CORBA_init_with_popt_table ("nautilus-service-startup-view", VERSION, &argc, argv, NULL, 0, NULL,
GNORBA_INIT_SERVER_FUNC, &ev);
gnome_init_with_popt_table("nautilus-service-startup-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
factory = bonobo_generic_factory_new_multi ("nautilus_service_startup_view_factory", services_make_object, NULL);
factory = bonobo_generic_factory_new_multi ("OAFIID:nautilus_service_startup_view_factory:fafa0f0d-a2d1-41f9-8164-4beb5e34656c", services_make_object, NULL);
do {
bonobo_main ();

11
components/services/startup/nautilus-service-startup-view.goad
View file

@ -1,11 +0,0 @@
[nautilus_service_startup_view_factory]
type=exe
repo_id=IDL:GNOME/GenericFactory:1.0
description=Nautilus services startup view factory
location_info=nautilus-service-startup-view
[nautilus_service_startup_view]
type=factory
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/ContentView:1.0 IDL:Nautilus/View:1.0
description=Nautilus services startup view component
location_info=nautilus_service_startup_view_factory

19
components/services/startup/nautilus-service-startup-view.oafinfo Normal file
View file

@ -0,0 +1,19 @@
<oaf_info>
<oaf_server iid="OAFIID:nautilus_service_startup_view_factory:fafa0f0d-a2d1-41f9-8164-4beb5e34656c" type="exe" location="nautilus-service-startup-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Nautilus services startup view factory"/>
</oaf_server>
<oaf_server iid="OAFIID:nautilus_service_startup_view:a8f1b0ef-a39f-4f92-84bc-1704f0321a82" type="factory" location="OAFIID:nautilus_service_startup_view_factory:fafa0f0d-a2d1-41f9-8164-4beb5e34656c">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Nautilus services startup view component"/>
</oaf_server>
</oaf_info>

6
components/websearch/Makefile.am
View file

@ -12,10 +12,10 @@ LDADD=\
ntl_web_search_SOURCES=ntl-web-search.c
goaddir=$(sysconfdir)/CORBA/servers
goad_DATA=ntl-web-search.goad
oafdir=$(datadir)/oaf
oaf_DATA=ntl-web-search.oafinfo
enginesdir=$(datadir)/ntl-web-search
engines_DATA=standard.eng
EXTRA_DIST=$(goad_DATA) $(engines_DATA)
EXTRA_DIST=$(oaf_DATA) $(engines_DATA)

16
components/websearch/ntl-web-search.c
View file

@ -27,7 +27,7 @@
#include <libnautilus/libnautilus.h>
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include <liboaf/liboaf.h>
#include <limits.h>
#include <ctype.h>
@ -166,7 +166,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure)
GtkWidget *vbox;
WebSearchView *hview;
g_return_val_if_fail(!strcmp(goad_id, "ntl_websearch_view"), NULL);
g_return_val_if_fail(!strcmp(goad_id, "OAFIID:ntl_websearch_view:8216e1e4-6b01-4a28-82d9-5df30ed7d044"), NULL);
hview = g_new0(WebSearchView, 1);
@ -231,14 +231,16 @@ int main(int argc, char *argv[])
{
BonoboGenericFactory *factory;
CORBA_ORB orb;
CORBA_Environment ev;
CORBA_exception_init(&ev);
orb = gnome_CORBA_init_with_popt_table("ntl-web-search", VERSION, &argc, argv, NULL, 0, NULL,
GNORBA_INIT_SERVER_FUNC, &ev);
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);
factory = bonobo_generic_factory_new_multi("ntl_websearch_view_factory", make_obj, NULL);
factory = bonobo_generic_factory_new_multi("OAFIID:ntl_websearch_view_factory:c69658b2-732c-4a04-a493-4efe57051291", make_obj, NULL);
do {
bonobo_main();

11
components/websearch/ntl-web-search.goad
View file

@ -1,11 +0,0 @@
[ntl_websearch_view_factory]
type=exe
repo_id=IDL:GNOME/GenericFactory:1.0
description=Factory for history views
location_info=ntl-web-search
[ntl_websearch_view]
type=factory
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/MetaView:1.0 IDL:Nautilus/View:1.0
description=Web Search
location_info=ntl_websearch_view_factory

19
components/websearch/ntl-web-search.oafinfo Normal file
View file

@ -0,0 +1,19 @@
<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/GenericFactory: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:GNOME/Control:1.0"/>
<item value="IDL:Nautilus/MetaView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Web Search"/>
</oaf_server>
</oaf_info>

10
configure.in
View file

@ -212,6 +212,16 @@ gnomelocaledir='${prefix}/${DATADIRNAME}/locale'
AC_SUBST(gnomelocaledir)
dnl Check for OAF
dnl Check for OAF
AC_PATH_PROG(OAF_CONFIG,oaf-config,no)
OAF_LIBS=`$OAF_CONFIG --libs`
OAF_CFLAGS=`$OAF_CONFIG --cflags`
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST

4
libnautilus-extensions/Makefile.am
View file

@ -5,7 +5,7 @@ lib_LTLIBRARIES=libnautilus-extensions.la
INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(GNOME_CFLAGS) \
$(BONOBO_CFLAGS) \
$(GNORBA_CFLAGS) \
$(OAF_CFLAGS) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
@ -14,7 +14,7 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
libnautilus_extensions_la_LDFLAGS=\
$(GNOME_LIBS) \
$(GNORBA_LIBS) \
$(OAF_LIBS) \
$(BONOBO_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(VFS_LIBS) \

24
libnautilus-extensions/nautilus-global-preferences.c
View file

@ -128,12 +128,6 @@ global_preferences_create_dialog (void)
NAUTILUS_PREFERENCES_META_VIEWS_SHOW_ANNOTATIONS,
NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (meta_view_pane),
0,
preferences,
NAUTILUS_PREFERENCES_META_VIEWS_SHOW_ANNOTATIONS,
NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (meta_view_pane),
0,
preferences,
@ -199,12 +193,18 @@ nautilus_global_preferences_get_meta_view_iids (void)
{
meta_view_names = nautilus_string_list_new ();
nautilus_string_list_insert (meta_view_names, "ntl_notes_view");
nautilus_string_list_insert (meta_view_names, "hyperbola_navigation_tree");
nautilus_string_list_insert (meta_view_names, "hyperbola_navigation_index");
nautilus_string_list_insert (meta_view_names, "hyperbola_navigation_search");
nautilus_string_list_insert (meta_view_names, "ntl_history_view");
nautilus_string_list_insert (meta_view_names, "ntl_websearch_view");
nautilus_string_list_insert (meta_view_names,
"OAFIID:ntl_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185");
nautilus_string_list_insert (meta_view_names,
"OAFIID:hyperbola_navigation_tree:57542ce0-71ff-442d-a764-462c92514234");
nautilus_string_list_insert (meta_view_names,
"OAFIID:hyperbola_navigation_index:0bafadc7-09f1-4f10-8c8e-dad53124fc49");
nautilus_string_list_insert (meta_view_names,
"OAFIID:hyperbola_navigation_search:89b2f3b8-4f09-49c8-9a7b-ccb14d034813");
nautilus_string_list_insert (meta_view_names,
"OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb");
nautilus_string_list_insert (meta_view_names,
"OAFIID:ntl_websearch_view:8216e1e4-6b01-4a28-82d9-5df30ed7d044");
}
return meta_view_names;

12
libnautilus-extensions/nautilus-global-preferences.h
View file

@ -42,12 +42,12 @@ BEGIN_GNOME_DECLS
#define NAUTILUS_PREFERENCES_HOME_URI "/nautilus/preferences/home_uri"
/* Wellknown meta views */
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_ANNOTATIONS "/nautilus/metaviews/ntl_notes_view"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HELP_CONTENTS "/nautilus/metaviews/hyperbola_navigation_tree"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HELP_INDEX "/nautilus/metaviews/hyperbola_navigation_index"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HELP_SEARCH "/nautilus/metaviews/hyperbola_navigation_search"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HISTORY "/nautilus/metaviews/ntl_history_view"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_WEB_SEARCH "/nautilus/metaviews/ntl_websearch_view"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_ANNOTATIONS "/nautilus/metaviews/OAFIID:ntl_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HELP_CONTENTS "/nautilus/metaviews/OAFIID:hyperbola_navigation_tree:57542ce0-71ff-442d-a764-462c92514234"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HELP_INDEX "/nautilus/metaviews/OAFIID:hyperbola_navigation_index:0bafadc7-09f1-4f10-8c8e-dad53124fc49"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HELP_SEARCH "/nautilus/metaviews/OAFIID:hyperbola_navigation_search:89b2f3b8-4f09-49c8-9a7b-ccb14d034813"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HISTORY "/nautilus/metaviews/OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_WEB_SEARCH "/nautilus/metaviews/OAFIID:ntl_websearch_view:8216e1e4-6b01-4a28-82d9-5df30ed7d044"
/* Preferences not (currently?) displayed in dialog */
#define NAUTILUS_PREFERENCES_ICON_VIEW_TEXT_ATTRIBUTE_NAMES "/nautilus/icon_view/text_attribute_names"

4
libnautilus-private/Makefile.am
View file

@ -5,7 +5,7 @@ lib_LTLIBRARIES=libnautilus-extensions.la
INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(GNOME_CFLAGS) \
$(BONOBO_CFLAGS) \
$(GNORBA_CFLAGS) \
$(OAF_CFLAGS) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
@ -14,7 +14,7 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
libnautilus_extensions_la_LDFLAGS=\
$(GNOME_LIBS) \
$(GNORBA_LIBS) \
$(OAF_LIBS) \
$(BONOBO_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(VFS_LIBS) \

24
libnautilus-private/nautilus-global-preferences.c
View file

@ -128,12 +128,6 @@ global_preferences_create_dialog (void)
NAUTILUS_PREFERENCES_META_VIEWS_SHOW_ANNOTATIONS,
NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (meta_view_pane),
0,
preferences,
NAUTILUS_PREFERENCES_META_VIEWS_SHOW_ANNOTATIONS,
NAUTILUS_PREFERENCE_ITEM_BOOLEAN);
nautilus_preferences_pane_add_item_to_nth_group (NAUTILUS_PREFERENCES_PANE (meta_view_pane),
0,
preferences,
@ -199,12 +193,18 @@ nautilus_global_preferences_get_meta_view_iids (void)
{
meta_view_names = nautilus_string_list_new ();
nautilus_string_list_insert (meta_view_names, "ntl_notes_view");
nautilus_string_list_insert (meta_view_names, "hyperbola_navigation_tree");
nautilus_string_list_insert (meta_view_names, "hyperbola_navigation_index");
nautilus_string_list_insert (meta_view_names, "hyperbola_navigation_search");
nautilus_string_list_insert (meta_view_names, "ntl_history_view");
nautilus_string_list_insert (meta_view_names, "ntl_websearch_view");
nautilus_string_list_insert (meta_view_names,
"OAFIID:ntl_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185");
nautilus_string_list_insert (meta_view_names,
"OAFIID:hyperbola_navigation_tree:57542ce0-71ff-442d-a764-462c92514234");
nautilus_string_list_insert (meta_view_names,
"OAFIID:hyperbola_navigation_index:0bafadc7-09f1-4f10-8c8e-dad53124fc49");
nautilus_string_list_insert (meta_view_names,
"OAFIID:hyperbola_navigation_search:89b2f3b8-4f09-49c8-9a7b-ccb14d034813");
nautilus_string_list_insert (meta_view_names,
"OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb");
nautilus_string_list_insert (meta_view_names,
"OAFIID:ntl_websearch_view:8216e1e4-6b01-4a28-82d9-5df30ed7d044");
}
return meta_view_names;

12
libnautilus-private/nautilus-global-preferences.h
View file

@ -42,12 +42,12 @@ BEGIN_GNOME_DECLS
#define NAUTILUS_PREFERENCES_HOME_URI "/nautilus/preferences/home_uri"
/* Wellknown meta views */
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_ANNOTATIONS "/nautilus/metaviews/ntl_notes_view"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HELP_CONTENTS "/nautilus/metaviews/hyperbola_navigation_tree"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HELP_INDEX "/nautilus/metaviews/hyperbola_navigation_index"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HELP_SEARCH "/nautilus/metaviews/hyperbola_navigation_search"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HISTORY "/nautilus/metaviews/ntl_history_view"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_WEB_SEARCH "/nautilus/metaviews/ntl_websearch_view"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_ANNOTATIONS "/nautilus/metaviews/OAFIID:ntl_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HELP_CONTENTS "/nautilus/metaviews/OAFIID:hyperbola_navigation_tree:57542ce0-71ff-442d-a764-462c92514234"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HELP_INDEX "/nautilus/metaviews/OAFIID:hyperbola_navigation_index:0bafadc7-09f1-4f10-8c8e-dad53124fc49"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HELP_SEARCH "/nautilus/metaviews/OAFIID:hyperbola_navigation_search:89b2f3b8-4f09-49c8-9a7b-ccb14d034813"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_HISTORY "/nautilus/metaviews/OAFIID:ntl_history_view:a7a85bdd-2ecf-4bc1-be7c-ed328a29aacb"
#define NAUTILUS_PREFERENCES_META_VIEWS_SHOW_WEB_SEARCH "/nautilus/metaviews/OAFIID:ntl_websearch_view:8216e1e4-6b01-4a28-82d9-5df30ed7d044"
/* Preferences not (currently?) displayed in dialog */
#define NAUTILUS_PREFERENCES_ICON_VIEW_TEXT_ATTRIBUTE_NAMES "/nautilus/icon_view/text_attribute_names"

4
libnautilus/Makefile.am
View file

@ -5,7 +5,7 @@ lib_LTLIBRARIES=libnautilus.la
INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(GNOME_CFLAGS) \
$(BONOBO_CFLAGS) \
$(GNORBA_CFLAGS) \
$(OAF_CFLAGS) \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
@ -14,7 +14,7 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
libnautilus_la_LDFLAGS=\
$(GNOME_LIBS) \
$(GNORBA_LIBS) \
$(OAF_LIBS) \
$(BONOBO_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(VFS_LIBS) \

2
libnautilus/nautilus-view-component.idl
View file

@ -101,7 +101,7 @@ module Nautilus {
typedef sequence<ViewWindow> ViewWindowList;
interface Application : ::GNOME::GenericFactory, ::Bonobo::Unknown {
interface Application : ::Bonobo::GenericFactory, ::Bonobo::Unknown {
readonly attribute ViewWindowList view_windows;
ViewWindow new_view_window ();
};

12
src/Makefile.am
View file

@ -6,7 +6,7 @@ bin_PROGRAMS=nautilus
INCLUDES =\
-I$(top_srcdir) -I$(top_builddir) \
$(BONOBO_CFLAGS) $(GNORBA_CFLAGS) \
$(BONOBO_CFLAGS) $(OAF_CFLAGS) \
$(GNOMEUI_CFLAGS) $(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
@ -21,7 +21,7 @@ LDADD =\
../libnautilus-extensions/libnautilus-extensions.la \
../librsvg/librsvg.la \
$(BONOBO_LIBS) \
$(GNORBA_LIBS) \
$(OAF_LIBS) \
$(GNOMEUI_LIBS) \
$(GNOMECANVASPIXBUF_LIBS) \
$(VFS_LIBS) \
@ -80,8 +80,8 @@ nautilus_SOURCES =\
TESTS=check-nautilus
gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = \
nautilus.goad
oafdir = $(datadir)/oaf
oaf_DATA = \
nautilus.oafinfo
EXTRA_DIST = nautilus.goad
EXTRA_DIST = $(oaf_DATA)

40
src/Nautilus_shell.oaf.in Normal file
View file

@ -0,0 +1,40 @@
<oaf_info>
<oaf_server iid="OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3" type="exe" location="nautilus">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
<item value="IDL:Nautilus/Application:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="File manager component's factory"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058" type="factory" location="OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="File manager component that shows a two-dimensional icon space"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c" type="factory" location="OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="File manager component that shows a scrollable list"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_window:88e8b2e4-b627-4221-b566-5ba32185c88d" type="factory" location="OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Nautilus/ViewWindow:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Nautilus window"/>
</oaf_server>
</oaf_info>

40
src/Nautilus_shell.server.in Normal file
View file

@ -0,0 +1,40 @@
<oaf_info>
<oaf_server iid="OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3" type="exe" location="nautilus">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
<item value="IDL:Nautilus/Application:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="File manager component's factory"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058" type="factory" location="OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="File manager component that shows a two-dimensional icon space"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c" type="factory" location="OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="File manager component that shows a scrollable list"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_window:88e8b2e4-b627-4221-b566-5ba32185c88d" type="factory" location="OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Nautilus/ViewWindow:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Nautilus window"/>
</oaf_server>
</oaf_info>

4
src/file-manager/Makefile.am
View file

@ -1,7 +1,7 @@
noinst_LTLIBRARIES=libntl-file-manager.la
INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
$(BONOBO_CFLAGS) $(GNORBA_CFLAGS) \
$(BONOBO_CFLAGS) $(OAF_CFLAGS) \
$(GNOMEUI_CFLAGS) -DVERSION="\"$(VERSION)\"" \
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
$(WERROR) \
@ -55,7 +55,7 @@ libntl_file_manager_la_SOURCES= \
# gnome_desktop_LDADD=\
# $(BONOBO_LIBS) \
# $(GNORBA_LIBS) \
# $(OAF_LIBS) \
# $(GNOMEUI_LIBS) \
# $(GDK_PIXBUF_LIBS) \
# $(VFS_LIBS)

13
src/file-manager/dfos-corba.c
View file

@ -23,10 +23,12 @@
#include <config.h>
#include <libgnorba/gnorba.h>
#include <liboaf/liboaf.h>
#include "dfos.h"
#include <libgnome/gnome-i18n.h>
struct _FileOperationServiceServant {
POA_GNOME_Desktop_FileOperationService servant;
@ -212,7 +214,7 @@ init (DFOS *dfos,
PortableServer_POAManager poa_manager;
poa = (PortableServer_POA) CORBA_ORB_resolve_initial_references
(gnome_CORBA_ORB (), "RootPOA", ev);
(oaf_orb_get (), "RootPOA", ev);
if (ev->_major != CORBA_NO_EXCEPTION)
return FALSE;
@ -228,11 +230,8 @@ init (DFOS *dfos,
if (ev->_major != CORBA_NO_EXCEPTION)
return CORBA_OBJECT_NIL;
if (! goad_server_register (CORBA_OBJECT_NIL,
objref,
"IDL:GNOME:Desktop:FileOperationService:1.0",
"object", ev))
return objref;
if (! oaf_active_server_register ("IDL:GNOME:Desktop:FileOperationService:1.0", objref))
return objref;
return CORBA_OBJECT_NIL;
}

1
src/file-manager/dfos.c
View file

@ -25,7 +25,6 @@
#include "dfos.h"
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include <orb/orbit.h>

55
src/nautilus-applicable-views.c
View file

@ -36,7 +36,6 @@
#include <libgnomevfs/gnome-vfs-file-info.h>
#include <libgnomevfs/gnome-vfs-async-ops.h>
#include <libgnorba/gnorba.h>
#include <sys/types.h>
#include <dirent.h>
#include <limits.h>
@ -262,13 +261,13 @@ my_notify_when_ready (GnomeVFSAsyncHandle *ah,
}
if (strcmp (navinfo->navinfo.content_type, "text/html") == 0) {
fallback_iid = "ntl_web_browser";
fallback_iid = "OAFIID:ntl_web_browser:0ce1a736-c939-4ac7-b12c-19d72bf1510b";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("ntl_web_browser", "Web Page"));
nautilus_view_identifier_new ("OAFIID:ntl_web_browser:0ce1a736-c939-4ac7-b12c-19d72bf1510b", "Web Page"));
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("embeddable:text-plain", "Text"));
nautilus_view_identifier_new ("OAFIID:bonobo_text-plain:26e1f6ba-90dd-4783-b304-6122c4b6c821", "Text"));
} else if (nautilus_str_has_prefix (navinfo->navinfo.content_type, "image/")) {
fallback_iid = "eog-image-viewer";
navinfo->content_identifiers = g_slist_append
@ -281,13 +280,13 @@ my_notify_when_ready (GnomeVFSAsyncHandle *ah,
nautilus_view_identifier_new ("xchat", "Chat room"));
} else if (strcmp(navinfo->navinfo.content_type, "special/directory") == 0
|| strcmp(navinfo->navinfo.content_type, "application/x-nautilus-vdir") == 0) {
fallback_iid = "ntl_file_manager_icon_view";
fallback_iid = "OAFIID:ntl_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("ntl_file_manager_icon_view", "Icons"));
nautilus_view_identifier_new ("OAFIID:ntl_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058", "Icons"));
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("ntl_file_manager_list_view", "List"));
nautilus_view_identifier_new ("OAFIID:ntl_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c", "List"));
/* besides the information in OAF/GConf, we also want to offer components that are specifically refered to in the metadata,
so we ask the metadata for content views here and add them accordingly. */
@ -295,19 +294,19 @@ my_notify_when_ready (GnomeVFSAsyncHandle *ah,
/* FIXME: for now, we just do this for directories but it should apply to all places with available metadata */
add_components_from_metadata (navinfo);
} else if (strcmp (navinfo->navinfo.content_type, "special/webdav-directory") == 0) {
fallback_iid = "ntl_web_browser";
fallback_iid = "OAFIID:ntl_web_browser:0ce1a736-c939-4ac7-b12c-19d72bf1510b";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("ntl_web_browser", "Web Page"));
nautilus_view_identifier_new ("OAFIID:ntl_web_browser:0ce1a736-c939-4ac7-b12c-19d72bf1510b", "Web Page"));
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("ntl_file_manager_icon_view", "Icons"));
nautilus_view_identifier_new ("OAFIID:ntl_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058", "Icons"));
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("ntl_file_manager_list_view", "List"));
nautilus_view_identifier_new ("OAFIID:ntl_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c", "List"));
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("embeddable:text-plain", "Text"));
nautilus_view_identifier_new ("OAFIID:bonobo_text-plain:26e1f6ba-90dd-4783-b304-6122c4b6c821", "Text"));
/* besides the information in OAF/GConf, we also want to offer components that are specifically refered to in the metadata,
so we ask the metadata for content views here and add them accordingly. */
@ -317,26 +316,28 @@ my_notify_when_ready (GnomeVFSAsyncHandle *ah,
}
else if (strcmp (navinfo->navinfo.content_type, "application/x-rpm") == 0
|| nautilus_str_has_suffix (navinfo->navinfo.requested_uri, ".rpm")) {
fallback_iid = "nautilus_rpm_view";
fallback_iid = "OAFIID:nautilus_rpm_view:22ea002c-11e6-44fd-b13c-9445175a5e70";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("nautilus_rpm_view", "Package"));
nautilus_view_identifier_new ("OAFIID:nautilus_rpm_view:22ea002c-11e6-44fd-b13c-9445175a5e70",
"Package"));
} else if (strcmp(navinfo->navinfo.content_type, "special/eazel-service") == 0) {
fallback_iid = "nautilus_service_startup_view";
fallback_iid = "OAFIID:nautilus_service_startup_view:a8f1b0ef-a39f-4f92-84bc-1704f0321a82";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("nautilus_service_startup_view", "Service"));
nautilus_view_identifier_new ("OAFIID:nautilus_service_startup_view:a8f1b0ef-a39f-4f92-84bc-1704f0321a82", "Service"));
/* FIXME: This mozilla-hack should be short lived until http issues are solved */
} else if (strcmp(navinfo->navinfo.content_type, "special/mozilla-hack") == 0) {
fallback_iid = "nautilus_mozilla_content_view";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("nautilus_mozilla_content_view", "Mozilla"));
nautilus_view_identifier_new ("OAFIID:nautilus_mozilla_content_view:1ee70717-57bf-4079-aae5-922abdd576b1",
"Mozilla"));
} else if (strcmp(navinfo->navinfo.content_type, "text/plain") == 0) {
fallback_iid = "embeddable:text-plain";
fallback_iid = "OAFIID:bonobo_text-plain:26e1f6ba-90dd-4783-b304-6122c4b6c821";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("embeddable:text-plain", "Text"));
nautilus_view_identifier_new ("OAFIID:bonobo_text-plain:26e1f6ba-90dd-4783-b304-6122c4b6c821", "Text"));
} else {
/* Can't display file; nothing registered to handle this file type. */
result_code = NAUTILUS_NAVIGATION_RESULT_NO_HANDLER_FOR_TYPE;
@ -346,7 +347,7 @@ my_notify_when_ready (GnomeVFSAsyncHandle *ah,
/* FIXME: Should do this only when in some special testing mode or something. */
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("nautilus_sample_content_view", "Sample"));
nautilus_view_identifier_new ("OAFIID:nautilus_sample_content_view:45c746bc-7d64-4346-90d5-6410463b43ae", "Sample"));
add_meta_view_iids_from_preferences (navinfo);
@ -361,7 +362,7 @@ my_notify_when_ready (GnomeVFSAsyncHandle *ah,
}
/* The following routine uses metadata associated with the current url to add content view components specified in the metadata */
/* the content views are specified in the string as "componentname1:label1\ncomponentname2:label2\n..." */
/* the content views are specified in the string as "label=componentname11\nlabel=componentname2\n..." */
static void
add_components_from_metadata (NautilusNavigationInfo *navinfo)
@ -369,7 +370,7 @@ add_components_from_metadata (NautilusNavigationInfo *navinfo)
char *content_views;
char **pieces;
const char *component_str;
char *colon_pos;
char *equal_pos;
int index;
content_views = nautilus_directory_get_metadata
@ -382,14 +383,16 @@ add_components_from_metadata (NautilusNavigationInfo *navinfo)
for (index = 0; (component_str = pieces[index]) != NULL; index++) {
/* break the component string into the name and label */
colon_pos = strchr(component_str, ':');
if (colon_pos != NULL) {
*colon_pos++ = '\0';
puts (component_str);
equal_pos = strchr (component_str, '=');
if (equal_pos != NULL) {
*equal_pos++ = '\0';
/* add it to the list */
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new (component_str, colon_pos));
nautilus_view_identifier_new (equal_pos, component_str));
}
}
g_strfreev (pieces);

34
src/nautilus-application.c
View file

@ -46,11 +46,11 @@ impl_Nautilus_Application_new_view_window(impl_POA_Nautilus_Application *servant
CORBA_Environment * ev);
static CORBA_boolean
impl_Nautilus_Application_supports(impl_POA_Nautilus_Application * servant,
CORBA_char *obj_goad_id,
CORBA_char *obj_iid,
CORBA_Environment * ev);
static CORBA_Object
impl_Nautilus_Application_create_object(impl_POA_Nautilus_Application *servant,
CORBA_char * goad_id,
CORBA_char *obj_iid,
GNOME_stringlist * params,
CORBA_Environment * ev);
@ -60,7 +60,7 @@ static POA_Nautilus_Application__epv impl_Nautilus_Application_epv = {
(gpointer) &impl_Nautilus_Application_new_view_window
};
static POA_GNOME_GenericFactory__epv impl_Nautilus_Application_GNOME_GenericFactory_epv = {
static POA_Bonobo_GenericFactory__epv impl_Nautilus_Application_Bonobo_GenericFactory_epv = {
NULL, /* _private */
(gpointer) &impl_Nautilus_Application_supports,
(gpointer) &impl_Nautilus_Application_create_object
@ -72,7 +72,7 @@ static PortableServer_ServantBase__epv impl_Nautilus_Application_base_epv = {
};
static POA_Nautilus_Application__vepv impl_Nautilus_Application_vepv = {
&impl_Nautilus_Application_base_epv,
&impl_Nautilus_Application_GNOME_GenericFactory_epv,
&impl_Nautilus_Application_Bonobo_GenericFactory_epv,
NULL,
&impl_Nautilus_Application_epv,
};
@ -119,17 +119,17 @@ impl_Nautilus_Application_new_view_window(impl_POA_Nautilus_Application *servant
static CORBA_boolean
impl_Nautilus_Application_supports(impl_POA_Nautilus_Application * servant,
CORBA_char * obj_goad_id,
CORBA_char * obj_iid,
CORBA_Environment * ev)
{
return (!strcmp(obj_goad_id, "ntl_file_manager_icon_view")
|| !strcmp(obj_goad_id, "ntl_file_manager_list_view")
|| !strcmp(obj_goad_id, "ntl_window"));
return (!strcmp(obj_iid, "OAFIID:ntl_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058")
|| !strcmp(obj_iid, "OAFIID:ntl_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c")
|| !strcmp(obj_iid, "OAFIID:ntl_window:88e8b2e4-b627-4221-b566-5ba32185c88d"));
}
static CORBA_Object
impl_Nautilus_Application_create_object(impl_POA_Nautilus_Application *servant,
CORBA_char * goad_id,
CORBA_char *obj_iid,
GNOME_stringlist * params,
CORBA_Environment * ev)
{
@ -137,15 +137,15 @@ impl_Nautilus_Application_create_object(impl_POA_Nautilus_Application *servant,
FMDirectoryView *dir_view;
NautilusContentViewFrame *view_frame;
if(!impl_Nautilus_Application_supports(servant, goad_id, ev))
if(!impl_Nautilus_Application_supports(servant, obj_iid, ev))
return CORBA_OBJECT_NIL;
if (strcmp (goad_id, "ntl_file_manager_icon_view") == 0)
if (strcmp (obj_iid, "OAFIID:ntl_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058") == 0)
dir_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_icon_view_get_type (), NULL));
else if (strcmp (goad_id, "ntl_file_manager_list_view") == 0)
else if (strcmp (obj_iid, "OAFIID:ntl_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c") == 0)
dir_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_list_view_get_type (), NULL));
else if (strcmp (goad_id, "ntl_window"))
retval = impl_Nautilus_Application_new_view_window(servant, ev);
else if (strcmp (obj_iid,"OAFIID:ntl_window:88e8b2e4-b627-4221-b566-5ba32185c88d") == 0)
retval = impl_Nautilus_Application_new_view_window (servant, ev);
else
dir_view = NULL;
@ -154,6 +154,8 @@ impl_Nautilus_Application_create_object(impl_POA_Nautilus_Application *servant,
if(dir_view)
{
view_frame = fm_directory_view_get_view_frame (dir_view);
printf ("CREATING content view: 0x%x\n", (unsigned) view_frame);
retval = CORBA_Object_duplicate(bonobo_object_corba_objref(BONOBO_OBJECT(view_frame)), ev);
}
@ -236,7 +238,9 @@ nautilus_app_init (NautilusApp *app)
CORBA_exception_init(&ev);
objref = impl_Nautilus_Application__create(bonobo_poa(), app, &ev);
goad_server_register(NULL, objref, "ntl_file_manager_factory", NULL, &ev);
oaf_active_server_register("OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3", objref);
bonobo_object_construct(BONOBO_OBJECT(app), objref);
CORBA_exception_free(&ev);
}

12
src/nautilus-main.c
View file

@ -52,8 +52,9 @@ main(int argc, char *argv[])
struct poptOption options[] = {
#if !defined (NAUTILUS_OMIT_SELF_CHECK)
{ "check", '\0', POPT_ARG_NONE, &check, 0, N_("Perform high-speed self-check tests."), NULL },
POPT_AUTOHELP
#endif
{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &oaf_popt_options, 0, NULL, NULL },
POPT_AUTOHELP
{ NULL, '\0', 0, NULL, 0, NULL, NULL }
};
@ -67,8 +68,12 @@ main(int argc, char *argv[])
/* Initialize the services that we use. */
CORBA_exception_init(&ev);
orb = gnome_CORBA_init_with_popt_table ("nautilus", VERSION, &argc, argv, options,
0, &ctx, GNORBA_INIT_SERVER_FUNC, &ev);
gnome_init_with_popt_table("nautilus", VERSION,
argc, argv,
options, 0, &ctx);
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
g_thread_init (NULL);
gnome_vfs_init ();
@ -97,3 +102,4 @@ main(int argc, char *argv[])
return EXIT_SUCCESS;
}

20
src/nautilus-view-frame.c
View file

@ -228,6 +228,9 @@ nautilus_view_init (NautilusView *view)
static void
nautilus_view_destroy_client(NautilusView *view)
{
CORBA_Environment ev;
CORBA_exception_init(&ev);
if(!view->component_class)
return;
@ -237,18 +240,21 @@ nautilus_view_destroy_client(NautilusView *view)
gtk_container_remove (GTK_CONTAINER(view), view->client_widget); view->client_widget = NULL;
if(view->component_class->destroy)
{
CORBA_Environment ev;
CORBA_exception_init(&ev);
view->component_class->destroy(view, &ev);
CORBA_exception_free(&ev);
}
if (! CORBA_Object_is_nil (view->zoomable, &ev)) {
Bonobo_Unknown_unref (view->zoomable, &ev);
view->zoomable = CORBA_OBJECT_NIL;
}
if(view->component_class->destroy) {
view->component_class->destroy(view, &ev);
}
bonobo_object_unref (view->view_frame); view->view_frame = NULL;
view->component_class = NULL;
view->component_data = NULL;
CORBA_exception_free(&ev);
}
static void

23
src/nautilus.goad
View file

@ -1,23 +0,0 @@
[ntl_file_manager_factory]
type=exe
repo_id=IDL:GNOME/GenericFactory:1.0 IDL:Nautilus/Application:1.0
description=File manager component's factory
location_info=nautilus
[ntl_file_manager_icon_view]
type=factory
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/ContentView:1.0 IDL:Nautilus/View:1.0
description=File manager component that shows a two-dimensional icon space
location_info=ntl_file_manager_factory
[ntl_file_manager_list_view]
type=factory
repo_id=IDL:GNOME/Control:1.0 IDL:Nautilus/ContentView:1.0 IDL:Nautilus/View:1.0
description=File manager component that shows a scrollable list
location_info=ntl_file_manager_factory
[ntl_window]
type=factory
repo_id=IDL:Nautilus/ViewWindow:1.0
description=Nautilus window
location_info=ntl_file_manager_factory

2
src/nautilus.h
View file

@ -4,7 +4,7 @@
#define NAUTILUS_H 1
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include <liboaf/liboaf.h>
#include <bonobo.h>
#include "ntl-types.h"

40
src/nautilus.oafinfo Normal file
View file

@ -0,0 +1,40 @@
<oaf_info>
<oaf_server iid="OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3" type="exe" location="nautilus">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
<item value="IDL:Nautilus/Application:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="File manager component's factory"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058" type="factory" location="OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="File manager component that shows a two-dimensional icon space"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c" type="factory" location="OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Nautilus/ContentView:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="File manager component that shows a scrollable list"/>
</oaf_server>
<oaf_server iid="OAFIID:ntl_window:88e8b2e4-b627-4221-b566-5ba32185c88d" type="factory" location="OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Nautilus/ViewWindow:1.0"/>
<item value="IDL:Bonobo/Unknown:1.0"/>
</oaf_attribute>
<oaf_attribute name="description" type="string" value="Nautilus window"/>
</oaf_server>
</oaf_info>

34
src/ntl-app.c
View file

@ -46,11 +46,11 @@ impl_Nautilus_Application_new_view_window(impl_POA_Nautilus_Application *servant
CORBA_Environment * ev);
static CORBA_boolean
impl_Nautilus_Application_supports(impl_POA_Nautilus_Application * servant,
CORBA_char *obj_goad_id,
CORBA_char *obj_iid,
CORBA_Environment * ev);
static CORBA_Object
impl_Nautilus_Application_create_object(impl_POA_Nautilus_Application *servant,
CORBA_char * goad_id,
CORBA_char *obj_iid,
GNOME_stringlist * params,
CORBA_Environment * ev);
@ -60,7 +60,7 @@ static POA_Nautilus_Application__epv impl_Nautilus_Application_epv = {
(gpointer) &impl_Nautilus_Application_new_view_window
};
static POA_GNOME_GenericFactory__epv impl_Nautilus_Application_GNOME_GenericFactory_epv = {
static POA_Bonobo_GenericFactory__epv impl_Nautilus_Application_Bonobo_GenericFactory_epv = {
NULL, /* _private */
(gpointer) &impl_Nautilus_Application_supports,
(gpointer) &impl_Nautilus_Application_create_object
@ -72,7 +72,7 @@ static PortableServer_ServantBase__epv impl_Nautilus_Application_base_epv = {
};
static POA_Nautilus_Application__vepv impl_Nautilus_Application_vepv = {
&impl_Nautilus_Application_base_epv,
&impl_Nautilus_Application_GNOME_GenericFactory_epv,
&impl_Nautilus_Application_Bonobo_GenericFactory_epv,
NULL,
&impl_Nautilus_Application_epv,
};
@ -119,17 +119,17 @@ impl_Nautilus_Application_new_view_window(impl_POA_Nautilus_Application *servant
static CORBA_boolean
impl_Nautilus_Application_supports(impl_POA_Nautilus_Application * servant,
CORBA_char * obj_goad_id,
CORBA_char * obj_iid,
CORBA_Environment * ev)
{
return (!strcmp(obj_goad_id, "ntl_file_manager_icon_view")
|| !strcmp(obj_goad_id, "ntl_file_manager_list_view")
|| !strcmp(obj_goad_id, "ntl_window"));
return (!strcmp(obj_iid, "OAFIID:ntl_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058")
|| !strcmp(obj_iid, "OAFIID:ntl_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c")
|| !strcmp(obj_iid, "OAFIID:ntl_window:88e8b2e4-b627-4221-b566-5ba32185c88d"));
}
static CORBA_Object
impl_Nautilus_Application_create_object(impl_POA_Nautilus_Application *servant,
CORBA_char * goad_id,
CORBA_char *obj_iid,
GNOME_stringlist * params,
CORBA_Environment * ev)
{
@ -137,15 +137,15 @@ impl_Nautilus_Application_create_object(impl_POA_Nautilus_Application *servant,
FMDirectoryView *dir_view;
NautilusContentViewFrame *view_frame;
if(!impl_Nautilus_Application_supports(servant, goad_id, ev))
if(!impl_Nautilus_Application_supports(servant, obj_iid, ev))
return CORBA_OBJECT_NIL;
if (strcmp (goad_id, "ntl_file_manager_icon_view") == 0)
if (strcmp (obj_iid, "OAFIID:ntl_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058") == 0)
dir_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_icon_view_get_type (), NULL));
else if (strcmp (goad_id, "ntl_file_manager_list_view") == 0)
else if (strcmp (obj_iid, "OAFIID:ntl_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c") == 0)
dir_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_list_view_get_type (), NULL));
else if (strcmp (goad_id, "ntl_window"))
retval = impl_Nautilus_Application_new_view_window(servant, ev);
else if (strcmp (obj_iid,"OAFIID:ntl_window:88e8b2e4-b627-4221-b566-5ba32185c88d") == 0)
retval = impl_Nautilus_Application_new_view_window (servant, ev);
else
dir_view = NULL;
@ -154,6 +154,8 @@ impl_Nautilus_Application_create_object(impl_POA_Nautilus_Application *servant,
if(dir_view)
{
view_frame = fm_directory_view_get_view_frame (dir_view);
printf ("CREATING content view: 0x%x\n", (unsigned) view_frame);
retval = CORBA_Object_duplicate(bonobo_object_corba_objref(BONOBO_OBJECT(view_frame)), ev);
}
@ -236,7 +238,9 @@ nautilus_app_init (NautilusApp *app)
CORBA_exception_init(&ev);
objref = impl_Nautilus_Application__create(bonobo_poa(), app, &ev);
goad_server_register(NULL, objref, "ntl_file_manager_factory", NULL, &ev);
oaf_active_server_register("OAFIID:ntl_file_manager_factory:bd1e1862-92d7-4391-963e-37583f0daef3", objref);
bonobo_object_construct(BONOBO_OBJECT(app), objref);
CORBA_exception_free(&ev);
}

12
src/ntl-main.c
View file

@ -52,8 +52,9 @@ main(int argc, char *argv[])
struct poptOption options[] = {
#if !defined (NAUTILUS_OMIT_SELF_CHECK)
{ "check", '\0', POPT_ARG_NONE, &check, 0, N_("Perform high-speed self-check tests."), NULL },
POPT_AUTOHELP
#endif
{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, &oaf_popt_options, 0, NULL, NULL },
POPT_AUTOHELP
{ NULL, '\0', 0, NULL, 0, NULL, NULL }
};
@ -67,8 +68,12 @@ main(int argc, char *argv[])
/* Initialize the services that we use. */
CORBA_exception_init(&ev);
orb = gnome_CORBA_init_with_popt_table ("nautilus", VERSION, &argc, argv, options,
0, &ctx, GNORBA_INIT_SERVER_FUNC, &ev);
gnome_init_with_popt_table("nautilus", VERSION,
argc, argv,
options, 0, &ctx);
orb = oaf_init (argc, argv);
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
g_thread_init (NULL);
gnome_vfs_init ();
@ -97,3 +102,4 @@ main(int argc, char *argv[])
return EXIT_SUCCESS;
}

55
src/ntl-uri-map.c
View file

@ -36,7 +36,6 @@
#include <libgnomevfs/gnome-vfs-file-info.h>
#include <libgnomevfs/gnome-vfs-async-ops.h>
#include <libgnorba/gnorba.h>
#include <sys/types.h>
#include <dirent.h>
#include <limits.h>
@ -262,13 +261,13 @@ my_notify_when_ready (GnomeVFSAsyncHandle *ah,
}
if (strcmp (navinfo->navinfo.content_type, "text/html") == 0) {
fallback_iid = "ntl_web_browser";
fallback_iid = "OAFIID:ntl_web_browser:0ce1a736-c939-4ac7-b12c-19d72bf1510b";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("ntl_web_browser", "Web Page"));
nautilus_view_identifier_new ("OAFIID:ntl_web_browser:0ce1a736-c939-4ac7-b12c-19d72bf1510b", "Web Page"));
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("embeddable:text-plain", "Text"));
nautilus_view_identifier_new ("OAFIID:bonobo_text-plain:26e1f6ba-90dd-4783-b304-6122c4b6c821", "Text"));
} else if (nautilus_str_has_prefix (navinfo->navinfo.content_type, "image/")) {
fallback_iid = "eog-image-viewer";
navinfo->content_identifiers = g_slist_append
@ -281,13 +280,13 @@ my_notify_when_ready (GnomeVFSAsyncHandle *ah,
nautilus_view_identifier_new ("xchat", "Chat room"));
} else if (strcmp(navinfo->navinfo.content_type, "special/directory") == 0
|| strcmp(navinfo->navinfo.content_type, "application/x-nautilus-vdir") == 0) {
fallback_iid = "ntl_file_manager_icon_view";
fallback_iid = "OAFIID:ntl_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("ntl_file_manager_icon_view", "Icons"));
nautilus_view_identifier_new ("OAFIID:ntl_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058", "Icons"));
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("ntl_file_manager_list_view", "List"));
nautilus_view_identifier_new ("OAFIID:ntl_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c", "List"));
/* besides the information in OAF/GConf, we also want to offer components that are specifically refered to in the metadata,
so we ask the metadata for content views here and add them accordingly. */
@ -295,19 +294,19 @@ my_notify_when_ready (GnomeVFSAsyncHandle *ah,
/* FIXME: for now, we just do this for directories but it should apply to all places with available metadata */
add_components_from_metadata (navinfo);
} else if (strcmp (navinfo->navinfo.content_type, "special/webdav-directory") == 0) {
fallback_iid = "ntl_web_browser";
fallback_iid = "OAFIID:ntl_web_browser:0ce1a736-c939-4ac7-b12c-19d72bf1510b";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("ntl_web_browser", "Web Page"));
nautilus_view_identifier_new ("OAFIID:ntl_web_browser:0ce1a736-c939-4ac7-b12c-19d72bf1510b", "Web Page"));
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("ntl_file_manager_icon_view", "Icons"));
nautilus_view_identifier_new ("OAFIID:ntl_file_manager_icon_view:42681b21-d5ca-4837-87d2-394d88ecc058", "Icons"));
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("ntl_file_manager_list_view", "List"));
nautilus_view_identifier_new ("OAFIID:ntl_file_manager_list_view:521e489d-0662-4ad7-ac3a-832deabe111c", "List"));
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("embeddable:text-plain", "Text"));
nautilus_view_identifier_new ("OAFIID:bonobo_text-plain:26e1f6ba-90dd-4783-b304-6122c4b6c821", "Text"));
/* besides the information in OAF/GConf, we also want to offer components that are specifically refered to in the metadata,
so we ask the metadata for content views here and add them accordingly. */
@ -317,26 +316,28 @@ my_notify_when_ready (GnomeVFSAsyncHandle *ah,
}
else if (strcmp (navinfo->navinfo.content_type, "application/x-rpm") == 0
|| nautilus_str_has_suffix (navinfo->navinfo.requested_uri, ".rpm")) {
fallback_iid = "nautilus_rpm_view";
fallback_iid = "OAFIID:nautilus_rpm_view:22ea002c-11e6-44fd-b13c-9445175a5e70";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("nautilus_rpm_view", "Package"));
nautilus_view_identifier_new ("OAFIID:nautilus_rpm_view:22ea002c-11e6-44fd-b13c-9445175a5e70",
"Package"));
} else if (strcmp(navinfo->navinfo.content_type, "special/eazel-service") == 0) {
fallback_iid = "nautilus_service_startup_view";
fallback_iid = "OAFIID:nautilus_service_startup_view:a8f1b0ef-a39f-4f92-84bc-1704f0321a82";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("nautilus_service_startup_view", "Service"));
nautilus_view_identifier_new ("OAFIID:nautilus_service_startup_view:a8f1b0ef-a39f-4f92-84bc-1704f0321a82", "Service"));
/* FIXME: This mozilla-hack should be short lived until http issues are solved */
} else if (strcmp(navinfo->navinfo.content_type, "special/mozilla-hack") == 0) {
fallback_iid = "nautilus_mozilla_content_view";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("nautilus_mozilla_content_view", "Mozilla"));
nautilus_view_identifier_new ("OAFIID:nautilus_mozilla_content_view:1ee70717-57bf-4079-aae5-922abdd576b1",
"Mozilla"));
} else if (strcmp(navinfo->navinfo.content_type, "text/plain") == 0) {
fallback_iid = "embeddable:text-plain";
fallback_iid = "OAFIID:bonobo_text-plain:26e1f6ba-90dd-4783-b304-6122c4b6c821";
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("embeddable:text-plain", "Text"));
nautilus_view_identifier_new ("OAFIID:bonobo_text-plain:26e1f6ba-90dd-4783-b304-6122c4b6c821", "Text"));
} else {
/* Can't display file; nothing registered to handle this file type. */
result_code = NAUTILUS_NAVIGATION_RESULT_NO_HANDLER_FOR_TYPE;
@ -346,7 +347,7 @@ my_notify_when_ready (GnomeVFSAsyncHandle *ah,
/* FIXME: Should do this only when in some special testing mode or something. */
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new ("nautilus_sample_content_view", "Sample"));
nautilus_view_identifier_new ("OAFIID:nautilus_sample_content_view:45c746bc-7d64-4346-90d5-6410463b43ae", "Sample"));
add_meta_view_iids_from_preferences (navinfo);
@ -361,7 +362,7 @@ my_notify_when_ready (GnomeVFSAsyncHandle *ah,
}
/* The following routine uses metadata associated with the current url to add content view components specified in the metadata */
/* the content views are specified in the string as "componentname1:label1\ncomponentname2:label2\n..." */
/* the content views are specified in the string as "label=componentname11\nlabel=componentname2\n..." */
static void
add_components_from_metadata (NautilusNavigationInfo *navinfo)
@ -369,7 +370,7 @@ add_components_from_metadata (NautilusNavigationInfo *navinfo)
char *content_views;
char **pieces;
const char *component_str;
char *colon_pos;
char *equal_pos;
int index;
content_views = nautilus_directory_get_metadata
@ -382,14 +383,16 @@ add_components_from_metadata (NautilusNavigationInfo *navinfo)
for (index = 0; (component_str = pieces[index]) != NULL; index++) {
/* break the component string into the name and label */
colon_pos = strchr(component_str, ':');
if (colon_pos != NULL) {
*colon_pos++ = '\0';
puts (component_str);
equal_pos = strchr (component_str, '=');
if (equal_pos != NULL) {
*equal_pos++ = '\0';
/* add it to the list */
navinfo->content_identifiers = g_slist_append
(navinfo->content_identifiers,
nautilus_view_identifier_new (component_str, colon_pos));
nautilus_view_identifier_new (equal_pos, component_str));
}
}
g_strfreev (pieces);

20
src/ntl-view.c
View file

@ -228,6 +228,9 @@ nautilus_view_init (NautilusView *view)
static void
nautilus_view_destroy_client(NautilusView *view)
{
CORBA_Environment ev;
CORBA_exception_init(&ev);
if(!view->component_class)
return;
@ -237,18 +240,21 @@ nautilus_view_destroy_client(NautilusView *view)
gtk_container_remove (GTK_CONTAINER(view), view->client_widget); view->client_widget = NULL;
if(view->component_class->destroy)
{
CORBA_Environment ev;
CORBA_exception_init(&ev);
view->component_class->destroy(view, &ev);
CORBA_exception_free(&ev);
}
if (! CORBA_Object_is_nil (view->zoomable, &ev)) {
Bonobo_Unknown_unref (view->zoomable, &ev);
view->zoomable = CORBA_OBJECT_NIL;
}
if(view->component_class->destroy) {
view->component_class->destroy(view, &ev);
}
bonobo_object_unref (view->view_frame); view->view_frame = NULL;
view->component_class = NULL;
view->component_data = NULL;
CORBA_exception_free(&ev);
}
static void