summaryrefslogtreecommitdiff
path: root/src/caja-location-entry.c
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2016-11-22 15:02:51 -0500
committerlukefromdc <[email protected]>2016-11-22 15:02:51 -0500
commit276eb145ce96d5f75f8d3901daf6310f60ddbb81 (patch)
tree544f41e76c9a91973867065696fc2e414ca60170 /src/caja-location-entry.c
parent969e4d021fe49654fe6e5ee7e88c920fec126505 (diff)
downloadcaja-276eb145ce96d5f75f8d3901daf6310f60ddbb81.tar.bz2
caja-276eb145ce96d5f75f8d3901daf6310f60ddbb81.tar.xz
move to GTK+3 (>= 3.14), drop libunique, GTK+2 code, and --with-gtk build option
*Remove GTK_VERSION_CHECK (3, 0, 0) and libunique selectors *Remove GTK2 and libunique specific code. *Leaves selector for specific GTK3 versions. *Remove #DEFINES for vbox/hbox previously required for GTK2 compatability *Keep vbox in caja-spatial-window.c, it is necessary for the desktop to work *spatial-window vbox issue at https://github.com/mate-desktop/caja/issues/591
Diffstat (limited to 'src/caja-location-entry.c')
-rw-r--r--src/caja-location-entry.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/caja-location-entry.c b/src/caja-location-entry.c
index ad333272..4f7af4eb 100644
--- a/src/caja-location-entry.c
+++ b/src/caja-location-entry.c
@@ -285,11 +285,7 @@ finalize (GObject *object)
}
static void
-#if GTK_CHECK_VERSION (3, 0, 0)
destroy (GtkWidget *object)
-#else
-destroy (GtkObject *object)
-#endif
{
CajaLocationEntry *entry;
@@ -305,11 +301,7 @@ destroy (GtkObject *object)
g_free (entry->details->current_directory);
entry->details->current_directory = NULL;
-#if GTK_CHECK_VERSION (3, 0, 0)
EEL_CALL_PARENT (GTK_WIDGET_CLASS, destroy, (object));
-#else
- EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-#endif
}
static void
@@ -392,11 +384,7 @@ caja_location_entry_class_init (CajaLocationEntryClass *class)
{
GTK_WIDGET_CLASS (class)->focus_in_event = caja_location_entry_focus_in;
-#if GTK_CHECK_VERSION (3, 0, 0)
GTK_WIDGET_CLASS (class)->destroy = destroy;
-#else
- GTK_OBJECT_CLASS (class)->destroy = destroy;
-#endif
G_OBJECT_CLASS (class)->finalize = finalize;
@@ -443,13 +431,10 @@ caja_location_entry_set_secondary_action (CajaLocationEntry *entry,
static void
caja_location_entry_init (CajaLocationEntry *entry)
{
-
-#if GTK_CHECK_VERSION(3, 0, 0)
GtkStyleContext *context;
context = gtk_widget_get_style_context (GTK_WIDGET (entry));
gtk_style_context_add_class (context, "caja-location-entry");
-#endif
entry->details = g_new0 (CajaLocationEntryDetails, 1);