diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-10-07 01:26:08 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2010-10-07 01:26:08 +0800 |
| commit | 1c6f2d154e74f908e2c4a137de0233b5faf4f6b6 (patch) | |
| tree | 77a33236e48ed59a7c7c65e8a1c91481dd09f3eb /calendar/gui/e-itip-control.c | |
| parent | 1b2fefb086c3e34089beb8b89b22d79005cc7725 (diff) | |
| download | gsoc2013-evolution-1c6f2d154e74f908e2c4a137de0233b5faf4f6b6.tar gsoc2013-evolution-1c6f2d154e74f908e2c4a137de0233b5faf4f6b6.tar.gz gsoc2013-evolution-1c6f2d154e74f908e2c4a137de0233b5faf4f6b6.tar.bz2 gsoc2013-evolution-1c6f2d154e74f908e2c4a137de0233b5faf4f6b6.tar.lz gsoc2013-evolution-1c6f2d154e74f908e2c4a137de0233b5faf4f6b6.tar.xz gsoc2013-evolution-1c6f2d154e74f908e2c4a137de0233b5faf4f6b6.tar.zst gsoc2013-evolution-1c6f2d154e74f908e2c4a137de0233b5faf4f6b6.zip | |
Bug #631320 - GtkObject is gone in GTK3
Diffstat (limited to 'calendar/gui/e-itip-control.c')
| -rw-r--r-- | calendar/gui/e-itip-control.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 838445d1b9..2c1c452299 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -106,7 +106,7 @@ struct _EItipControlPrivate { #define HTML_BODY_END "</body>" #define HTML_FOOTER "</html>" -static void e_itip_control_destroy (GtkObject *obj); +static void e_itip_control_dispose (GObject *obj); static void find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_partstat *status); static gboolean object_requested_cb (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data); @@ -117,11 +117,11 @@ G_DEFINE_TYPE (EItipControl, e_itip_control, GTK_TYPE_VBOX) static void e_itip_control_class_init (EItipControlClass *klass) { - GtkObjectClass *gtkobject_class; + GObjectClass *object_class; - gtkobject_class = GTK_OBJECT_CLASS (klass); + object_class = G_OBJECT_CLASS (klass); - gtkobject_class->destroy = e_itip_control_destroy; + object_class->dispose = e_itip_control_dispose; } static void @@ -488,7 +488,7 @@ clean_up (EItipControl *itip) } static void -e_itip_control_destroy (GtkObject *obj) +e_itip_control_dispose (GObject *obj) { EItipControl *itip = E_ITIP_CONTROL (obj); EItipControlPrivate *priv; @@ -518,7 +518,8 @@ e_itip_control_destroy (GtkObject *obj) itip->priv = NULL; } - (* GTK_OBJECT_CLASS (e_itip_control_parent_class)->destroy) (obj); + if (G_OBJECT_CLASS (e_itip_control_parent_class)->dispose) + G_OBJECT_CLASS (e_itip_control_parent_class)->dispose (obj); } GtkWidget * |