diff options
| author | lukefromdc <[email protected]> | 2016-10-14 15:57:06 -0400 |
|---|---|---|
| committer | lukefromdc <[email protected]> | 2016-10-14 15:57:06 -0400 |
| commit | 15a9e9a073a799341c18ace6b568e5317135056c (patch) | |
| tree | 9772e7b2be68a30a6bc200f07bf288bf4e5bcc24 | |
| parent | c27cc572f8f33bdfbbc3dfea8786d05a1818b910 (diff) | |
| download | caja-15a9e9a073a799341c18ace6b568e5317135056c.tar.bz2 caja-15a9e9a073a799341c18ace6b568e5317135056c.tar.xz | |
Fix missed selector change for separating GTK3 and libunique build options
One selector was not updated in caja-location-bar.c to follow use or nonuse of libunique in GTK3 builds. Fixing this revealed need for a 3-way selector in one place in caja-application.c
| -rw-r--r-- | src/caja-application.c | 2 | ||||
| -rw-r--r-- | src/caja-location-bar.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/caja-application.c b/src/caja-application.c index f469eccf..d3e90182 100644 --- a/src/caja-application.c +++ b/src/caja-application.c @@ -704,6 +704,8 @@ check_required_directories (CajaApplication *application) #if ENABLE_LIBUNIQUE == (0) gtk_application_add_window (GTK_APPLICATION (application), GTK_WINDOW (dialog)); +#elif GTK_CHECK_VERSION (3, 0, 0) + caja_main_event_loop_register (GTK_WIDGET (dialog)); #else caja_main_event_loop_register (GTK_OBJECT (dialog)); #endif diff --git a/src/caja-location-bar.c b/src/caja-location-bar.c index 57262bb9..6037761c 100644 --- a/src/caja-location-bar.c +++ b/src/caja-location-bar.c @@ -229,7 +229,7 @@ drag_data_received_callback (GtkWidget *widget, for (i = 1; names[i] != NULL; ++i) { -#if GTK_CHECK_VERSION (3, 0, 0) +#if ENABLE_LIBUNIQUE == (0) new_window = caja_application_create_navigation_window (application, screen); #else new_window = caja_application_create_navigation_window (application, NULL, screen); |