Commit 8650fb13 authored by Tomas Popela's avatar Tomas Popela
Browse files

Bug 540362: [webkit-composer] Use webkit for composer

Merge wip/webkit-composer branch into master.
parent 04b7c972
......@@ -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 \
......
......@@ -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
......
......@@ -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)
......
......@@ -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);
......
......@@ -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
......@@ -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)
......
......@@ -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)
......
images_DATA = \
world_map-960.png \
confidential-stamp.jpg \
draft-paper.png \
draft-stamp.jpg \
midnight-stars.jpg \
minus.png \
paper.png \
plus.png \
minus.png
rect.png \
ribbon.jpg \
texture.png \
world_map-960.png
EXTRA_DIST = \
README \
......
art/paper.png

266 Bytes

......@@ -21,8 +21,8 @@ evolution_alarm_notify_CPPFLAGS = \
$(GNOME_PLATFORM_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(CANBERRA_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(CODE_COVERAGE_CFLAGS)
$(CODE_COVERAGE_CFLAGS) \
$(NULL)
ui_DATA = \
alarm-notify.ui
......@@ -55,8 +55,8 @@ evolution_alarm_notify_LDADD = \
$(GNOME_PLATFORM_LIBS) \
$(LIBNOTIFY_LIBS) \
$(CANBERRA_LIBS) \
$(GTKHTML_LIBS)
$(EVOLUTIONALARMNOTIFYICON)
$(EVOLUTIONALARMNOTIFYICON) \
$(NULL)
evolution_alarm_notify_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
......
......@@ -67,9 +67,9 @@ libevolution_calendar_la_CPPFLAGS = \
-DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(LIBSOUP_CFLAGS) \
$(CODE_COVERAGE_CFLAGS)
$(CODE_COVERAGE_CFLAGS) \
$(NULL)
etspec_DATA = \
e-calendar-table.etspec \
......@@ -207,8 +207,8 @@ libevolution_calendar_la_LIBADD = \
$(top_builddir)/e-util/libevolution-util.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(GTKHTML_LIBS) \
$(LIBSOUP_LIBS)
$(LIBSOUP_LIBS) \
$(NULL)
libevolution_calendar_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS)
......
......@@ -14,8 +14,8 @@ libcal_dialogs_la_CPPFLAGS = \
-DPREFIX=\""$(prefix)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(CODE_COVERAGE_CFLAGS)
$(CODE_COVERAGE_CFLAGS) \
$(NULL)
ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs
......@@ -52,7 +52,7 @@ libcal_dialogs_la_LIBADD = \
$(top_builddir)/addressbook/util/libeabutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(GTKHTML_LIBS)
$(NULL)
libcal_dialogs_la_SOURCES = \
alarm-dialog.c \
......
......@@ -9,8 +9,8 @@ libevolution_calendar_importers_la_CPPFLAGS = \
-I$(top_builddir)/calendar \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(CODE_COVERAGE_CFLAGS)
$(CODE_COVERAGE_CFLAGS) \
$(NULL)
libevolution_calendar_importers_la_SOURCES = \
evolution-calendar-importer.h \
......@@ -23,6 +23,6 @@ libevolution_calendar_importers_la_LIBADD = \
$(top_builddir)/shell/libevolution-shell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(GTKHTML_LIBS)
$(NULL)
-include $(top_srcdir)/git.mk
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment