aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--my-evolution/ChangeLog4
-rw-r--r--my-evolution/e-summary-offline-handler.c22
2 files changed, 12 insertions, 14 deletions
diff --git a/my-evolution/ChangeLog b/my-evolution/ChangeLog
index c0136d7ef7..eefec0ca1d 100644
--- a/my-evolution/ChangeLog
+++ b/my-evolution/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-11 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-summary-offline-handler.c: Convert from GtkObject to GObject.
+
2002-11-07 Ettore Perazzoli <ettore@ximian.com>
* GNOME_Evolution_Summary.server.in.in: Renamed from
diff --git a/my-evolution/e-summary-offline-handler.c b/my-evolution/e-summary-offline-handler.c
index f7d75eb74b..270f4e90ee 100644
--- a/my-evolution/e-summary-offline-handler.c
+++ b/my-evolution/e-summary-offline-handler.c
@@ -205,9 +205,10 @@ impl_goOnline (PortableServer_Servant servant,
}
}
-/* GtkObject methods */
+/* GObject methods */
+
static void
-impl_destroy (GtkObject *object)
+impl_finalize (GObject *object)
{
ESummaryOfflineHandler *offline_handler;
ESummaryOfflineHandlerPriv *priv;
@@ -215,10 +216,6 @@ impl_destroy (GtkObject *object)
offline_handler = E_SUMMARY_OFFLINE_HANDLER (object);
priv = offline_handler->priv;
- if (priv == NULL) {
- return;
- }
-
if (priv->listener_interface != CORBA_OBJECT_NIL) {
CORBA_Environment ev;
@@ -229,22 +226,19 @@ impl_destroy (GtkObject *object)
g_slist_free (priv->summaries);
- offline_handler->priv = NULL;
g_free (priv);
- if (GTK_OBJECT_CLASS (parent_class)->destroy != NULL) {
- GTK_OBJECT_CLASS (parent_class)->destroy (object);
- }
+ (* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void
e_summary_offline_handler_class_init (ESummaryOfflineHandlerClass *klass)
{
- GtkObjectClass *object_class;
+ GObjectClass *object_class;
POA_GNOME_Evolution_Offline__epv *epv;
- object_class = GTK_OBJECT_CLASS (klass);
- object_class->destroy = impl_destroy;
+ object_class = G_OBJECT_CLASS (klass);
+ object_class->finalize = impl_finalize;
epv = &klass->epv;
epv->_get_isOffline = impl__get_isOffline;
@@ -270,7 +264,7 @@ e_summary_offline_handler_new (void)
{
ESummaryOfflineHandler *new;
- new = gtk_type_new (e_summary_offline_handler_get_type ());
+ new = g_object_new (e_summary_offline_handler_get_type (), NULL);
return new;
}