From 1d364da787dcea6f559d7f4d70afef80527851d3 Mon Sep 17 00:00:00 2001 From: jave Date: Thu, 1 Jan 2015 06:12:03 +0100 Subject: [PATCH] Removed remains of Clutter experiment Once there was a working Clutter prototype in the xwidget code, but its removed, but might be revived in the future --- src/Makefile.in | 4 ++-- src/xterm.c | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index 0ea453005ff..2251adb327e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -349,7 +349,7 @@ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \ $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \ $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \ - $(WEBKIT_CFLAGS) $(CLUTTER_CFLAGS) $(GIR_CFLAGS) \ + $(WEBKIT_CFLAGS) $(GIR_CFLAGS) \ $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \ $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \ $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) \ @@ -430,7 +430,7 @@ ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj) LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ $(LIBX_OTHER) $(LIBSOUND) \ $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \ - $(WEBKIT_LIBS) $(CLUTTER_LIBS) $(GIR_LIBS) \ + $(WEBKIT_LIBS) $(GIR_LIBS) \ $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \ $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) $(XFIXES_LIBS) \ $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ diff --git a/src/xterm.c b/src/xterm.c index c9b9e84b5e8..58fb8866c98 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10756,10 +10756,6 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) https://bugzilla.gnome.org/show_bug.cgi?id=563627. */ id = g_log_set_handler ("GLib", G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, my_log_handler, NULL); -#ifdef HAVE_CLUTTER - gtk_clutter_init (&argc, &argv2); -#else - /* NULL window -> events for all windows go to our function. Call before gtk_init so Gtk+ event filters comes after our. */ gdk_window_add_filter (NULL, event_handler_gdk, NULL); @@ -10767,7 +10763,6 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) /* gtk_init does set_locale. Fix locale before and after. */ fixup_locale (); gtk_init (&argc, &argv2); -#endif fixup_locale (); g_log_remove_handler ("GLib", id); -- 2.11.4.GIT