GNOME Bugzilla – Bug 678036
Remove unused X11 display code
Last modified: 2012-06-14 17:03:11 UTC
.
Created attachment 216300 [details] [review] Remove unused X11 display code
Created attachment 216301 [details] [review] Remove unneeded X11 dependency
Comment on attachment 216300 [details] [review] Remove unused X11 display code >From 792b0d6ff07bad3edef5ec6ff9e2f5f2c311471d Mon Sep 17 00:00:00 2001 >From: Bastien Nocera <hadess@hadess.net> >Date: Wed, 13 Jun 2012 16:12:58 +0100 >Subject: [PATCH] Remove unused X11 display code > >https://bugzilla.gnome.org/show_bug.cgi?id=678036 >--- > atk-adaptor/bridge.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > >diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c >index 23a500c..faec393 100644 >--- a/atk-adaptor/bridge.c >+++ b/atk-adaptor/bridge.c >@@ -58,8 +58,6 @@ signal_filter (DBusConnection *bus, DBusMessage *message, void *user_data); > > SpiBridge *spi_global_app_data = NULL; > >-/*static Display *bridge_display = NULL;*/ >- > /*---------------------------------------------------------------------------*/ > > /* >@@ -1000,14 +998,10 @@ gnome_accessibility_module_shutdown (void) > > g_free (spi_global_app_data); > spi_global_app_data = NULL; >- >- /* Not currently creating an XDisplay */ >-#if 0 >- if (bridge_display) >- XCloseDisplay (bridge_display); >-#endif > } > >+/*---------------------------------------------------------------------------*/ >+ > static gchar *name_match_tmpl = > "type='signal', interface='org.freedesktop.DBus', member='NameOwnerChanged', arg0='%s'"; > >-- >1.7.10.2
Comment on attachment 216301 [details] [review] Remove unneeded X11 dependency >From 082b5127a725a1c72fc039d1d908bfeb4d7d0536 Mon Sep 17 00:00:00 2001 >From: Bastien Nocera <hadess@hadess.net> >Date: Wed, 13 Jun 2012 16:29:22 +0100 >Subject: [PATCH] Remove unneeded X11 dependency > >https://bugzilla.gnome.org/show_bug.cgi?id=678036 >--- > atk-adaptor/Makefile.include | 4 +--- > atk-adaptor/adaptors/Makefile.am | 3 +-- > atk-adaptor/bridge.c | 2 -- > configure.ac | 9 --------- > tests/cspi/Makefile.am | 2 +- > 5 files changed, 3 insertions(+), 17 deletions(-) > >diff --git a/atk-adaptor/Makefile.include b/atk-adaptor/Makefile.include >index e436be3..00ab91b 100644 >--- a/atk-adaptor/Makefile.include >+++ b/atk-adaptor/Makefile.include >@@ -7,8 +7,7 @@ libatk_bridge_la_CFLAGS = \ > -I$(top_srcdir) \ > -I$(top_srcdir)/atk-adaptor/adaptors \ > -I$(top_srcdir)/atk-adaptor/ >- $(P2P_CFLAGS) \ >- $(X_CFLAGS) >+ $(P2P_CFLAGS) > > libatk_bridge_la_LDFLAGS = -no-undefined \ > -module \ >@@ -20,7 +19,6 @@ libatk_bridge_la_LIBADD = $(DBUS_LIBS) \ > $(GMODULE_LIBS) \ > $(ATK_LIBS) \ > $(ATSPI_LIBS) \ >- $(X_LIBS) \ > $(top_builddir)/droute/libdroute.la \ > $(top_builddir)/atk-adaptor/adaptors/libatk-bridge-adaptors.la > >diff --git a/atk-adaptor/adaptors/Makefile.am b/atk-adaptor/adaptors/Makefile.am >index 58663ef..66f7ba7 100644 >--- a/atk-adaptor/adaptors/Makefile.am >+++ b/atk-adaptor/adaptors/Makefile.am >@@ -11,8 +11,7 @@ libatk_bridge_adaptors_la_CFLAGS =\ > libatk_bridge_adaptors_la_LIBADD =\ > $(DBUS_LIBS) \ > $(ATK_LIBS) \ >- $(ATSPI_LIBS) \ >- $(X_LIBS) >+ $(ATSPI_LIBS) > > libatk_bridge_adaptors_la_SOURCES =\ > accessible-adaptor.c \ >diff --git a/atk-adaptor/bridge.c b/atk-adaptor/bridge.c >index 43e8166..c18103a 100644 >--- a/atk-adaptor/bridge.c >+++ b/atk-adaptor/bridge.c >@@ -25,8 +25,6 @@ > #define _GNU_SOURCE > #include "config.h" > >-#include <X11/Xlib.h> >-#include <X11/Xatom.h> > #include <unistd.h> > #include <stdlib.h> > #include <stdio.h> >diff --git a/configure.ac b/configure.ac >index 871644f..eb128e9 100644 >--- a/configure.ac >+++ b/configure.ac >@@ -59,15 +59,6 @@ PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.1.4]) > AC_SUBST(ATSPI_LIBS) > AC_SUBST(ATSPI_CFLAGS) > >-AC_PATH_XTRA >- >-if test x$no_x = xyes ; then >- AC_MSG_ERROR([X development libraries not found]) >-else >- X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" >-fi >-AC_SUBST(X_LIBS) >- > GLIB_GSETTINGS > > AC_ARG_ENABLE(p2p, [ --enable-p2p Allow peer-to-peer DBus connections [default=yes]], enable_p2p="$enableval", enable_p2p=yes) >diff --git a/tests/cspi/Makefile.am b/tests/cspi/Makefile.am >index f2e70a6..b5b8d05 100644 >--- a/tests/cspi/Makefile.am >+++ b/tests/cspi/Makefile.am >@@ -16,4 +16,4 @@ INCLUDES = -I$(top_srcdir) \ > > LDADD = $(top_builddir)/common/libspicommon.la \ > $(top_builddir)/cspi/libcspi.la \ >- $(TESTS_LIBS) $(X_LIBS) $(XINPUT_LIBS) $(ATK_LIBS) $(GTK_LIBS) $(DBIND_LIBS) @EXTRA_SOCKET_LIBS@ >+ $(TESTS_LIBS) $(XINPUT_LIBS) $(ATK_LIBS) $(GTK_LIBS) $(DBIND_LIBS) @EXTRA_SOCKET_LIBS@ >-- >1.7.10.2
Comment on attachment 216300 [details] [review] Remove unused X11 display code Attachment 216300 [details] pushed as ad04db7 - Remove unused X11 display code
Attachment 216301 [details] pushed as ffd0104 - Remove unneeded X11 dependency