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

1 files changed, 17 insertions, 21 deletions

diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index b095217b34..a527369594 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1272,9 +1272,9 @@ set_view (GnomeCalendar	*gcal, GnomeCalendarViewType view_type,
 	/* For the week & month views we want the selection in the date
 	   navigator to be rounded to the nearest week when the arrow buttons
 	   are pressed to move to the previous/next month. */
-	gtk_object_set (GTK_OBJECT (priv->date_navigator->calitem),
-			"round_selection_when_moving", round_selection,
-			NULL);
+	g_object_set (G_OBJECT (priv->date_navigator->calitem),
+		      "round_selection_when_moving", round_selection,
+		      NULL);
 }
 
 /**
@@ -1472,10 +1472,10 @@ gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal)
 	e_calendar_get_border_size (priv->date_navigator,
 				    &top_border, &bottom_border,
 				    &left_border, &right_border);
-	gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem),
-			"row_height", &row_height,
-			"column_width", &col_width,
-			NULL);
+	g_object_get (G_OBJECT (priv->date_navigator->calitem),
+		      "row_height", &row_height,
+		      "column_width", &col_width,
+		      NULL);
 
 	if (priv->current_view_type == GNOME_CAL_MONTH_VIEW && !priv->range_selected) {
 		right_pane_width = priv->hpane_pos_month_view;
@@ -2643,10 +2643,10 @@ gnome_calendar_update_paned_quanta (GnomeCalendar	*gcal)
 	e_calendar_get_border_size (priv->date_navigator,
 				    &top_border, &bottom_border,
 				    &left_border, &right_border);
-	gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem),
-			"row_height", &row_height,
-			"column_width", &col_width,
-			NULL);
+	g_object_get (G_OBJECT (priv->date_navigator->calitem),
+		      "row_height", &row_height,
+		      "column_width", &col_width,
+		      NULL);
 
 	/* The EPaned quantum feature works better if we add on the calendar
 	   borders to the quantum size. Otherwise if you shrink the date
@@ -2661,12 +2661,8 @@ gnome_calendar_update_paned_quanta (GnomeCalendar	*gcal)
 	   resize the widgets as the bar is dragged. Otherwise the user has
 	   to mess around to get the number of months that they want. */
 #if 1
-	gtk_object_set (GTK_OBJECT (priv->hpane),
-			"quantum", (guint) col_width,
-			NULL);
-	gtk_object_set (GTK_OBJECT (priv->vpane),
-			"quantum", (guint) row_height,
-			NULL);
+	g_object_set (G_OBJECT (priv->hpane), "quantum", (guint) col_width, NULL);
+	g_object_set (G_OBJECT (priv->vpane), "quantum", (guint) row_height, NULL);
 #endif
 
 	gnome_calendar_set_pane_positions (gcal);
@@ -2690,10 +2686,10 @@ gnome_calendar_on_date_navigator_size_allocate (GtkWidget     *widget,
 	e_calendar_get_border_size (priv->date_navigator,
 				    &top_border, &bottom_border,
 				    &left_border, &right_border);
-	gtk_object_get (GTK_OBJECT (priv->date_navigator->calitem),
-			"row_height", &row_height,
-			"column_width", &col_width,
-			NULL);
+	g_object_get (G_OBJECT (priv->date_navigator->calitem),
+		      "row_height", &row_height,
+		      "column_width", &col_width,
+		      NULL);
 
 	/* We subtract one from each dimension since we added 1 in
 	   set_view(). */