summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-mime-application-chooser.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 /libcaja-private/caja-mime-application-chooser.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 'libcaja-private/caja-mime-application-chooser.c')
-rw-r--r--libcaja-private/caja-mime-application-chooser.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/libcaja-private/caja-mime-application-chooser.c b/libcaja-private/caja-mime-application-chooser.c
index e452c229..bbb218eb 100644
--- a/libcaja-private/caja-mime-application-chooser.c
+++ b/libcaja-private/caja-mime-application-chooser.c
@@ -70,11 +70,7 @@ enum
NUM_COLUMNS
};
-#if GTK_CHECK_VERSION (3, 0, 0)
G_DEFINE_TYPE (CajaMimeApplicationChooser, caja_mime_application_chooser, GTK_TYPE_BOX);
-#else
-G_DEFINE_TYPE (CajaMimeApplicationChooser, caja_mime_application_chooser, GTK_TYPE_VBOX);
-#endif
static void refresh_model (CajaMimeApplicationChooser *chooser);
static void refresh_model_soon (CajaMimeApplicationChooser *chooser);
@@ -380,9 +376,9 @@ caja_mime_application_chooser_init (CajaMimeApplicationChooser *chooser)
chooser->details = g_new0 (CajaMimeApplicationChooserDetails, 1);
chooser->details->for_multiple_files = FALSE;
-#if GTK_CHECK_VERSION (3, 0, 0)
+
gtk_orientable_set_orientation (GTK_ORIENTABLE (chooser), GTK_ORIENTATION_VERTICAL);
-#endif
+
gtk_container_set_border_width (GTK_CONTAINER (chooser), 8);
gtk_box_set_spacing (GTK_BOX (chooser), 0);
gtk_box_set_homogeneous (GTK_BOX (chooser), FALSE);
@@ -418,11 +414,7 @@ caja_mime_application_chooser_init (CajaMimeApplicationChooser *chooser)
gtk_container_add (GTK_CONTAINER (scrolled),
chooser->details->treeview);
-#if GTK_CHECK_VERSION(3, 0, 0)
box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
-#else
- box = gtk_hbutton_box_new ();
-#endif
gtk_box_set_spacing (GTK_BOX (box), 6);
gtk_button_box_set_layout (GTK_BUTTON_BOX (box), GTK_BUTTONBOX_END);
gtk_box_pack_start (GTK_BOX (chooser), box, FALSE, FALSE, 6);