One-line change of a g_error to g_warning when notification fails.

[platform/core/uifw/at-spi2-atk.git] / libspi / component.h

diff --git a/libspi/component.h b/libspi/component.h
index 355fc06..769b7e5 100644 (file)
--- a/libspi/component.h
+++ b/libspi/component.h
@@ -17,39 +17,32 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef COMPONENT_H_
-#define COMPONENT_H_
+#ifndef SPI_COMPONENT_H_
+#define SPI_COMPONENT_H_
 
+#include <libspi/base.h>
+#include <atk/atkcomponent.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
-#include <bonobo/bonobo-object.h>
-#include <atk/atk.h>
-#include <libspi/Accessibility.h>
-
-#define COMPONENT_TYPE        (accessibility_component_get_type ())
-#define COMPONENT(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), COMPONENT_TYPE, Component))
-#define COMPONENT_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), COMPONENT_TYPE, ComponentClass))
-#define IS_COMPONENT(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), COMPONENT_TYPE))
-#define IS_COMPONENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), COMPONENT_TYPE))
+#define SPI_COMPONENT_TYPE        (spi_component_get_type ())
+#define SPI_COMPONENT(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), SPI_COMPONENT_TYPE, SpiComponent))
+#define SPI_COMPONENT_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), SPI_COMPONENT_TYPE, SpiComponentClass))
+#define SPI_IS_COMPONENT(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), SPI_COMPONENT_TYPE))
+#define SPI_IS_COMPONENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SPI_COMPONENT_TYPE))
 
 typedef struct {
-        BonoboObject parent;
-        AtkObject *atko;
-} Component;
+        SpiBase parent;
+} SpiComponent;
 
 typedef struct {
-        BonoboObjectClass parent_class;
+        SpiBaseClass parent_class;
         POA_Accessibility_Component__epv epv;
-} ComponentClass;
+} SpiComponentClass;
 
-GType                  accessibility_component_get_type   (void);
-Component              *component_interface_new       (AtkObject *o);
+GType         spi_component_get_type      (void);
+SpiComponent *spi_component_interface_new (AtkObject *o);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* COMPONENT_H_ */
+#endif /* SPI_COMPONENT_H_ */