diff options
| author | Hans Petter Jansson <hpj@ximian.com> | 2002-12-07 09:37:23 +0800 |
|---|---|---|
| committer | Hans Petter <hansp@src.gnome.org> | 2002-12-07 09:37:23 +0800 |
| commit | 24086f5caa0d8309a7890f7ddde16fbfd60424f8 (patch) | |
| tree | 666445b8bc297b0d15c7485c453ada1759f5c7dc /calendar/gui/e-meeting-model.c | |
| parent | aa0aa65bfafdbd0bbd04bef45e2bf57a2d835e9e (diff) | |
| download | gsoc2013-evolution-24086f5caa0d8309a7890f7ddde16fbfd60424f8.tar.gz gsoc2013-evolution-24086f5caa0d8309a7890f7ddde16fbfd60424f8.tar.zst gsoc2013-evolution-24086f5caa0d8309a7890f7ddde16fbfd60424f8.zip | |
Pass the env argument to bonobo_control_set_property ().
2002-12-06 Hans Petter Jansson <hpj@ximian.com>
* gui/component-factory.c (): Pass the env argument to
bonobo_control_set_property ().
* gui/e-meeting-model.c (class_init): We're no longer derived from
GtkObject, so use GObject class methods instead. destroy->finalize.
(destroy): Zapped.
(finalize): Implement based on old destroy ().
svn path=/trunk/; revision=19048
Diffstat (limited to 'calendar/gui/e-meeting-model.c')
| -rw-r--r-- | calendar/gui/e-meeting-model.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c index 7ae89e06c6..0dde3a6850 100644 --- a/calendar/gui/e-meeting-model.c +++ b/calendar/gui/e-meeting-model.c @@ -109,7 +109,7 @@ struct _EMeetingModelQueueData { static void class_init (EMeetingModelClass *klass); static void init (EMeetingModel *model); -static void destroy (GtkObject *obj); +static void finalize (GObject *obj); static void refresh_queue_add (EMeetingModel *im, int row, EMeetingTime *start, @@ -621,15 +621,15 @@ free_duplicated_key (void *key, gpointer data) static void class_init (EMeetingModelClass *klass) { - GtkObjectClass *object_class; + GObjectClass *gobject_class; ETableModelClass *etm_class; - object_class = GTK_OBJECT_CLASS (klass); + gobject_class = G_OBJECT_CLASS (klass); etm_class = E_TABLE_MODEL_CLASS (klass); parent_class = g_type_class_peek_parent (klass); - object_class->destroy = destroy; + gobject_class->finalize = finalize; etm_class->column_count = column_count; etm_class->row_count = row_count; @@ -685,7 +685,7 @@ init (EMeetingModel *im) } static void -destroy (GtkObject *obj) +finalize (GObject *obj) { EMeetingModel *im = E_MEETING_MODEL (obj); EMeetingModelPrivate *priv; @@ -699,7 +699,8 @@ destroy (GtkObject *obj) g_ptr_array_free (priv->attendees, TRUE); for (l = priv->tables; l != NULL; l = l->next) - gtk_signal_disconnect_by_data (GTK_OBJECT (l->data), im); + g_signal_handlers_disconnect_matched (G_OBJECT (l->data), G_SIGNAL_MATCH_DATA, + 0, 0, NULL, NULL, im); g_list_free (priv->tables); if (priv->client != NULL) |