From 80ec1e99978688c41c7e8d02e1ae4c6da9fd480c Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 6 Apr 2000 18:55:32 +0000 Subject: removed uih from the argument list, added cal. use cal as user_data in * gui/calendar-commands.c (calendar_control_activate): removed uih from the argument list, added cal. use cal as user_data in callbacks rather than the control. (calendar_control_deactivate): removed uih from argument list svn path=/trunk/; revision=2311 --- calendar/gui/evolution-calendar-control.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'calendar/gui/evolution-calendar-control.c') diff --git a/calendar/gui/evolution-calendar-control.c b/calendar/gui/evolution-calendar-control.c index b1c436b716..028a3bc1c5 100644 --- a/calendar/gui/evolution-calendar-control.c +++ b/calendar/gui/evolution-calendar-control.c @@ -24,15 +24,10 @@ control_activate_cb (BonoboControl *control, gboolean activate, gpointer user_data) { - BonoboUIHandler *uih; - - uih = bonobo_control_get_ui_handler (control); - g_assert (uih); - if (activate) - calendar_control_activate (control, uih); + calendar_control_activate (control, user_data); else - calendar_control_deactivate (control, uih); + calendar_control_deactivate (control); } @@ -40,17 +35,15 @@ static BonoboObject * calendar_factory (BonoboGenericFactory *Factory, void *closure) { BonoboControl *control; - GnomeCalendar *cal; /* Create the control. */ - //cal = gnome_calendar_new ("unnamed"); - cal = new_calendar ("title", NULL, NULL, NULL, 0); + GnomeCalendar *cal = new_calendar ("title", NULL, NULL, NULL, 0); gtk_widget_show (GTK_WIDGET (cal)); control = bonobo_control_new (GTK_WIDGET (cal)); gtk_signal_connect (GTK_OBJECT (control), "activate", - control_activate_cb, NULL); + control_activate_cb, cal); return BONOBO_OBJECT (control); } -- cgit v1.2.3