[gnome-shell] Link to libmutter always

[Jasper St. Pierre <jstpierre src gnome org>]

commit ee0c76c2b9d156c1f19aea72ca8cdbd1f123ff4f
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Apr 9 15:20:56 2014 -0700

    Link to libmutter always
    
    Wayland support was merged into mutter master.

 .gitignore                             |    3 --
 configure.ac                           |    7 ------
 data/Makefile.am                       |    6 +----
 data/gnome-shell-wayland.desktop.in.in |    2 +-
 js/ui/main.js                          |    3 --
 src/Makefile.am                        |   35 +-------------------------------
 src/gnome-shell-plugin.c               |    2 -
 src/shell-global.c                     |    2 -
 8 files changed, 3 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index be11b0c..a9ad91d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,11 +78,8 @@ src/gnome-shell-calendar-server
 src/gnome-shell-extension-prefs
 src/gnome-shell-extension-tool
 src/gnome-shell-hotplug-sniffer
-src/gnome-shell-jhbuild
 src/gnome-shell-perf-helper
 src/gnome-shell-perf-tool
-src/gnome-shell-real
-src/gnome-shell-wayland
 src/hotplug-sniffer/org.gnome.Shell.HotplugSniffer.service
 src/run-js-test
 src/test-recorder
diff --git a/configure.ac b/configure.ac
index 9a30e65..9e621cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,13 +112,6 @@ fi
 
 PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
 PKG_CHECK_MODULES(MUTTER, libmutter >= $MUTTER_MIN_VERSION)
-PKG_CHECK_MODULES(MUTTER_WAYLAND, [libmutter-wayland >= $MUTTER_MIN_VERSION],
-                 [MUTTER_WAYLAND_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmutter-wayland`
-                  AC_SUBST(MUTTER_WAYLAND_TYPELIB_DIR)
-                  have_mutter_wayland=yes],
-                 [have_mutter_wayland=no])
-
-AM_CONDITIONAL(HAVE_MUTTER_WAYLAND, test $have_mutter_wayland != no)
 
 PKG_CHECK_MODULES(GNOME_SHELL_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
 PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.8 x11)
diff --git a/data/Makefile.am b/data/Makefile.am
index a73affd..46c337c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,9 +1,5 @@
 desktopdir=$(datadir)/applications
-desktop_DATA = gnome-shell.desktop gnome-shell-extension-prefs.desktop
-if HAVE_MUTTER_WAYLAND
-desktop_DATA += gnome-shell-wayland.desktop
-endif HAVE_MUTTER_WAYLAND
-
+desktop_DATA = gnome-shell.desktop gnome-shell-wayland.desktop  gnome-shell-extension-prefs.desktop
 
 # We substitute in bindir so it works as an autostart
 # file when built in a non-system prefix
diff --git a/data/gnome-shell-wayland.desktop.in.in b/data/gnome-shell-wayland.desktop.in.in
index 7b99cfb..4c7d5a7 100644
--- a/data/gnome-shell-wayland.desktop.in.in
+++ b/data/gnome-shell-wayland.desktop.in.in
@@ -2,7 +2,7 @@
 Type=Application
 _Name=GNOME Shell (wayland compositor)
 _Comment=Window management and application launching
-Exec= bindir@/mutter-launch -- gnome-shell-wayland --wayland --display-server
+Exec= bindir@/mutter-launch -- gnome-shell --wayland --display-server
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-shell
 X-GNOME-Bugzilla-Component=general
diff --git a/js/ui/main.js b/js/ui/main.js
index fba752b..bf80bc0 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -103,9 +103,6 @@ function start() {
     global.logError = window.log;
     global.log = window.log;
 
-    if (!Meta.is_wayland_compositor)
-        Meta.is_wayland_compositor = function () { return false; };
-
     // Chain up async errors reported from C
     global.connect('notify-error', function (global, msg, detail) { notifyError(msg, detail); });
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f489a56..ae01bdd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,10 +33,6 @@ bin_SCRIPTS += gnome-shell-extension-tool gnome-shell-perf-tool
 EXTRA_DIST += gnome-shell-extension-tool.in gnome-shell-perf-tool.in
 bin_PROGRAMS = gnome-shell gnome-shell-extension-prefs
 
-if HAVE_MUTTER_WAYLAND
-bin_PROGRAMS += gnome-shell-wayland
-endif HAVE_MUTTER_WAYLAND
-
 generated_script_substitutions = \
            -e "s|@bindir[ ]|$(bindir)|g" \
            -e "s|@datadir[ ]|$(datadir)|g" \
@@ -76,10 +72,6 @@ privlibdir = $(pkglibdir)
 privlib_LTLIBRARIES = libgnome-shell-js.la libgnome-shell-menu.la libgnome-shell.la
 noinst_LTLIBRARIES += libgnome-shell-base.la
 
-if HAVE_MUTTER_WAYLAND
-privlib_LTLIBRARIES += libgnome-shell-wayland.la
-endif HAVE_MUTTER_WAYLAND
-
 shell_built_sources = \
        shell-enum-types.h \
        shell-enum-types.c
@@ -197,21 +189,6 @@ gnome_shell_CPPFLAGS = \
 gnome_shell_LDADD = libgnome-shell.la libgnome-shell-js.la $(GNOME_SHELL_LIBS) $(MUTTER_LIBS)
 gnome_shell_DEPENDENCIES = libgnome-shell.la
 
-if HAVE_MUTTER_WAYLAND
-libgnome_shell_wayland_la_SOURCES = $(libgnome_shell_sources)
-nodist_libgnome_shell_wayland_la_SOURCES = $(libgnome_shell_built_sources)
-
-gnome_shell_wayland_SOURCES = main.c
-gnome_shell_wayland_CPPFLAGS = \
-       -DHAVE_WAYLAND \
-       -DMUTTER_TYPELIB_DIR=\"$(MUTTER_WAYLAND_TYPELIB_DIR)\" \
-       $(MUTTER_WAYLAND_CFLAGS) \
-       $(gnome_shell_cflags)
-
-gnome_shell_wayland_LDADD = libgnome-shell-wayland.la libgnome-shell-js.la $(GNOME_SHELL_LIBS) 
$(MUTTER_WAYLAND_LIBS)
-gnome_shell_wayland_DEPENDENCIES = libgnome-shell-wayland.la
-endif HAVE_MUTTER_WAYLAND
-
 gnome_shell_extension_prefs_SOURCES = \
        gnome-shell-extension-prefs.c \
        $(NULL)
@@ -323,12 +300,6 @@ libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags)
 libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) libgnome-shell-base.la
 libgnome_shell_la_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags)
 
-if HAVE_MUTTER_WAYLAND
-libgnome_shell_wayland_la_LDFLAGS = $(libgnome_shell_ldflags)
-libgnome_shell_wayland_la_LIBADD = $(MUTTER_WAYLAND_LIBS) libgnome-shell-base.la
-libgnome_shell_wayland_la_CPPFLAGS = $(MUTTER_WAYLAND_CFLAGS) -DHAVE_WAYLAND $(gnome_shell_cflags)
-endif HAVE_MUTTER_WAYLAND
-
 ShellMenu-0.1.gir: libgnome-shell-menu.la
 ShellMenu_0_1_gir_INCLUDES = Gio-2.0
 ShellMenu_0_1_gir_CFLAGS = $(libgnome_shell_menu_la_CPPFLAGS) -I $(srcdir)
@@ -354,11 +325,7 @@ if HAVE_NETWORKMANAGER
 Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
 endif
 Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
-# Hack! we use PROGRAM instead of LIBS so that the soname is not included
-# in the typelib. This way the symbols will be resolved with the libgnome-shell
-# linked against the executable (which will be libgnome-shell-wayland for
-# gnome-shell-wayland)
-Shell_0_1_gir_PROGRAM = $(builddir)/gnome-shell
+Shell_0_1_gir_LIBS = libgnome-shell.la
 Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
 Shell_0_1_gir_SCANNERFLAGS =   \
        --include-uninstalled=$(builddir)/St-1.0.gir \
diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
index 806fe7d..71503bc 100644
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -326,10 +326,8 @@ gnome_shell_plugin_xevent_filter (MetaPlugin *plugin,
     }
 #endif
 
-#ifdef HAVE_WAYLAND
   if (meta_is_wayland_compositor ())
     return FALSE;
-#endif
 
   /*
    * Pass the event to shell-global for XDND
diff --git a/src/shell-global.c b/src/shell-global.c
index 336639d..d6de365 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -885,7 +885,6 @@ _shell_global_set_plugin (ShellGlobal *global,
 
   global->stage = CLUTTER_STAGE (meta_get_stage_for_screen (global->meta_screen));
 
-#ifdef HAVE_WAYLAND
   if (meta_is_wayland_compositor ())
     {
       /* When Mutter is acting as its own display server then the
@@ -907,7 +906,6 @@ _shell_global_set_plugin (ShellGlobal *global,
       global->stage_xwindow = None;
     }
   else
-#endif
     {
       global->stage_xwindow = clutter_x11_get_stage_window (global->stage);
       global->ibus_window = gdk_x11_window_foreign_new_for_display (global->gdk_display,