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-gnome-calendar.c | |
| parent | 3ee48d9bf66fbc76b7b06e77aafa015c341cd419 (diff) | |
| download | gsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.tar gsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.tar.gz gsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.tar.bz2 gsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.tar.lz gsoc2013-evolution-970662db34ff0a718cd5e39c1fa268beb51e1f64.tar.xz 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-gnome-calendar.c')
| -rw-r--r-- | calendar/gui/ea-gnome-calendar.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/calendar/gui/ea-gnome-calendar.c b/calendar/gui/ea-gnome-calendar.c index 1f599c1790..e35ef1401e 100644 --- a/calendar/gui/ea-gnome-calendar.c +++ b/calendar/gui/ea-gnome-calendar.c @@ -29,6 +29,8 @@ #include <libedataserver/e-data-server-util.h> #include <glib/gi18n.h> +#include <e-util/gtk-compat.h> + static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass); static gint ea_gnome_calendar_get_n_children (AtkObject* obj); @@ -253,8 +255,9 @@ ea_gnome_calendar_get_n_children (AtkObject* obj) { g_return_val_if_fail (EA_IS_GNOME_CALENDAR (obj), 0); - if (!GTK_ACCESSIBLE (obj)->widget) + if (gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)) == NULL) return -1; + return 2; } @@ -267,15 +270,18 @@ ea_gnome_calendar_ref_child (AtkObject *obj, gint i) ECalendarView *view; ECalendar *date_navigator; GtkWidget *childWidget; + GtkWidget *widget; g_return_val_if_fail (EA_IS_GNOME_CALENDAR (obj), NULL); /* valid child index range is [0-3] */ if (i < 0 || i >3 ) return NULL; - if (!GTK_ACCESSIBLE (obj)->widget) + widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)); + if (widget == NULL) return NULL; - calendarWidget = GNOME_CALENDAR (GTK_ACCESSIBLE (obj)->widget); + + calendarWidget = GNOME_CALENDAR (widget); switch (i) { case 0: |