diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-11-09 21:48:33 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-01-25 23:28:26 +0800 |
| commit | 753c60fc67a0a56a5f119c14ffa54ea9af95c208 (patch) | |
| tree | 68b53c740bcbd3cff0f863ba72a5a2b3d49f3e56 /e-util/e-datetime-format.c | |
| parent | dfc28aa9cefad63fb0fc926ce725f7cad8125cb0 (diff) | |
| download | gsoc2013-evolution-753c60fc67a0a56a5f119c14ffa54ea9af95c208.tar gsoc2013-evolution-753c60fc67a0a56a5f119c14ffa54ea9af95c208.tar.gz gsoc2013-evolution-753c60fc67a0a56a5f119c14ffa54ea9af95c208.tar.bz2 gsoc2013-evolution-753c60fc67a0a56a5f119c14ffa54ea9af95c208.tar.lz gsoc2013-evolution-753c60fc67a0a56a5f119c14ffa54ea9af95c208.tar.xz gsoc2013-evolution-753c60fc67a0a56a5f119c14ffa54ea9af95c208.tar.zst gsoc2013-evolution-753c60fc67a0a56a5f119c14ffa54ea9af95c208.zip | |
Drop backward-compatibility cruft.
Diffstat (limited to 'e-util/e-datetime-format.c')
| -rw-r--r-- | e-util/e-datetime-format.c | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c index 39f0e36e0f..471ca29700 100644 --- a/e-util/e-datetime-format.c +++ b/e-util/e-datetime-format.c @@ -25,9 +25,6 @@ #include "e-datetime-format.h" #include "e-util.h" -/* backward-compatibility cruft */ -#include "e-util/gtk-compat.h" - #define KEYS_FILENAME "datetime-formats.ini" #define KEYS_GROUPNAME "formats" @@ -497,6 +494,7 @@ unref_setup_keyfile (gpointer ptr) void e_datetime_format_add_setup_widget (GtkWidget *table, gint row, const gchar *component, const gchar *part, DTFormatKind kind, const gchar *caption) { + GtkListStore *store; GtkWidget *label, *combo, *preview, *align; gchar *key; @@ -508,23 +506,15 @@ e_datetime_format_add_setup_widget (GtkWidget *table, gint row, const gchar *com key = gen_key (component, part, kind); label = gtk_label_new_with_mnemonic (caption ? caption : _("Format:")); -#if GTK_CHECK_VERSION(2,23,0) - /* FIXME Rewrite this when removing the version check. */ - { - GtkListStore *store; - - store = gtk_list_store_new (1, G_TYPE_STRING); - combo = g_object_new ( - GTK_TYPE_COMBO_BOX_TEXT, - "model", store, - "has-entry", TRUE, - "entry-text-column", 0, - NULL); - g_object_unref (store); - } -#else - combo = gtk_combo_box_entry_new_text (); -#endif + + store = gtk_list_store_new (1, G_TYPE_STRING); + combo = g_object_new ( + GTK_TYPE_COMBO_BOX_TEXT, + "model", store, + "has-entry", TRUE, + "entry-text-column", 0, + NULL); + g_object_unref (store); fill_combo_formats (combo, key, kind); gtk_label_set_mnemonic_widget ((GtkLabel *)label, combo); |