Commit daa5d16f authored by Darin Adler's avatar Darin Adler
Browse files

Got rid of unneeded CORBA_Environment variable.

	* components/music/main.c: (music_view_make_object), (main):
	* components/services/install/nautilus-view/main.c: (main):
	Got rid of unneeded CORBA_Environment variable.

	* components/services/install/nautilus-view/nautilus-service-install-view.oafinfo:
	Fixed a typo that was making the view not work.

	* src/nautilus-applicable-views.c: (got_file_info_callback):
	Reformatted.

	* src/nautilus-window-manage-views.c:
	(nautilus_window_update_state): Added a FIXME for a place where an
	error happens and it's not reported.

	* src/nautilus-application.c: (nautilus_application_startup):
	Fixed a double-destroy problem with the CORBA object I just added.
parent 4ac3cf9b
2000-07-07 Darin Adler <darin@eazel.com>
* components/music/main.c: (music_view_make_object), (main):
* components/services/install/nautilus-view/main.c: (main):
Got rid of unneeded CORBA_Environment variable.
* components/services/install/nautilus-view/nautilus-service-install-view.oafinfo:
Fixed a typo that was making the view not work.
* src/nautilus-applicable-views.c: (got_file_info_callback):
Reformatted.
* src/nautilus-window-manage-views.c:
(nautilus_window_update_state): Added a FIXME for a place where an
error happens and it's not reported.
* src/nautilus-application.c: (nautilus_application_startup):
Fixed a double-destroy problem with the CORBA object I just added.
2000-07-07 J Shane Culpepper <pepper@eazel.com>
* components/services/install/Makefile.am:
......@@ -6,24 +25,18 @@
* components/services/install/nautilus-view/main.c:
(service_install_object_destroyed), (service_install_make_object),
(main):
*
components/services/install/nautilus-view/nautilus-service-install-
view.c: (generate_install_form), (generate_form_title),
* components/services/install/nautilus-view/nautilus-service-install-view.c:
(generate_install_form), (generate_form_title),
(nautilus_service_install_view_initialize_class),
(nautilus_service_install_view_initialize),
(nautilus_service_install_view_destroy),
(nautilus_service_install_view_get_nautilus_view),
(nautilus_service_install_view_load_uri),
(service_install_load_location_callback):
*
components/services/install/nautilus-view/nautilus-service-install-
view.h:
*
components/services/install/nautilus-view/nautilus-service-install-
view.oafinfo:
*
components/services/install/nautilus-view/nautilus-service-install.
c: (nautilus_service_install_download_progress_signal),
* components/services/install/nautilus-view/nautilus-service-install-view.h:
* components/services/install/nautilus-view/nautilus-service-install-view.oafinfo:
* components/services/install/nautilus-view/nautilus-service-install.c:
(nautilus_service_install_download_progress_signal),
(nautilus_service_install_progress_signal),
(nautilus_service_install_download_failed),
(nautilus_service_install_failed_helper),
......@@ -32,9 +45,7 @@
(nautilus_service_install_done),
(nautilus_service_install_view_install_package_callback),
(nautilus_service_install_view_uninstall_package_callback):
*
components/services/install/nautilus-view/nautilus-service-install.
h:
* components/services/install/nautilus-view/nautilus-service-install.h:
Adding the skeleton for the eazel install view.
......
......@@ -44,13 +44,13 @@ music_view_object_destroyed(GtkObject *obj)
static BonoboObject *
music_view_make_object (BonoboGenericFactory *factory,
const char *goad_id,
void *closure)
const char *iid,
void *closure)
{
NautilusMusicView *music_view;
NautilusView *nautilus_view;
if (strcmp (goad_id, "OAFIID:nautilus_music_view:9456b5d2-60a8-407f-a56e-d561e1821391")) {
if (strcmp (iid, "OAFIID:nautilus_music_view:9456b5d2-60a8-407f-a56e-d561e1821391")) {
return NULL;
}
......@@ -64,20 +64,18 @@ music_view_make_object (BonoboGenericFactory *factory,
return BONOBO_OBJECT (nautilus_view);
}
int main(int argc, char *argv[])
int
main (int argc, char *argv[])
{
BonoboGenericFactory *factory;
CORBA_ORB orb;
CORBA_Environment ev;
/* Initialize gettext support */
#ifdef ENABLE_NLS /* sadly we need this ifdef because otherwise the following get empty statement warnings */
bindtextdomain (PACKAGE, GNOMELOCALEDIR);
textdomain (PACKAGE);
#endif
CORBA_exception_init(&ev);
gnome_init_with_popt_table("nautilus-music-view", VERSION,
argc, argv,
oaf_popt_options, 0, NULL);
......
<oaf_info>
<oaf_server iid="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32" type="exe" location="nautilus-service-install-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" value="Nautilus Service Install View Factory"/>
<oaf_attribute name="description" type="string" value="Service Install View Component's Factory"/>
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" value="Nautilus Service Install View Factory"/>
<oaf_attribute name="description" type="string" value="Service Install View Component's Factory"/>
</oaf_server>
<oaf_server iid="OAFIID:nautilus_service_install_view:886546ca-1115-4ea4-8d30-8cefa2f5070b" type="factory" location="OAFIID:nautilus_sevice_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32">
<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="name" type="string" value="Nautilus Service Install View"/>
<oaf_attribute name="description" type="string" value="Service Install View Component"/>
<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv">
<item value="eazel-install"/>
</oaf_attribute>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="eazel-install"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Install"/>
<oaf_server iid="OAFIID:nautilus_service_install_view:886546ca-1115-4ea4-8d30-8cefa2f5070b" type="factory" location="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" value="Nautilus Service Install View"/>
<oaf_attribute name="description" type="string" value="Service Install View Component"/>
<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
<item value="eazel-install"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Install Page"/>
</oaf_server>
</oaf_info>
......@@ -30,7 +30,7 @@
#include <bonobo.h>
#include "nautilus-service-install-view.h"
static int object_count =0;
static int object_count = 0;
static void
service_install_object_destroyed (GtkObject *obj) {
......@@ -40,7 +40,7 @@ service_install_object_destroyed (GtkObject *obj) {
}
}
static BonoboObject*
static BonoboObject *
service_install_make_object (BonoboGenericFactory *factory,
const char *iid,
void *closure) {
......@@ -68,11 +68,8 @@ service_install_make_object (BonoboGenericFactory *factory,
int
main (int argc, char *argv[]) {
BonoboGenericFactory *factory;
CORBA_ORB orb;
CORBA_Environment ev;
CORBA_exception_init (&ev);
BonoboGenericFactory *factory;
CORBA_ORB orb;
gnome_init_with_popt_table ("nautilus-service-install-view", VERSION,
argc, argv,
......
<oaf_info>
<oaf_server iid="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32" type="exe" location="nautilus-service-install-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" value="Nautilus Service Install View Factory"/>
<oaf_attribute name="description" type="string" value="Service Install View Component's Factory"/>
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" value="Nautilus Service Install View Factory"/>
<oaf_attribute name="description" type="string" value="Service Install View Component's Factory"/>
</oaf_server>
<oaf_server iid="OAFIID:nautilus_service_install_view:886546ca-1115-4ea4-8d30-8cefa2f5070b" type="factory" location="OAFIID:nautilus_sevice_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32">
<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="name" type="string" value="Nautilus Service Install View"/>
<oaf_attribute name="description" type="string" value="Service Install View Component"/>
<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv">
<item value="eazel-install"/>
</oaf_attribute>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="eazel-install"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Install"/>
<oaf_server iid="OAFIID:nautilus_service_install_view:886546ca-1115-4ea4-8d30-8cefa2f5070b" type="factory" location="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" value="Nautilus Service Install View"/>
<oaf_attribute name="description" type="string" value="Service Install View Component"/>
<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
<item value="eazel-install"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Install Page"/>
</oaf_server>
</oaf_info>
<oaf_info>
<oaf_server iid="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32" type="exe" location="nautilus-service-install-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" value="Nautilus Service Install View Factory"/>
<oaf_attribute name="description" type="string" value="Service Install View Component's Factory"/>
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" value="Nautilus Service Install View Factory"/>
<oaf_attribute name="description" type="string" value="Service Install View Component's Factory"/>
</oaf_server>
<oaf_server iid="OAFIID:nautilus_service_install_view:886546ca-1115-4ea4-8d30-8cefa2f5070b" type="factory" location="OAFIID:nautilus_sevice_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32">
<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="name" type="string" value="Nautilus Service Install View"/>
<oaf_attribute name="description" type="string" value="Service Install View Component"/>
<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv">
<item value="eazel-install"/>
</oaf_attribute>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="eazel-install"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Install"/>
<oaf_server iid="OAFIID:nautilus_service_install_view:886546ca-1115-4ea4-8d30-8cefa2f5070b" type="factory" location="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" value="Nautilus Service Install View"/>
<oaf_attribute name="description" type="string" value="Service Install View Component"/>
<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
<item value="eazel-install"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Install Page"/>
</oaf_server>
</oaf_info>
......@@ -30,7 +30,7 @@
#include <bonobo.h>
#include "nautilus-service-install-view.h"
static int object_count =0;
static int object_count = 0;
static void
service_install_object_destroyed (GtkObject *obj) {
......@@ -40,7 +40,7 @@ service_install_object_destroyed (GtkObject *obj) {
}
}
static BonoboObject*
static BonoboObject *
service_install_make_object (BonoboGenericFactory *factory,
const char *iid,
void *closure) {
......@@ -68,11 +68,8 @@ service_install_make_object (BonoboGenericFactory *factory,
int
main (int argc, char *argv[]) {
BonoboGenericFactory *factory;
CORBA_ORB orb;
CORBA_Environment ev;
CORBA_exception_init (&ev);
BonoboGenericFactory *factory;
CORBA_ORB orb;
gnome_init_with_popt_table ("nautilus-service-install-view", VERSION,
argc, argv,
......
<oaf_info>
<oaf_server iid="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32" type="exe" location="nautilus-service-install-view">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" value="Nautilus Service Install View Factory"/>
<oaf_attribute name="description" type="string" value="Service Install View Component's Factory"/>
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:GNOME/GenericFactory:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" value="Nautilus Service Install View Factory"/>
<oaf_attribute name="description" type="string" value="Service Install View Component's Factory"/>
</oaf_server>
<oaf_server iid="OAFIID:nautilus_service_install_view:886546ca-1115-4ea4-8d30-8cefa2f5070b" type="factory" location="OAFIID:nautilus_sevice_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32">
<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="name" type="string" value="Nautilus Service Install View"/>
<oaf_attribute name="description" type="string" value="Service Install View Component"/>
<oaf_attribute name="bonobo:additional_uri_schemes" type="stringv">
<item value="eazel-install"/>
</oaf_attribute>
<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
<item value="eazel-install"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Install"/>
<oaf_server iid="OAFIID:nautilus_service_install_view:886546ca-1115-4ea4-8d30-8cefa2f5070b" type="factory" location="OAFIID:nautilus_service_install_view_factory:e59e53d1-e3d1-46fe-ae28-3ec5c56b7d32">
<oaf_attribute name="repo_ids" type="stringv">
<item value="IDL:Bonobo/Unknown:1.0"/>
<item value="IDL:Bonobo/Control:1.0"/>
<item value="IDL:Nautilus/View:1.0"/>
</oaf_attribute>
<oaf_attribute name="name" type="string" value="Nautilus Service Install View"/>
<oaf_attribute name="description" type="string" value="Service Install View Component"/>
<oaf_attribute name="bonobo:supported_uri_schemes" type="stringv">
<item value="eazel-install"/>
</oaf_attribute>
<oaf_attribute name="nautilus:view_as_name" type="string" value="Install Page"/>
</oaf_server>
</oaf_info>
......@@ -46,8 +46,6 @@
#include <libgnomevfs/gnome-vfs-file-info.h>
#include <libgnomevfs/gnome-vfs-async-ops.h>
#include <liboaf/liboaf.h>
#include <sys/types.h>
#include <dirent.h>
#include <limits.h>
......@@ -61,8 +59,6 @@ static void async_get_file_info_text (GnomeVFSAsyncHandle
GnomeVFSAsyncGetFileInfoCallback callback,
gpointer callback_data);
/* Nautilus View Identifiers associate a component name with a user displayable name */
static NautilusNavigationResult
get_nautilus_navigation_result_from_gnome_vfs_result (GnomeVFSResult gnome_vfs_result)
{
......@@ -126,8 +122,9 @@ got_file_info_callback (GnomeVFSAsyncHandle *ah,
file_result = result_list->data;
vfs_result_code = file_result->result;
if (vfs_result_code != GNOME_VFS_OK && vfs_result_code != GNOME_VFS_ERROR_NOT_SUPPORTED
&& vfs_result_code != GNOME_VFS_ERROR_INVALID_URI) {
if (vfs_result_code != GNOME_VFS_OK
&& vfs_result_code != GNOME_VFS_ERROR_NOT_SUPPORTED
&& vfs_result_code != GNOME_VFS_ERROR_INVALID_URI) {
goto out;
}
......
......@@ -372,12 +372,12 @@ nautilus_application_startup (NautilusApplication *application,
}
#endif
CORBA_exception_init (&ev);
/* FIXME: This is a temporary hack so we can use the CORBA
* interface even though I can't get activation to work.
*/
shell = bonobo_object_corba_objref (BONOBO_OBJECT (nautilus_shell_new (application)));
CORBA_exception_init (&ev);
shell = CORBA_Object_duplicate (bonobo_object_corba_objref (BONOBO_OBJECT (nautilus_shell_new (application))), &ev);
/* Set up the desktop. */
if (manage_desktop) {
......@@ -401,9 +401,7 @@ nautilus_application_startup (NautilusApplication *application,
/* We're done with the shell now, so let it go. */
Nautilus_Shell_unref (shell, &ev);
#if 0
CORBA_Object_release (shell, &ev);
#endif
CORBA_exception_free (&ev);
}
......
......@@ -945,6 +945,7 @@ nautilus_window_update_state (gpointer data)
location, selection,
window->new_requesting_view, window->new_content_view);
} else {
/* FIXME: Silent error here! */
window->cv_progress_error = TRUE;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment