diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2012-10-17 14:02:52 -0400 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2012-10-17 16:59:25 -0400 |
| commit | 2fed1b7ffbd9a4e09a5ef97b94498e7b9d7c0ed8 (patch) | |
| tree | 04d19a97baa7bfdf354922dd480151b4abc45db9 | |
| parent | 09619db4a3b21cc7cf18b842b031e2e735087fbd (diff) | |
| download | gnome-themes-standard-2fed1b7ffbd9a4e09a5ef97b94498e7b9d7c0ed8.tar.gz | |
build: fix the build for non-X11 environments
https://bugzilla.gnome.org/show_bug.cgi?id=686305
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/adwaita_engine.c | 16 | ||||
| -rw-r--r-- | themes/Adwaita/gtk-2.0/adwaita_engine.c | 7 |
3 files changed, 20 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index c49d83da..2d969d8a 100644 --- a/configure.ac +++ b/configure.ac @@ -62,7 +62,7 @@ AM_CONDITIONAL(GTK2_ENGINE, test "x$enable_gtk2_engine" = "xyes") AC_MSG_RESULT([$enable_gtk2_engine]) if test "x$enable_gtk2_engine" = "xyes"; then - PKG_CHECK_MODULES([GTK2_ENGINE], [gtk+-2.0 gdk-x11-2.0]) + PKG_CHECK_MODULES([GTK2_ENGINE], [gtk+-2.0 gdk-2.0]) fi GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0` diff --git a/src/adwaita_engine.c b/src/adwaita_engine.c index df44ec84..f0f48acf 100644 --- a/src/adwaita_engine.c +++ b/src/adwaita_engine.c @@ -27,7 +27,10 @@ #include <gmodule.h> #include <math.h> #include <cairo-gobject.h> + +#ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> +#endif #include "adwaita_utils.h" @@ -114,10 +117,15 @@ fallback_provider_add (AdwaitaEngine *self) static void adwaita_engine_wm_changed (AdwaitaEngine *self) { + gboolean is_fallback = TRUE; + +#ifdef GDK_WINDOWING_X11 const gchar *name; name = gdk_x11_screen_get_window_manager_name (gdk_screen_get_default ()); + is_fallback = (g_strcmp0 (name, "GNOME Shell") != 0); +#endif - if (g_strcmp0 (name, "GNOME Shell") != 0) + if (is_fallback) fallback_provider_add (self); else fallback_provider_remove (self); @@ -142,14 +150,14 @@ adwaita_engine_finalize (GObject *obj) static void adwaita_engine_init (AdwaitaEngine *self) { +#ifdef GDK_WINDOWING_X11 GdkScreen *screen = gdk_screen_get_default (); - if (!GDK_IS_X11_SCREEN (screen)) - return; - self->wm_watch_id = g_signal_connect_swapped (screen, "window-manager-changed", G_CALLBACK (adwaita_engine_wm_changed), self); +#endif + adwaita_engine_wm_changed (self); } diff --git a/themes/Adwaita/gtk-2.0/adwaita_engine.c b/themes/Adwaita/gtk-2.0/adwaita_engine.c index ab137126..6b102c1a 100644 --- a/themes/Adwaita/gtk-2.0/adwaita_engine.c +++ b/themes/Adwaita/gtk-2.0/adwaita_engine.c @@ -22,7 +22,10 @@ #include <gmodule.h> #include <glib.h> #include <gtk/gtk.h> + +#ifdef GDK_WINDOWING_X11 #include <gdk/gdkx.h> +#endif /***************************************/ /* Register & Initialize Drawing Style */ @@ -49,9 +52,13 @@ G_DEFINE_DYNAMIC_TYPE (AdwaitaStyle, adwaita_style, GTK_TYPE_STYLE) static gboolean wm_is_fallback (void) { +#ifdef GDK_WINDOWING_X11 const gchar *name; name = gdk_x11_screen_get_window_manager_name (gdk_screen_get_default ()); return g_strcmp0 (name, "GNOME Shell") != 0; +#else + return TRUE; +#endif } static cairo_t * |