[evolution/webkit-composer: 20/30] Move EImageChooser dialog from widgets/misc to widgets/editor

[Dan VrÃtil <dvratil src gnome org>]

commit 082bd693579f7bb1698a7a49acc614f5b4bb626c
Author: Dan VrÃtil <dvratil redhat com>
Date:   Mon Aug 27 11:52:51 2012 +0200

    Move EImageChooser dialog from widgets/misc to widgets/editor
    
    The editor now does not link against libewidgesmisc anymore.

 widgets/editor/Makefile.am                        |    4 +++-
 widgets/editor/e-editor-actions.c                 |    2 +-
 widgets/editor/e-editor-cell-dialog.c             |    2 +-
 widgets/editor/e-editor-image-dialog.c            |    2 +-
 widgets/editor/e-editor-table-dialog.c            |    2 +-
 widgets/{misc => editor}/e-image-chooser-dialog.c |    0
 widgets/{misc => editor}/e-image-chooser-dialog.h |    0
 7 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/widgets/editor/Makefile.am b/widgets/editor/Makefile.am
index a71c5a1..f25d1dd 100644
--- a/widgets/editor/Makefile.am
+++ b/widgets/editor/Makefile.am
@@ -65,7 +65,9 @@ libeeditor_la_SOURCES =						\
 	e-emoticon-tool-button.c				\
 	e-emoticon-tool-button.h				\
 	e-emoticon.c						\
-	e-emoticon.h
+	e-emoticon.h						\
+	e-image-chooser-dialog.c				\
+	e-image-chooser-dialog.h
 
 libeeditor_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
 
diff --git a/widgets/editor/e-editor-actions.c b/widgets/editor/e-editor-actions.c
index 4ea0686..5a6ce52 100644
--- a/widgets/editor/e-editor-actions.c
+++ b/widgets/editor/e-editor-actions.c
@@ -25,9 +25,9 @@
 #include "e-editor-utils.h"
 #include "e-emoticon-action.h"
 #include "e-emoticon-chooser.h"
+#include "e-image-chooser-dialog.h"
 
 #include <e-util/e-spell-checker.h>
-#include <misc/e-image-chooser-dialog.h>
 
 #include <gio/gio.h>
 #include <glib/gi18n-lib.h>
diff --git a/widgets/editor/e-editor-cell-dialog.c b/widgets/editor/e-editor-cell-dialog.c
index 3d13c7d..1472877 100644
--- a/widgets/editor/e-editor-cell-dialog.c
+++ b/widgets/editor/e-editor-cell-dialog.c
@@ -23,9 +23,9 @@
 #include "e-editor-cell-dialog.h"
 #include "e-color-combo.h"
 #include "e-editor-utils.h"
+#include "e-image-chooser-dialog.h"
 
 #include <e-util/e-util.h>
-#include <misc/e-image-chooser-dialog.h>
 
 #include <glib/gi18n-lib.h>
 #include <stdlib.h>
diff --git a/widgets/editor/e-editor-image-dialog.c b/widgets/editor/e-editor-image-dialog.c
index b3ca3f7..399bbbc 100644
--- a/widgets/editor/e-editor-image-dialog.c
+++ b/widgets/editor/e-editor-image-dialog.c
@@ -22,8 +22,8 @@
 
 #include "e-editor-image-dialog.h"
 #include "e-editor-utils.h"
+#include "e-image-chooser-dialog.h"
 
-#include <widgets/misc/e-image-chooser-dialog.h>
 #include <glib/gi18n-lib.h>
 #include <stdlib.h>
 
diff --git a/widgets/editor/e-editor-table-dialog.c b/widgets/editor/e-editor-table-dialog.c
index 9a1f191..e2965c1 100644
--- a/widgets/editor/e-editor-table-dialog.c
+++ b/widgets/editor/e-editor-table-dialog.c
@@ -23,9 +23,9 @@
 #include "e-editor-table-dialog.h"
 #include "e-color-combo.h"
 #include "e-editor-utils.h"
+#include "e-image-chooser-dialog.h"
 
 #include <e-util/e-util.h>
-#include <misc/e-image-chooser-dialog.h>
 
 #include <glib/gi18n-lib.h>
 
diff --git a/widgets/misc/e-image-chooser-dialog.c b/widgets/editor/e-image-chooser-dialog.c
similarity index 100%
rename from widgets/misc/e-image-chooser-dialog.c
rename to widgets/editor/e-image-chooser-dialog.c
diff --git a/widgets/misc/e-image-chooser-dialog.h b/widgets/editor/e-image-chooser-dialog.h
similarity index 100%
rename from widgets/misc/e-image-chooser-dialog.h
rename to widgets/editor/e-image-chooser-dialog.h