diff options
author | lukefromdc <[email protected]> | 2016-11-22 15:02:51 -0500 |
---|---|---|
committer | lukefromdc <[email protected]> | 2016-11-22 15:02:51 -0500 |
commit | 276eb145ce96d5f75f8d3901daf6310f60ddbb81 (patch) | |
tree | 544f41e76c9a91973867065696fc2e414ca60170 /src/caja-desktop-window.c | |
parent | 969e4d021fe49654fe6e5ee7e88c920fec126505 (diff) | |
download | caja-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-desktop-window.c')
-rw-r--r-- | src/caja-desktop-window.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/caja-desktop-window.c b/src/caja-desktop-window.c index 1cc14348..1e453672 100644 --- a/src/caja-desktop-window.c +++ b/src/caja-desktop-window.c @@ -166,12 +166,10 @@ caja_desktop_window_init (CajaDesktopWindow *window) window->details = G_TYPE_INSTANCE_GET_PRIVATE (window, CAJA_TYPE_DESKTOP_WINDOW, CajaDesktopWindowDetails); -#if GTK_CHECK_VERSION(3, 0, 0) GtkStyleContext *context; context = gtk_widget_get_style_context (GTK_WIDGET (window)); gtk_style_context_add_class (context, "caja-desktop-window"); -#endif #if GTK_CHECK_VERSION(3, 21, 0) window->details->composited = TRUE; @@ -342,11 +340,7 @@ set_desktop_window_id (CajaDesktopWindow *window, root_window = gdk_screen_get_root_window ( gtk_window_get_screen (GTK_WINDOW (window))); -#if GTK_CHECK_VERSION (3, 0, 0) window_xid = GDK_WINDOW_XID (gdkwindow); -#else - window_xid = GDK_WINDOW_XWINDOW (gdkwindow); -#endif gdk_property_change (root_window, gdk_atom_intern ("CAJA_DESKTOP_WINDOW_ID", FALSE), |