aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/calendar-commands.c
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-11-09 06:11:10 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-11-09 06:11:10 +0800
commite0dfbb056c3dcdbc1a29823b6c273901ade29598 (patch)
tree237e558c2e4cbb8141351fdb86d09bd000c6a05c /calendar/gui/calendar-commands.c
parentcdbcf964e2829e4c4002dcf2fd229f3b2cf88e56 (diff)
downloadgsoc2013-evolution-e0dfbb056c3dcdbc1a29823b6c273901ade29598.tar.gz
gsoc2013-evolution-e0dfbb056c3dcdbc1a29823b6c273901ade29598.tar.zst
gsoc2013-evolution-e0dfbb056c3dcdbc1a29823b6c273901ade29598.zip
Use g_object_set_data(..., NULL) instead of gtk_object_remove_data().
* gui/calendar-commands.c (calendar_control_deactivate): Use g_object_set_data(..., NULL) instead of gtk_object_remove_data(). * gui/calendar-commands.c: Use g_object_{set,get}_* functions instead of gtk_object_{set,get}_*. * gui/calendar-commands.c: Likewise. * gui/calendar-config.c: Likewise. * gui/control-factory.c: Likewise. * gui/e-calendar-table.c: Likewise. * gui/e-comp-editor-registry.c: Likewise. * gui/e-day-view-main-item.c: Likewise. * gui/e-day-view-time-item.c: Likewise. * gui/e-day-view-top-item.c: Likewise. * gui/e-day-view.c: Likewise. * gui/e-meeting-attendee.c: Likewise. * gui/e-meeting-model.c: Likewise. * gui/e-meeting-time-sel-item.c: Likewise. * gui/e-meeting-time-sel.c: Likewise. * gui/e-week-view-event-item.c: Likewise. * gui/e-week-view-layout.c: Likewise. * gui/e-week-view-main-item.c: Likewise. * gui/e-week-view-titles-item.c: Likewise. * gui/e-week-view.c: Likewise. * gui/gnome-cal.c: Likewise. * gui/print.c: Likewise. svn path=/trunk/; revision=18674
Diffstat (limited to 'calendar/gui/calendar-commands.c')
-rw-r--r--calendar/gui/calendar-commands.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 6888fad5a4..edce58a44a 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -477,7 +477,7 @@ control_util_show_settings (GnomeCalendar *gcal)
GNOME_Evolution_ShellView shell_view;
CORBA_Environment ev;
- control = gtk_object_get_data (GTK_OBJECT (gcal), "control");
+ control = g_object_get_data (G_OBJECT (gcal), "control");
if (control == NULL)
return;
@@ -601,7 +601,7 @@ gcal_calendar_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
control = BONOBO_CONTROL (data);
- focus = gtk_object_get_data (GTK_OBJECT (control), "focus_data");
+ focus = g_object_get_data (G_OBJECT (control), "focus_data");
g_assert (focus != NULL);
if (in) {
@@ -627,7 +627,7 @@ gcal_taskpad_focus_change_cb (GnomeCalendar *gcal, gboolean in, gpointer data)
control = BONOBO_CONTROL (data);
- focus = gtk_object_get_data (GTK_OBJECT (control), "focus_data");
+ focus = g_object_get_data (G_OBJECT (control), "focus_data");
g_assert (focus != NULL);
if (in) {
@@ -754,7 +754,7 @@ calendar_control_activate (BonoboControl *control,
focus->calendar_focused = FALSE;
focus->taskpad_focused = FALSE;
- gtk_object_set_data (GTK_OBJECT (control), "focus_data", focus);
+ g_object_set_data (G_OBJECT (control), "focus_data", focus);
}
void
@@ -768,10 +768,10 @@ calendar_control_deactivate (BonoboControl *control, GnomeCalendar *gcal)
gnome_calendar_set_ui_component (gcal, uic);
- focus = gtk_object_get_data (GTK_OBJECT (control), "focus_data");
+ focus = g_object_get_data (G_OBJECT (control), "focus_data");
g_assert (focus != NULL);
- gtk_object_remove_data (GTK_OBJECT (control), "focus_data");
+ g_object_set_data (G_OBJECT (control), "focus_data", NULL);
g_free (focus);
gnome_calendar_discard_view_menus (gcal);