diff options
| author | jave | 2015-01-01 06:12:03 +0100 |
|---|---|---|
| committer | jave | 2015-01-01 06:12:03 +0100 |
| commit | 1d364da787dcea6f559d7f4d70afef80527851d3 (patch) | |
| tree | 7531db3eb802fea07b4233ecf99266cc3aae09a5 /src | |
| parent | 8f0cf0a62b8bd30058dc78d598a08e6b2d57c106 (diff) | |
| download | emacs-1d364da787dcea6f559d7f4d70afef80527851d3.tar.gz emacs-1d364da787dcea6f559d7f4d70afef80527851d3.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 4 | ||||
| -rw-r--r-- | 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) \ | |||
| 349 | $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ | 349 | $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ |
| 350 | $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \ | 350 | $(PNG_CFLAGS) $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \ |
| 351 | $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \ | 351 | $(XRANDR_CFLAGS) $(XINERAMA_CFLAGS) $(XFIXES_CFLAGS) \ |
| 352 | $(WEBKIT_CFLAGS) $(CLUTTER_CFLAGS) $(GIR_CFLAGS) \ | 352 | $(WEBKIT_CFLAGS) $(GIR_CFLAGS) \ |
| 353 | $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \ | 353 | $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \ |
| 354 | $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \ | 354 | $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \ |
| 355 | $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) \ | 355 | $(LIBGNUTLS_CFLAGS) $(GFILENOTIFY_CFLAGS) \ |
| @@ -430,7 +430,7 @@ ALLOBJS = $(FIRSTFILE_OBJ) $(VMLIMIT_OBJ) $(obj) $(otherobj) | |||
| 430 | LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ | 430 | LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \ |
| 431 | $(LIBX_OTHER) $(LIBSOUND) \ | 431 | $(LIBX_OTHER) $(LIBSOUND) \ |
| 432 | $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \ | 432 | $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_ACL) $(LIB_CLOCK_GETTIME) \ |
| 433 | $(WEBKIT_LIBS) $(CLUTTER_LIBS) $(GIR_LIBS) \ | 433 | $(WEBKIT_LIBS) $(GIR_LIBS) \ |
| 434 | $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \ | 434 | $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \ |
| 435 | $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) $(XFIXES_LIBS) \ | 435 | $(LIB_EXECINFO) $(XRANDR_LIBS) $(XINERAMA_LIBS) $(XFIXES_LIBS) \ |
| 436 | $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ | 436 | $(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) | |||
| 10756 | https://bugzilla.gnome.org/show_bug.cgi?id=563627. */ | 10756 | https://bugzilla.gnome.org/show_bug.cgi?id=563627. */ |
| 10757 | id = g_log_set_handler ("GLib", G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL | 10757 | id = g_log_set_handler ("GLib", G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL |
| 10758 | | G_LOG_FLAG_RECURSION, my_log_handler, NULL); | 10758 | | G_LOG_FLAG_RECURSION, my_log_handler, NULL); |
| 10759 | #ifdef HAVE_CLUTTER | ||
| 10760 | gtk_clutter_init (&argc, &argv2); | ||
| 10761 | #else | ||
| 10762 | |||
| 10763 | /* NULL window -> events for all windows go to our function. | 10759 | /* NULL window -> events for all windows go to our function. |
| 10764 | Call before gtk_init so Gtk+ event filters comes after our. */ | 10760 | Call before gtk_init so Gtk+ event filters comes after our. */ |
| 10765 | gdk_window_add_filter (NULL, event_handler_gdk, NULL); | 10761 | 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) | |||
| 10767 | /* gtk_init does set_locale. Fix locale before and after. */ | 10763 | /* gtk_init does set_locale. Fix locale before and after. */ |
| 10768 | fixup_locale (); | 10764 | fixup_locale (); |
| 10769 | gtk_init (&argc, &argv2); | 10765 | gtk_init (&argc, &argv2); |
| 10770 | #endif | ||
| 10771 | fixup_locale (); | 10766 | fixup_locale (); |
| 10772 | 10767 | ||
| 10773 | g_log_remove_handler ("GLib", id); | 10768 | g_log_remove_handler ("GLib", id); |