Bug 606250 - Remove usage of deprecated GTK+ symbols

Several GtkWidget macros were recently deprecated.

6 files changed, 8 insertions, 8 deletions

diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index b699c84bc4..2bfa0918c3 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1260,7 +1260,7 @@ e_calendar_view_new_appointment_for (ECalendarView *cal_view,
 	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (cal_view));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	priv = cal_view->priv;
 
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 53a8a4498b..a01c060491 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -219,7 +219,7 @@ timezone_entry_mnemonic_activate (GtkWidget *widget,
 
 	priv = E_TIMEZONE_ENTRY_GET_PRIVATE (widget);
 
-	if (GTK_WIDGET_CAN_FOCUS (widget)) {
+	if (gtk_widget_get_can_focus (widget)) {
 		if (priv->button != NULL)
 			gtk_widget_grab_focus (priv->button);
 	}
diff --git a/calendar/gui/ea-day-view-cell.c b/calendar/gui/ea-day-view-cell.c
index 0b0b7a75c5..6760b7cc42 100644
--- a/calendar/gui/ea-day-view-cell.c
+++ b/calendar/gui/ea-day-view-cell.c
@@ -389,7 +389,7 @@ component_interface_grab_focus (AtkComponent *comp)
         gtk_widget_queue_draw (day_view->main_canvas);
 
         toplevel = gtk_widget_get_toplevel (GTK_WIDGET (day_view));
-        if (GTK_WIDGET_TOPLEVEL (toplevel))
+        if (gtk_widget_is_toplevel (toplevel))
                 gtk_window_present (GTK_WINDOW (toplevel));
 
         return TRUE;
diff --git a/calendar/gui/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c
index e4b28e3d59..ea4c103ac4 100644
--- a/calendar/gui/ea-week-view-cell.c
+++ b/calendar/gui/ea-week-view-cell.c
@@ -470,7 +470,7 @@ component_interface_grab_focus (AtkComponent *comp)
         gtk_widget_queue_draw (week_view->main_canvas);
 
         toplevel = gtk_widget_get_toplevel (GTK_WIDGET (week_view));
-        if (GTK_WIDGET_TOPLEVEL (toplevel))
+        if (gtk_widget_is_toplevel (toplevel))
                 gtk_window_present (GTK_WINDOW (toplevel));
 
         return TRUE;
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index f4f15d2482..abd6a36532 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1873,7 +1873,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 	priv = gcal->priv;
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (gcal));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	source = e_cal_get_source (ecal);
 	state = e_cal_get_load_state (ecal);
@@ -2056,7 +2056,7 @@ backend_error_cb (ECal *client, const gchar *message, gpointer data)
 	gcal = GNOME_CALENDAR (data);
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (gcal));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	uristr = get_uri_without_password (e_cal_get_uri (client));
 	id = g_strdup ("calendar:error-on-loading-the-calendar");
@@ -2091,7 +2091,7 @@ backend_died_cb (ECal *ecal, gpointer data)
 	priv = gcal->priv;
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (gcal));
-	parent = GTK_WIDGET_TOPLEVEL (parent) ? parent : NULL;
+	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
 
 	/* FIXME What about default sources? */
 
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 6e9f4bb34f..75223ad7d8 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -315,7 +315,7 @@ weekday_picker_focus (GtkWidget *widget,
 	wp = WEEKDAY_PICKER (widget);
 	priv = wp->priv;
 
-	if (!GTK_WIDGET_CAN_FOCUS (widget))
+	if (!gtk_widget_get_can_focus (widget))
 		return FALSE;
 
 	if (GTK_WIDGET_HAS_FOCUS (widget)) {