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 /widgets/table/e-cell-combo.c | |
| 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 'widgets/table/e-cell-combo.c')
| -rw-r--r-- | widgets/table/e-cell-combo.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c index fe9b90717f..31e6c29b99 100644 --- a/widgets/table/e-cell-combo.c +++ b/widgets/table/e-cell-combo.c @@ -494,7 +494,11 @@ e_cell_combo_selection_changed (GtkTreeSelection *selection, ECellCombo *ecc) GtkTreeIter iter; GtkTreeModel *model; +#if GTK_CHECK_VERSION(2,19,7) + if (!gtk_widget_get_realized (ecc->popup_window) || !gtk_tree_selection_get_selected (selection, &model, &iter)) +#else if (!GTK_WIDGET_REALIZED (ecc->popup_window) || !gtk_tree_selection_get_selected (selection, &model, &iter)) +#endif return; e_cell_combo_update_cell (ecc); @@ -597,7 +601,11 @@ e_cell_combo_key_press (GtkWidget *popup_window, && event->keyval != GDK_3270_Enter) return FALSE; +#if GTK_CHECK_VERSION(2,19,7) + if (event->keyval == GDK_Escape && (!ecc->popup_window||!gtk_widget_get_visible (ecc->popup_window))) +#else if (event->keyval == GDK_Escape && (!ecc->popup_window||!GTK_WIDGET_VISIBLE (ecc->popup_window))) +#endif return FALSE; gtk_grab_remove (ecc->popup_window); |