[evince] Remove gail-util from cut-n-paste and add gail dependency
- From: Carlos Garcia Campos <carlosgc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evince] Remove gail-util from cut-n-paste and add gail dependency
- Date: Thu, 8 Jul 2010 08:23:08 +0000 (UTC)
commit ca22044f7609f44e342166d2686e69f8fb261640
Author: Carlos Garcia Campos <carlosgc gnome org>
Date: Mon Jul 5 11:37:09 2010 +0200
Remove gail-util from cut-n-paste and add gail dependency
I thought gail-util was included in gtk+ sources but it was not
installed by gtk.
configure.ac | 3 +-
cut-n-paste/Makefile.am | 2 +-
cut-n-paste/gail-util/Makefile.am | 17 -
cut-n-paste/gail-util/gailmisc.c | 1126 ----------------------------------
cut-n-paste/gail-util/gailmisc.h | 82 ---
cut-n-paste/gail-util/gailtextutil.c | 786 ------------------------
cut-n-paste/gail-util/gailtextutil.h | 87 ---
libview/Makefile.am | 2 -
libview/ev-view-accessible.c | 3 +-
9 files changed, 3 insertions(+), 2105 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1732c06..83ee95f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,7 +141,7 @@ dnl Check dependencies
# SHELL_LIBS
PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
-PKG_CHECK_MODULES(LIBVIEW, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+PKG_CHECK_MODULES(LIBVIEW, gtk+-2.0 >= $GTK_REQUIRED gail >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED)
PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
PKG_CHECK_MODULES(PREVIEWER, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
@@ -778,7 +778,6 @@ cut-n-paste/smclient/Makefile
cut-n-paste/toolbar-editor/Makefile
cut-n-paste/zoom-control/Makefile
cut-n-paste/totem-screensaver/Makefile
-cut-n-paste/gail-util/Makefile
cut-n-paste/synctex/Makefile
data/evince.desktop.in
data/Makefile
diff --git a/cut-n-paste/Makefile.am b/cut-n-paste/Makefile.am
index fbfbe2c..b53b9b9 100644
--- a/cut-n-paste/Makefile.am
+++ b/cut-n-paste/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = zoom-control toolbar-editor totem-screensaver smclient gimpcellrenderertoggle gail-util synctex
+SUBDIRS = zoom-control toolbar-editor totem-screensaver smclient gimpcellrenderertoggle synctex
-include $(top_srcdir)/git.mk
diff --git a/libview/Makefile.am b/libview/Makefile.am
index 226a653..23210fa 100644
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -57,7 +57,6 @@ libevview_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
-I$(top_builddir) \
- -I$(top_srcdir)/cut-n-paste/gail-util/ \
$(AM_CPPFLAGS)
libevview_la_CFLAGS = \
@@ -74,7 +73,6 @@ libevview_la_LDFLAGS = \
libevview_la_LIBADD = \
$(top_builddir)/libdocument/libevdocument.la \
- $(top_builddir)/cut-n-paste/gail-util/libgail.la \
$(LIBVIEW_LIBS)
BUILT_SOURCES = \
diff --git a/libview/ev-view-accessible.c b/libview/ev-view-accessible.c
index 2b8f386..af5a84b 100644
--- a/libview/ev-view-accessible.c
+++ b/libview/ev-view-accessible.c
@@ -22,8 +22,7 @@
#include <config.h>
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
-#include "gailmisc.h"
-#include "gailtextutil.h"
+#include <libgail-util/gail-util.h>
#include "ev-selection.h"
#include "ev-page-cache.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]