diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-06-04 19:05:46 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-06-04 20:34:15 +0800 |
| commit | 970662db34ff0a718cd5e39c1fa268beb51e1f64 (patch) | |
| tree | 73c987b95c107ae7e3014abdca4c95de12dc853d /calendar/gui/ea-week-view.c | |
| parent | 3ee48d9bf66fbc76b7b06e77aafa015c341cd419 (diff) | |
| download | gsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.tar.gz gsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.tar.zst gsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.zip | |
More GTK3 preparation.
This uses the new gtk_assistant_commit() I had added to GTK+ for our
EImportAssistant progress page.
Diffstat (limited to 'calendar/gui/ea-week-view.c')
| -rw-r--r-- | calendar/gui/ea-week-view.c | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c index a34326cf74..14bb456219 100644 --- a/calendar/gui/ea-week-view.c +++ b/calendar/gui/ea-week-view.c @@ -27,6 +27,8 @@ #include <text/e-text.h> #include <glib/gi18n.h> +#include <e-util/gtk-compat.h> + static void ea_week_view_class_init (EaWeekViewClass *klass); static G_CONST_RETURN gchar * ea_week_view_get_name (AtkObject *accessible); @@ -124,15 +126,17 @@ ea_week_view_get_name (AtkObject *accessible) GnomeCalendar *gcal; const gchar *label_text; GnomeCalendarViewType view_type; + GtkWidget *widget; gint n_events; gchar *event_str, *name_str; g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), NULL); - if (!GTK_ACCESSIBLE (accessible)->widget) + widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); + if (widget == NULL) return NULL; - week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget); + week_view = E_WEEK_VIEW (widget); gcal = e_calendar_view_get_calendar (E_CALENDAR_VIEW (week_view)); if (!gtk_widget_get_visible (GTK_WIDGET (gcal))) return NULL; @@ -168,12 +172,15 @@ static G_CONST_RETURN gchar * ea_week_view_get_description (AtkObject *accessible) { EWeekView *week_view; + GtkWidget *widget; g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), NULL); - if (!GTK_ACCESSIBLE (accessible)->widget) + widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); + if (widget == NULL) return NULL; - week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget); + + week_view = E_WEEK_VIEW (widget); if (accessible->description) return accessible->description; @@ -195,14 +202,17 @@ static gint ea_week_view_get_n_children (AtkObject *accessible) { EWeekView *week_view; + GtkWidget *widget; gint i, count = 0; gint event_index; g_return_val_if_fail (EA_IS_WEEK_VIEW (accessible), -1); - if (!GTK_ACCESSIBLE (accessible)->widget) + widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); + if (widget == NULL) return -1; - week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget); + + week_view = E_WEEK_VIEW (widget); for (event_index = 0; event_index < week_view->events->len; ++event_index) { @@ -249,6 +259,7 @@ ea_week_view_ref_child (AtkObject *accessible, gint index) EWeekView *week_view; gint child_num, max_count; AtkObject *atk_object = NULL; + GtkWidget *widget; gint event_index; gint jump_button = -1; gint span_num = 0; @@ -260,9 +271,11 @@ ea_week_view_ref_child (AtkObject *accessible, gint index) if (child_num <= 0 || index < 0 || index >= child_num) return NULL; - if (!GTK_ACCESSIBLE (accessible)->widget) + widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); + if (widget == NULL) return NULL; - week_view = E_WEEK_VIEW (GTK_ACCESSIBLE (accessible)->widget); + + week_view = E_WEEK_VIEW (widget); max_count = week_view->events->len; if (index == 0) { |