Commit 3aaa9809 authored by Anders Carlsson's avatar Anders Carlsson Committed by Anders Carlsson

Fix warnings by putting #ifdef GNOME2_CONVERSION_COMPLETE around unused

2002-01-03  Anders Carlsson  <andersca@gnu.org>

	* src/nautilus-component-adapter-factory.c: Fix warnings by
	putting #ifdef GNOME2_CONVERSION_COMPLETE around unused functions
	and variables.
parent fa2a9d00
2002-01-03 Anders Carlsson <andersca@gnu.org>
* src/nautilus-component-adapter-factory.c: Fix warnings by
putting #ifdef GNOME2_CONVERSION_COMPLETE around unused functions
and variables.
2002-01-02 Darin Adler <darin@bentspoon.com> 2002-01-02 Darin Adler <darin@bentspoon.com>
* components/hardware/nautilus-hardware-view.c: * components/hardware/nautilus-hardware-view.c:
......
...@@ -49,10 +49,11 @@ EEL_CLASS_BOILERPLATE (NautilusComponentAdapterFactory, ...@@ -49,10 +49,11 @@ EEL_CLASS_BOILERPLATE (NautilusComponentAdapterFactory,
nautilus_component_adapter_factory, nautilus_component_adapter_factory,
GTK_TYPE_OBJECT) GTK_TYPE_OBJECT)
#if GNOME2_CONVERSION_COMPLETE
static void static void
activate_factory (NautilusComponentAdapterFactory *factory) activate_factory (NautilusComponentAdapterFactory *factory)
{ {
#if GNOME2_CONVERSION_COMPLETE
BonoboObjectClient *object_client; BonoboObjectClient *object_client;
object_client = bonobo_object_activate (NAUTILUS_COMPONENT_ADAPTER_FACTORY_IID, 0); object_client = bonobo_object_activate (NAUTILUS_COMPONENT_ADAPTER_FACTORY_IID, 0);
...@@ -63,7 +64,6 @@ activate_factory (NautilusComponentAdapterFactory *factory) ...@@ -63,7 +64,6 @@ activate_factory (NautilusComponentAdapterFactory *factory)
factory->details->corba_factory = bonobo_object_query_interface factory->details->corba_factory = bonobo_object_query_interface
(BONOBO_OBJECT (object_client), "IDL:Nautilus/ComponentAdapterFactory:1.0"); (BONOBO_OBJECT (object_client), "IDL:Nautilus/ComponentAdapterFactory:1.0");
bonobo_object_unref (BONOBO_OBJECT (object_client)); bonobo_object_unref (BONOBO_OBJECT (object_client));
#endif
} }
static void static void
...@@ -75,6 +75,8 @@ unref_factory (NautilusComponentAdapterFactory *factory) ...@@ -75,6 +75,8 @@ unref_factory (NautilusComponentAdapterFactory *factory)
Bonobo_Unknown_unref (factory->details->corba_factory, &ev); Bonobo_Unknown_unref (factory->details->corba_factory, &ev);
CORBA_exception_free (&ev); CORBA_exception_free (&ev);
} }
#endif
static void static void
release_factory (NautilusComponentAdapterFactory *factory) release_factory (NautilusComponentAdapterFactory *factory)
...@@ -87,6 +89,7 @@ release_factory (NautilusComponentAdapterFactory *factory) ...@@ -87,6 +89,7 @@ release_factory (NautilusComponentAdapterFactory *factory)
CORBA_exception_free (&ev); CORBA_exception_free (&ev);
} }
#ifdef GNOME2_CONVERSION_COMPLETE
static Nautilus_ComponentAdapterFactory static Nautilus_ComponentAdapterFactory
get_corba_factory (NautilusComponentAdapterFactory *factory) get_corba_factory (NautilusComponentAdapterFactory *factory)
{ {
...@@ -114,6 +117,7 @@ get_corba_factory (NautilusComponentAdapterFactory *factory) ...@@ -114,6 +117,7 @@ get_corba_factory (NautilusComponentAdapterFactory *factory)
} }
return result; return result;
} }
#endif
static void static void
nautilus_component_adapter_factory_init (NautilusComponentAdapterFactory *factory) nautilus_component_adapter_factory_init (NautilusComponentAdapterFactory *factory)
...@@ -176,7 +180,9 @@ nautilus_component_adapter_factory_create_adapter (NautilusComponentAdapterFacto ...@@ -176,7 +180,9 @@ nautilus_component_adapter_factory_create_adapter (NautilusComponentAdapterFacto
{ {
Nautilus_View nautilus_view; Nautilus_View nautilus_view;
Bonobo_Control bonobo_control; Bonobo_Control bonobo_control;
#ifdef GNOME2_CONVERSION_COMPLETE
Nautilus_ComponentAdapterFactory corba_factory; Nautilus_ComponentAdapterFactory corba_factory;
#endif
CORBA_Environment ev; CORBA_Environment ev;
CORBA_exception_init (&ev); CORBA_exception_init (&ev);
...@@ -203,7 +209,7 @@ nautilus_component_adapter_factory_create_adapter (NautilusComponentAdapterFacto ...@@ -203,7 +209,7 @@ nautilus_component_adapter_factory_create_adapter (NautilusComponentAdapterFacto
} }
} else { } else {
nautilus_view = CORBA_OBJECT_NIL; nautilus_view = CORBA_OBJECT_NIL;
#if 0 #ifdef GNOME2_CONVERSION_COMPLETE
/* No View interface, we must adapt the object */ /* No View interface, we must adapt the object */
corba_factory = get_corba_factory (factory); corba_factory = get_corba_factory (factory);
......
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