diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-03-05 12:38:41 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-03-05 20:36:23 +0800 |
| commit | 2836a54dd6d61e35d1446f9a23a628064516a309 (patch) | |
| tree | b9cb2ab39212de803e935ed28957ee77e73c2d96 /calendar/gui/dialogs | |
| parent | baa7f20333a5bbb7c8cbb3cf2ce86b57aba79ef2 (diff) | |
| download | gsoc2013-evolution-2836a54dd6d61e35d1446f9a23a628064516a309.tar.gz gsoc2013-evolution-2836a54dd6d61e35d1446f9a23a628064516a309.tar.zst gsoc2013-evolution-2836a54dd6d61e35d1446f9a23a628064516a309.zip | |
Work around recent GTK+ deprecations.
Diffstat (limited to 'calendar/gui/dialogs')
| -rw-r--r-- | calendar/gui/dialogs/event-page.c | 4 | ||||
| -rw-r--r-- | calendar/gui/dialogs/recurrence-page.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index bef407c8dd..7d79a2bfb7 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -2457,7 +2457,11 @@ safe_to_process_date_changed_signal (GtkWidget *dedit_widget) entry = e_date_edit_get_entry (dedit); +#if GTK_CHECK_VERSION(2,19,7) + return !entry || !gtk_widget_has_focus (entry); +#else return !entry || !GTK_WIDGET_HAS_FOCUS (entry); +#endif } /* Callback used when the start date widget change. We check that the diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index e71a3445ae..6bb9f18e28 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -900,7 +900,11 @@ fill_component (RecurrencePage *rpage, ECalComponent *comp) e_cal_component_set_exdate_list (comp, list); e_cal_component_free_exdate_list (list); +#if GTK_CHECK_VERSION(2,19,7) + if (gtk_widget_get_visible (priv->ending_combo) && gtk_widget_get_sensitive (priv->ending_combo) && +#else if (GTK_WIDGET_VISIBLE (priv->ending_combo) && GTK_WIDGET_IS_SENSITIVE (priv->ending_combo) && +#endif e_dialog_combo_box_get (priv->ending_combo, ending_types_map) == ENDING_UNTIL) { /* check whether the "until" date is in the future */ struct icaltimetype tt; |