summaryrefslogtreecommitdiff
path: root/pluma/pluma-history-entry.c
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-05-19 16:10:32 +0200
committerinfirit <[email protected]>2014-05-19 20:57:25 +0200
commit1bfcadb0c03a32c6ddde0b577f74c5291b1dd4fc (patch)
tree930c9c3b2e4a3cf84cc354bad17016a5de743375 /pluma/pluma-history-entry.c
parentcc28312a3f00a21d7fdf982ae9abce782878d906 (diff)
downloadpluma-1bfcadb0c03a32c6ddde0b577f74c5291b1dd4fc.tar.bz2
pluma-1bfcadb0c03a32c6ddde0b577f74c5291b1dd4fc.tar.xz
Unify search GtkComboBox so it work in gtk+-2 and gtk+-3
Diffstat (limited to 'pluma/pluma-history-entry.c')
-rw-r--r--pluma/pluma-history-entry.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/pluma/pluma-history-entry.c b/pluma/pluma-history-entry.c
index cc010185..717d69d4 100644
--- a/pluma/pluma-history-entry.c
+++ b/pluma/pluma-history-entry.c
@@ -64,11 +64,7 @@ struct _PlumaHistoryEntryPrivate
GSettings *settings;
};
-#if GTK_CHECK_VERSION (3, 0, 0)
G_DEFINE_TYPE(PlumaHistoryEntry, pluma_history_entry, GTK_TYPE_COMBO_BOX_TEXT)
-#else
-G_DEFINE_TYPE(PlumaHistoryEntry, pluma_history_entry, GTK_TYPE_COMBO_BOX_ENTRY)
-#endif
static void
pluma_history_entry_set_property (GObject *object,
@@ -514,12 +510,8 @@ pluma_history_entry_new (const gchar *history_id,
ret = g_object_new (PLUMA_TYPE_HISTORY_ENTRY,
"history-id", history_id,
"model", store,
-#if GTK_CHECK_VERSION (3, 0, 0)
"has-entry", TRUE,
- "id-column", 0,
-#else
- "text-column", 0,
-#endif
+ "entry-text-column", 0,
NULL);
g_object_unref (store);