converted to BonoboObject. (impl_Cal_get_query): bonobo_object_unref the

2002-11-07  Rodrigo Moya <rodrigo@ximian.com>

	* pcs/cal.[ch]: converted to BonoboObject.
	(impl_Cal_get_query): bonobo_object_unref the query returned by
	cal_backend_get_query if we can't duplicate it.

	* pcs/query.[ch]:
	* pcs/cal-factory.[ch]: converted to BonoboObject.

	* pcs/query-backend.[ch]:
	* pcs/cal-backend-file.[ch]:
	* pcs/cal-backend.[ch]: GObjectify.

svn path=/trunk/; revision=18630

1 files changed, 8 insertions, 9 deletions

diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h
index f8ef057c44..61db51abf6 100644
--- a/calendar/pcs/cal.h
+++ b/calendar/pcs/cal.h
@@ -23,8 +23,7 @@
 #ifndef CAL_H
 #define CAL_H
 
-#include <gtk/gtkobject.h>
-#include <bonobo/bonobo-xobject.h>
+#include <bonobo/bonobo-object.h>
 #include "pcs/evolution-calendar.h"
 #include "pcs/cal-common.h"
 
@@ -33,27 +32,27 @@ G_BEGIN_DECLS
 
 
 #define CAL_TYPE            (cal_get_type ())
-#define CAL(obj)            (GTK_CHECK_CAST ((obj), CAL_TYPE, Cal))
-#define CAL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_TYPE, CalClass))
-#define IS_CAL(obj)         (GTK_CHECK_TYPE ((obj), CAL_TYPE))
-#define IS_CAL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_TYPE))
+#define CAL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAL_TYPE, Cal))
+#define CAL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CAL_TYPE, CalClass))
+#define IS_CAL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAL_TYPE))
+#define IS_CAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CAL_TYPE))
 
 typedef struct _CalPrivate CalPrivate;
 
 struct _Cal {
-	BonoboXObject object;
+	BonoboObject object;
 
 	/* Private data */
 	CalPrivate *priv;
 };
 
 struct _CalClass {
-	BonoboXObjectClass parent_class;
+	BonoboObjectClass parent_class;
 
 	POA_GNOME_Evolution_Calendar_Cal__epv epv;
 };
 
-GtkType cal_get_type (void);
+GType cal_get_type (void);
 
 Cal *cal_construct (Cal *cal,
 		    CalBackend *backend,