From 276eb145ce96d5f75f8d3901daf6310f60ddbb81 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Tue, 22 Nov 2016 15:02:51 -0500 Subject: 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 --- src/caja-history-sidebar.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/caja-history-sidebar.c') diff --git a/src/caja-history-sidebar.c b/src/caja-history-sidebar.c index 4ad18137..9ef695c9 100644 --- a/src/caja-history-sidebar.c +++ b/src/caja-history-sidebar.c @@ -74,12 +74,7 @@ enum static void caja_history_sidebar_iface_init (CajaSidebarIface *iface); static void sidebar_provider_iface_init (CajaSidebarProviderIface *iface); static GType caja_history_sidebar_provider_get_type (void); -#if GTK_CHECK_VERSION (3, 0, 0) static void caja_history_sidebar_style_updated (GtkWidget *widget); -#else -static void caja_history_sidebar_style_set (GtkWidget *widget, - GtkStyle *previous_style); -#endif G_DEFINE_TYPE_WITH_CODE (CajaHistorySidebar, caja_history_sidebar, GTK_TYPE_SCROLLED_WINDOW, G_IMPLEMENT_INTERFACE (CAJA_TYPE_SIDEBAR, @@ -325,11 +320,7 @@ caja_history_sidebar_class_init (CajaHistorySidebarClass *class) { G_OBJECT_CLASS (class)->finalize = caja_history_sidebar_finalize; -#if GTK_CHECK_VERSION (3, 0, 0) GTK_WIDGET_CLASS (class)->style_updated = caja_history_sidebar_style_updated; -#else - GTK_WIDGET_CLASS (class)->style_set = caja_history_sidebar_style_set; -#endif } static const char * @@ -382,12 +373,7 @@ caja_history_sidebar_set_parent_window (CajaHistorySidebar *sidebar, } static void -#if GTK_CHECK_VERSION (3, 0, 0) caja_history_sidebar_style_updated (GtkWidget *widget) -#else -caja_history_sidebar_style_set (GtkWidget *widget, - GtkStyle *previous_style) -#endif { CajaHistorySidebar *sidebar; -- cgit v1.2.1