[evolution/wip/webkit2] Move the composer's web extension under the modules/webkit-content-editor/web-extension

From: Tomas Popela <tpopela src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution/wip/webkit2] Move the composer's web extension under the modules/webkit-content-editor/web-extension
Date: Mon, 30 May 2016 13:41:11 +0000 (UTC)
commit ecb524d214634db7e945c91d18dfd17fb667c0f7
Author: Tomas Popela <tpopela redhat com>
Date:   Mon May 30 15:40:02 2016 +0200

    Move the composer's web extension under the modules/webkit-content-editor/web-extension

 configure.ac                                       |    6 +++---
 modules/webkit-content-editor/Makefile.am          |    2 ++
 .../e-webkit-content-editor.c                      |    3 ++-
 .../web-extension}/Makefile.am                     |   10 +++++-----
 .../e-composer-private-dom-functions.c             |    0
 .../e-composer-private-dom-functions.h             |    0
 .../e-html-editor-actions-dom-functions.c          |    0
 .../e-html-editor-actions-dom-functions.h          |    0
 .../e-html-editor-cell-dialog-dom-functions.c      |    0
 .../e-html-editor-cell-dialog-dom-functions.h      |    0
 .../web-extension}/e-html-editor-history-event.h   |    0
 .../e-html-editor-hrule-dialog-dom-functions.c     |    0
 .../e-html-editor-hrule-dialog-dom-functions.h     |    0
 .../e-html-editor-image-dialog-dom-functions.c     |    0
 .../e-html-editor-image-dialog-dom-functions.h     |    0
 .../e-html-editor-link-dialog-dom-functions.c      |    0
 .../e-html-editor-link-dialog-dom-functions.h      |    0
 .../e-html-editor-page-dialog-dom-functions.c      |    0
 .../e-html-editor-page-dialog-dom-functions.h      |    0
 .../e-html-editor-selection-dom-functions.c        |    0
 .../e-html-editor-selection-dom-functions.h        |    0
 ...-html-editor-spell-check-dialog-dom-functions.c |    0
 ...-html-editor-spell-check-dialog-dom-functions.h |    0
 .../e-html-editor-table-dialog-dom-functions.c     |    0
 .../e-html-editor-table-dialog-dom-functions.h     |    0
 .../e-html-editor-undo-redo-manager.c              |    0
 .../e-html-editor-undo-redo-manager.h              |    0
 .../e-html-editor-view-dom-functions.c             |    0
 .../e-html-editor-view-dom-functions.h             |    0
 .../e-html-editor-web-extension-main.c             |    0
 .../e-html-editor-web-extension-names.h            |    0
 .../web-extension}/e-html-editor-web-extension.c   |    0
 .../web-extension}/e-html-editor-web-extension.h   |    0
 .../web-extension}/e-msg-composer-dom-functions.c  |    0
 .../web-extension}/e-msg-composer-dom-functions.h  |    0
 web-extensions/Makefile.am                         |    2 --
 36 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6ed90ea..ca1f5cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1267,9 +1267,9 @@ dnl **********************************
 dnl WebKit2 Web Extensions
 dnl **********************************
 webextensionsdir="$privlibdir/web-extensions"
-webextensionscomposerdir="$privlibdir/web-extensions/composer"
+webextensionscontenteditordir="$privlibdir/web-extensions/content-editor"
 AC_SUBST(webextensionsdir)
-AC_SUBST(webextensionscomposerdir)
+AC_SUBST(webextensionscontenteditordir)
 
 PKG_CHECK_MODULES(WEB_EXTENSION, [webkit2gtk-4.0 >= webkit2gtk_minimum_version])
 AC_SUBST(WEB_EXTENSIONS_CFLAGS)
@@ -1618,6 +1618,7 @@ modules/tnef-attachment/Makefile
 modules/vcard-inline/Makefile
 modules/web-inspector/Makefile
 modules/webkit-content-editor/Makefile
+modules/webkit-content-editor/web-extension/Makefile
 plugins/Makefile
 plugins/attachment-reminder/Makefile
 plugins/bbdb/Makefile
@@ -1633,7 +1634,6 @@ plugins/publish-calendar/Makefile
 plugins/save-calendar/Makefile
 plugins/templates/Makefile
 web-extensions/Makefile
-web-extensions/composer/Makefile
 smime/Makefile
 smime/lib/Makefile
 smime/gui/Makefile
diff --git a/modules/webkit-content-editor/Makefile.am b/modules/webkit-content-editor/Makefile.am
index 424fc77..5330758 100644
--- a/modules/webkit-content-editor/Makefile.am
+++ b/modules/webkit-content-editor/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = . web-extension
+
 module_LTLIBRARIES = module-webkit-content-editor.la
 
 module_webkit_content_editor_la_CPPFLAGS =             \
diff --git a/modules/webkit-content-editor/e-webkit-content-editor.c 
b/modules/webkit-content-editor/e-webkit-content-editor.c
index 1286627..dddecf0 100644
--- a/modules/webkit-content-editor/e-webkit-content-editor.c
+++ b/modules/webkit-content-editor/e-webkit-content-editor.c
@@ -21,8 +21,9 @@
 #include "e-webkit-content-editor.h"
 #include "e-webkit-content-editor-find-controller.h"
 
+#include "web-extension/e-html-editor-web-extension-names.h"
+
 #include <e-util/e-util.h>
-#include <web-extensions/composer/e-html-editor-web-extension-names.h>
 #include <string.h>
 
 #define E_WEBKIT_CONTENT_EDITOR_GET_PRIVATE(obj) \
diff --git a/web-extensions/composer/Makefile.am b/modules/webkit-content-editor/web-extension/Makefile.am
similarity index 85%
rename from web-extensions/composer/Makefile.am
rename to modules/webkit-content-editor/web-extension/Makefile.am
index b41baa1..cbe2a9f 100644
--- a/web-extensions/composer/Makefile.am
+++ b/modules/webkit-content-editor/web-extension/Makefile.am
@@ -1,6 +1,6 @@
-webextensionscomposer_LTLIBRARIES = libehtmleditorwebextension.la
+webextensionscontenteditor_LTLIBRARIES = libewebkitcontenteditorwebextension.la
 
-libehtmleditorwebextension_la_SOURCES =                        \
+libewebkitcontenteditorwebextension_la_SOURCES =       \
        e-composer-private-dom-functions.h              \
        e-html-editor-actions-dom-functions.h           \
        e-html-editor-cell-dialog-dom-functions.h       \
@@ -33,7 +33,7 @@ libehtmleditorwebextension_la_SOURCES =                       \
        e-html-editor-web-extension-names.h             \
        e-html-editor-web-extension-main.c
 
-libehtmleditorwebextension_la_CPPFLAGS =               \
+libewebkitcontenteditorwebextension_la_CPPFLAGS =      \
        $(AM_CPPFLAGS)                                  \
        -I$(top_srcdir)                                 \
        -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"        \
@@ -41,14 +41,14 @@ libehtmleditorwebextension_la_CPPFLAGS =            \
        $(GNOME_PLATFORM_CFLAGS)                        \
        $(WEB_EXTENSIONS_CFLAGS)
 
-libehtmleditorwebextension_la_LIBADD =                 \
+libewebkitcontenteditorwebextension_la_LIBADD =                \
        $(top_builddir)/e-util/libevolution-util.la     \
        $(top_builddir)/web-extensions/libedomutils.la  \
        $(EVOLUTION_DATA_SERVER_LIBS)                   \
        $(GNOME_PLATFORM_LIBS)                          \
        $(WEB_EXTENSIONS_LIBS)
 
-libehtmleditorwebextension_la_LDFLAGS =                        \
+libewebkitcontenteditorwebextension_la_LDFLAGS =       \
        -module -avoid-version -no-undefined
 
 -include $(top_srcdir)/git.mk
diff --git a/web-extensions/composer/e-composer-private-dom-functions.c 
b/modules/webkit-content-editor/web-extension/e-composer-private-dom-functions.c
similarity index 100%
rename from web-extensions/composer/e-composer-private-dom-functions.c
rename to modules/webkit-content-editor/web-extension/e-composer-private-dom-functions.c
diff --git a/web-extensions/composer/e-composer-private-dom-functions.h 
b/modules/webkit-content-editor/web-extension/e-composer-private-dom-functions.h
similarity index 100%
rename from web-extensions/composer/e-composer-private-dom-functions.h
rename to modules/webkit-content-editor/web-extension/e-composer-private-dom-functions.h
diff --git a/web-extensions/composer/e-html-editor-actions-dom-functions.c 
b/modules/webkit-content-editor/web-extension/e-html-editor-actions-dom-functions.c
similarity index 100%
rename from web-extensions/composer/e-html-editor-actions-dom-functions.c
rename to modules/webkit-content-editor/web-extension/e-html-editor-actions-dom-functions.c
diff --git a/web-extensions/composer/e-html-editor-actions-dom-functions.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-actions-dom-functions.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-actions-dom-functions.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-actions-dom-functions.h
diff --git a/web-extensions/composer/e-html-editor-cell-dialog-dom-functions.c 
b/modules/webkit-content-editor/web-extension/e-html-editor-cell-dialog-dom-functions.c
similarity index 100%
rename from web-extensions/composer/e-html-editor-cell-dialog-dom-functions.c
rename to modules/webkit-content-editor/web-extension/e-html-editor-cell-dialog-dom-functions.c
diff --git a/web-extensions/composer/e-html-editor-cell-dialog-dom-functions.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-cell-dialog-dom-functions.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-cell-dialog-dom-functions.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-cell-dialog-dom-functions.h
diff --git a/web-extensions/composer/e-html-editor-history-event.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-history-event.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-history-event.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-history-event.h
diff --git a/web-extensions/composer/e-html-editor-hrule-dialog-dom-functions.c 
b/modules/webkit-content-editor/web-extension/e-html-editor-hrule-dialog-dom-functions.c
similarity index 100%
rename from web-extensions/composer/e-html-editor-hrule-dialog-dom-functions.c
rename to modules/webkit-content-editor/web-extension/e-html-editor-hrule-dialog-dom-functions.c
diff --git a/web-extensions/composer/e-html-editor-hrule-dialog-dom-functions.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-hrule-dialog-dom-functions.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-hrule-dialog-dom-functions.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-hrule-dialog-dom-functions.h
diff --git a/web-extensions/composer/e-html-editor-image-dialog-dom-functions.c 
b/modules/webkit-content-editor/web-extension/e-html-editor-image-dialog-dom-functions.c
similarity index 100%
rename from web-extensions/composer/e-html-editor-image-dialog-dom-functions.c
rename to modules/webkit-content-editor/web-extension/e-html-editor-image-dialog-dom-functions.c
diff --git a/web-extensions/composer/e-html-editor-image-dialog-dom-functions.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-image-dialog-dom-functions.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-image-dialog-dom-functions.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-image-dialog-dom-functions.h
diff --git a/web-extensions/composer/e-html-editor-link-dialog-dom-functions.c 
b/modules/webkit-content-editor/web-extension/e-html-editor-link-dialog-dom-functions.c
similarity index 100%
rename from web-extensions/composer/e-html-editor-link-dialog-dom-functions.c
rename to modules/webkit-content-editor/web-extension/e-html-editor-link-dialog-dom-functions.c
diff --git a/web-extensions/composer/e-html-editor-link-dialog-dom-functions.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-link-dialog-dom-functions.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-link-dialog-dom-functions.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-link-dialog-dom-functions.h
diff --git a/web-extensions/composer/e-html-editor-page-dialog-dom-functions.c 
b/modules/webkit-content-editor/web-extension/e-html-editor-page-dialog-dom-functions.c
similarity index 100%
rename from web-extensions/composer/e-html-editor-page-dialog-dom-functions.c
rename to modules/webkit-content-editor/web-extension/e-html-editor-page-dialog-dom-functions.c
diff --git a/web-extensions/composer/e-html-editor-page-dialog-dom-functions.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-page-dialog-dom-functions.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-page-dialog-dom-functions.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-page-dialog-dom-functions.h
diff --git a/web-extensions/composer/e-html-editor-selection-dom-functions.c 
b/modules/webkit-content-editor/web-extension/e-html-editor-selection-dom-functions.c
similarity index 100%
rename from web-extensions/composer/e-html-editor-selection-dom-functions.c
rename to modules/webkit-content-editor/web-extension/e-html-editor-selection-dom-functions.c
diff --git a/web-extensions/composer/e-html-editor-selection-dom-functions.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-selection-dom-functions.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-selection-dom-functions.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-selection-dom-functions.h
diff --git a/web-extensions/composer/e-html-editor-spell-check-dialog-dom-functions.c 
b/modules/webkit-content-editor/web-extension/e-html-editor-spell-check-dialog-dom-functions.c
similarity index 100%
rename from web-extensions/composer/e-html-editor-spell-check-dialog-dom-functions.c
rename to modules/webkit-content-editor/web-extension/e-html-editor-spell-check-dialog-dom-functions.c
diff --git a/web-extensions/composer/e-html-editor-spell-check-dialog-dom-functions.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-spell-check-dialog-dom-functions.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-spell-check-dialog-dom-functions.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-spell-check-dialog-dom-functions.h
diff --git a/web-extensions/composer/e-html-editor-table-dialog-dom-functions.c 
b/modules/webkit-content-editor/web-extension/e-html-editor-table-dialog-dom-functions.c
similarity index 100%
rename from web-extensions/composer/e-html-editor-table-dialog-dom-functions.c
rename to modules/webkit-content-editor/web-extension/e-html-editor-table-dialog-dom-functions.c
diff --git a/web-extensions/composer/e-html-editor-table-dialog-dom-functions.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-table-dialog-dom-functions.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-table-dialog-dom-functions.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-table-dialog-dom-functions.h
diff --git a/web-extensions/composer/e-html-editor-undo-redo-manager.c 
b/modules/webkit-content-editor/web-extension/e-html-editor-undo-redo-manager.c
similarity index 100%
rename from web-extensions/composer/e-html-editor-undo-redo-manager.c
rename to modules/webkit-content-editor/web-extension/e-html-editor-undo-redo-manager.c
diff --git a/web-extensions/composer/e-html-editor-undo-redo-manager.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-undo-redo-manager.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-undo-redo-manager.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-undo-redo-manager.h
diff --git a/web-extensions/composer/e-html-editor-view-dom-functions.c 
b/modules/webkit-content-editor/web-extension/e-html-editor-view-dom-functions.c
similarity index 100%
rename from web-extensions/composer/e-html-editor-view-dom-functions.c
rename to modules/webkit-content-editor/web-extension/e-html-editor-view-dom-functions.c
diff --git a/web-extensions/composer/e-html-editor-view-dom-functions.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-view-dom-functions.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-view-dom-functions.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-view-dom-functions.h
diff --git a/web-extensions/composer/e-html-editor-web-extension-main.c 
b/modules/webkit-content-editor/web-extension/e-html-editor-web-extension-main.c
similarity index 100%
rename from web-extensions/composer/e-html-editor-web-extension-main.c
rename to modules/webkit-content-editor/web-extension/e-html-editor-web-extension-main.c
diff --git a/web-extensions/composer/e-html-editor-web-extension-names.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-web-extension-names.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-web-extension-names.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-web-extension-names.h
diff --git a/web-extensions/composer/e-html-editor-web-extension.c 
b/modules/webkit-content-editor/web-extension/e-html-editor-web-extension.c
similarity index 100%
rename from web-extensions/composer/e-html-editor-web-extension.c
rename to modules/webkit-content-editor/web-extension/e-html-editor-web-extension.c
diff --git a/web-extensions/composer/e-html-editor-web-extension.h 
b/modules/webkit-content-editor/web-extension/e-html-editor-web-extension.h
similarity index 100%
rename from web-extensions/composer/e-html-editor-web-extension.h
rename to modules/webkit-content-editor/web-extension/e-html-editor-web-extension.h
diff --git a/web-extensions/composer/e-msg-composer-dom-functions.c 
b/modules/webkit-content-editor/web-extension/e-msg-composer-dom-functions.c
similarity index 100%
rename from web-extensions/composer/e-msg-composer-dom-functions.c
rename to modules/webkit-content-editor/web-extension/e-msg-composer-dom-functions.c
diff --git a/web-extensions/composer/e-msg-composer-dom-functions.h 
b/modules/webkit-content-editor/web-extension/e-msg-composer-dom-functions.h
similarity index 100%
rename from web-extensions/composer/e-msg-composer-dom-functions.h
rename to modules/webkit-content-editor/web-extension/e-msg-composer-dom-functions.h
diff --git a/web-extensions/Makefile.am b/web-extensions/Makefile.am
index 6ff4f70..07854c2 100644
--- a/web-extensions/Makefile.am
+++ b/web-extensions/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = . composer
-
 webextensions_LTLIBRARIES = libewebextension.la libedomutils.la
 
 libedomutils_la_SOURCES =                              \
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]