diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/gui/contact-editor/Makefile.am | 6 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/Makefile.am | 6 | ||||
| -rw-r--r-- | addressbook/gui/widgets/Makefile.am | 8 | ||||
| -rw-r--r-- | addressbook/gui/widgets/eab-contact-formatter.c | 8 | ||||
| -rw-r--r-- | addressbook/importers/Makefile.am | 8 | ||||
| -rw-r--r-- | addressbook/printing/Makefile.am | 6 | ||||
| -rw-r--r-- | addressbook/util/Makefile.am | 8 |
7 files changed, 22 insertions, 28 deletions
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index e62b6cf058..8356a7e5a4 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -11,8 +11,8 @@ libecontacteditor_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"contact-editor\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) libecontacteditor_la_SOURCES = \ eab-editor.c \ @@ -36,7 +36,7 @@ libecontacteditor_la_LIBADD = \ $(EVOLUTION_ADDRESSBOOK_LIBS) \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) ui_DATA = \ contact-editor.ui \ diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index faf2d435f9..c1c2bd2604 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -11,8 +11,8 @@ libecontactlisteditor_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"contact-list-editor\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) libecontactlisteditor_la_SOURCES = \ e-contact-list-editor.c \ @@ -29,7 +29,7 @@ libecontactlisteditor_la_LIBADD = \ $(top_builddir)/shell/libevolution-shell.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) ui_DATA = contact-list-editor.ui diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 715f84b63c..26b8b0156e 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -18,10 +18,10 @@ libeabwidgets_la_CPPFLAGS = \ -I$(top_builddir)/shell \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(CHAMPLAIN_CFLAGS) \ $(GEO_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) eabincludedir = $(privincludedir)/addressbook/gui/widgets @@ -81,9 +81,9 @@ libeabwidgets_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ $(CHAMPLAIN_LIBS) \ - $(GEO_LIBS) + $(GEO_LIBS) \ + $(NULL) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c index 7bfa46893b..34b3a5ed3c 100644 --- a/addressbook/gui/widgets/eab-contact-formatter.c +++ b/addressbook/gui/widgets/eab-contact-formatter.c @@ -1395,13 +1395,7 @@ collapse_contacts_list (WebKitDOMEventTarget *event_target, gboolean hidden; document = user_data; -#if WEBKIT_CHECK_VERSION(2,2,0) /* XXX should really be (2,1,something) */ - id = webkit_dom_element_get_id ( - WEBKIT_DOM_ELEMENT (event_target)); -#else - id = webkit_dom_html_element_get_id ( - WEBKIT_DOM_HTML_ELEMENT (event_target)); -#endif + id = webkit_dom_element_get_id (WEBKIT_DOM_ELEMENT (event_target)); list_id = g_strconcat ("list-", id, NULL); list = webkit_dom_document_get_element_by_id (document, list_id); diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am index 89f8f9bea9..0d1d2624b0 100644 --- a/addressbook/importers/Makefile.am +++ b/addressbook/importers/Makefile.am @@ -10,8 +10,8 @@ libevolution_addressbook_importers_la_CPPFLAGS = \ -I$(top_builddir)/addressbook \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) libevolution_addressbook_importers_la_SOURCES = \ evolution-ldif-importer.c \ @@ -27,7 +27,7 @@ libevolution_addressbook_importers_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) \ - $(IMPORTERS_LIBS) + $(IMPORTERS_LIBS) \ + $(NULL) -include $(top_srcdir)/git.mk diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index a6e3aac41c..c0773590bd 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -13,8 +13,8 @@ libecontactprint_la_CPPFLAGS = \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) noinst_LTLIBRARIES = libecontactprint.la @@ -30,7 +30,7 @@ libecontactprint_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(NULL) EXTRA_DIST = \ $(ecps_DATA) diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index 4657dbb486..33f1f1b29f 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -12,9 +12,9 @@ libeabutil_la_CPPFLAGS = \ -I$(top_srcdir)/shell \ $(CAMEL_CFLAGS) \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GTKHTML_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(NULL) libeabutil_la_SOURCES = \ eab-book-util.c \ @@ -27,8 +27,8 @@ libeabutil_la_LIBADD = \ $(top_builddir)/shell/libevolution-shell.la \ $(CAMEL_LIBS) \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GTKHTML_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(NULL) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) |