aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/gui/widgets')
-rw-r--r--addressbook/gui/widgets/Makefile.am25
-rw-r--r--addressbook/gui/widgets/e-addressbook-model.h2
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c15
-rw-r--r--addressbook/gui/widgets/e-minicard-label.c8
-rw-r--r--addressbook/gui/widgets/e-minicard-view-widget.c2
-rw-r--r--addressbook/gui/widgets/e-minicard-view-widget.h2
-rw-r--r--addressbook/gui/widgets/e-minicard-view.c2
-rw-r--r--addressbook/gui/widgets/e-minicard-view.h2
-rw-r--r--addressbook/gui/widgets/e-minicard-widget.h2
-rw-r--r--addressbook/gui/widgets/e-minicard.c10
-rw-r--r--addressbook/gui/widgets/test-minicard-label.c2
-rw-r--r--addressbook/gui/widgets/test-reflow.c6
12 files changed, 34 insertions, 44 deletions
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index 9680a0a2dc..f592cf2ab2 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -11,7 +11,8 @@ INCLUDES = \
-I$(top_srcdir)/widgets/e-reflow \
-I$(top_srcdir)/widgets/e-table \
-I$(top_srcdir)/widgets/misc \
- $(BONOBO_GNOME_CFLAGS)
+ $(BONOBO_GNOME_CFLAGS) \
+ $(EXTRA_GNOME_CFLAGS)
noinst_LIBRARIES = \
libeminicard.a
@@ -48,7 +49,6 @@ minicard_label_test_LDADD = \
$(EXTRA_GNOME_LIBS) \
libeminicard.a \
$(BONOBO_GNOME_LIBS) \
- $(top_builddir)/widgets/e-text/libetext.a \
$(top_builddir)/e-util/libeutil.la
minicard_test_SOURCES = \
@@ -65,11 +65,8 @@ minicard_test_LDADD = \
$(top_builddir)/addressbook/ename/libename.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/addressbook/printing/libecontactprint.a \
- $(top_builddir)/widgets/e-table/libetable.a \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
- $(top_builddir)/widgets/e-reflow/libereflow.a \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/widgets/e-text/libetext.a
+ $(top_builddir)/e-util/libeutil.la
reflow_test_SOURCES = \
test-reflow.c
@@ -85,11 +82,8 @@ reflow_test_LDADD = \
$(top_builddir)/addressbook/ename/libename.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/addressbook/printing/libecontactprint.a \
- $(top_builddir)/widgets/e-table/libetable.a \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
- $(top_builddir)/widgets/e-reflow/libereflow.a \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/widgets/e-text/libetext.a
+ $(top_builddir)/e-util/libeutil.la
#minicard_view_test_SOURCES = \
# test-minicard-view.c
@@ -104,15 +98,13 @@ reflow_test_LDADD = \
# $(top_builddir)/addressbook/ename/libename.la \
# $(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
# $(top_builddir)/addressbook/printing/libecontactprint.a \
-# $(top_builddir)/widgets/e-table/libetable.a \
# $(top_builddir)/widgets/misc/libemiscwidgets.a \
-# $(top_builddir)/e-util/libeutil.la \
-# $(top_builddir)/widgets/e-text/libetext.a
+# $(top_builddir)/e-util/libeutil.la
minicard_widget_test_SOURCES = \
e-minicard-widget-test.c
-minicard_widget_test_LDADD = \
+minicard_widget_test_LDADD = \
$(EXTRA_GNOME_LIBS) \
$(BONOBO_GNOME_LIBS) \
$(GNOME_PRINT_LIBS) \
@@ -123,11 +115,8 @@ minicard_widget_test_LDADD = \
$(top_builddir)/addressbook/ename/libename.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/addressbook/printing/libecontactprint.a \
- $(top_builddir)/widgets/e-table/libetable.a \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
- $(top_builddir)/widgets/e-reflow/libereflow.a \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/widgets/e-text/libetext.a
+ $(top_builddir)/e-util/libeutil.la
gladedir = $(datadir)/evolution/glade
glade_DATA = alphabet.glade
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
index 267bd1b22a..0bde425a25 100644
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ b/addressbook/gui/widgets/e-addressbook-model.h
@@ -2,7 +2,7 @@
#ifndef _E_ADDRESSBOOK_MODEL_H_
#define _E_ADDRESSBOOK_MODEL_H_
-#include "e-table-model.h"
+#include <gal/e-table/e-table-model.h>
#include "addressbook/backend/ebook/e-book.h"
#include "addressbook/backend/ebook/e-book-view.h"
#include "addressbook/backend/ebook/e-card-simple.h"
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 52f8375d53..dfbcbaca2d 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -25,14 +25,16 @@
#include "e-addressbook-view.h"
-#include "e-table-scrolled.h"
-#include "e-table-model.h"
-#include "e-table-col.h"
-#include "e-table-header.h"
-#include "e-cell-text.h"
+#include <gal/e-table/e-table-scrolled.h>
+#include <gal/e-table/e-table-model.h>
+#include <gal/e-table/e-table-col.h>
+#include <gal/e-table/e-table-header.h>
+#include <gal/e-table/e-cell-text.h>
+#include <gal/widgets/e-scroll-frame.h>
+#include <gal/widgets/e-popup-menu.h>
+
#include "e-addressbook-model.h"
-#include <e-scroll-frame.h>
#include "e-minicard-view-widget.h"
#include "e-contact-editor.h"
@@ -41,7 +43,6 @@
#include "e-card-simple.h"
#include "e-card.h"
#include "e-book.h"
-#include "e-util/e-popup-menu.h"
#include "glade/glade-xml.h"
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index c0f45f67c9..3bdf1f2c47 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -23,10 +23,10 @@
#include <config.h>
#include <gnome.h>
#include "e-minicard-label.h"
-#include "e-text.h"
-#include <e-util/e-canvas.h>
-#include <e-util/e-util.h>
-#include <e-util/e-canvas-utils.h>
+#include <gal/util/e-util.h>
+#include <gal/e-text/e-text.h>
+#include <gal/widgets/e-canvas.h>
+#include <gal/widgets/e-canvas-utils.h>
static void e_minicard_label_init (EMinicardLabel *card);
static void e_minicard_label_class_init (EMinicardLabelClass *klass);
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 3cf1add096..f23d3e4476 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -22,7 +22,7 @@
#include <config.h>
#include <gnome.h>
-#include <e-util/e-canvas.h>
+#include <gal/widgets/e-canvas.h>
#include "e-minicard-view-widget.h"
static void e_minicard_view_widget_init (EMinicardViewWidget *widget);
static void e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass);
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index 372c061f65..952e60ee65 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -23,7 +23,7 @@
#include <gnome.h>
#include "e-minicard-view.h"
-#include "e-util/e-canvas.h"
+#include <gal/widgets/e-canvas.h>
#include "addressbook/backend/ebook/e-book.h"
#ifdef __cplusplus
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 011ff9158f..249c987802 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -22,7 +22,7 @@
#include <config.h>
#include <gnome.h>
-#include <e-util/e-canvas.h>
+#include <gal/widgets/e-canvas.h>
#include "e-minicard-view.h"
#include "e-minicard.h"
#include "e-contact-editor.h"
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index 93a59dfe2a..f12f0d43cf 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -22,7 +22,7 @@
#define __E_MINICARD_VIEW_H__
#include <gnome.h>
-#include "widgets/e-reflow/e-reflow-sorted.h"
+#include <gal/widgets/e-reflow-sorted.h>
#include "addressbook/backend/ebook/e-book.h"
#ifdef __cplusplus
diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h
index 8a3ec0ae16..95b56cf3de 100644
--- a/addressbook/gui/widgets/e-minicard-widget.h
+++ b/addressbook/gui/widgets/e-minicard-widget.h
@@ -23,7 +23,7 @@
#include <gnome.h>
#include "addressbook/backend/ebook/e-card.h"
-#include "e-util/e-canvas.h"
+#include <gal/widgets/e-canvas.h>
#ifdef __cplusplus
extern "C" {
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index e461294b5e..792962a5b3 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -24,12 +24,12 @@
#include <gnome.h>
#include "e-minicard.h"
#include "e-minicard-label.h"
-#include "e-text.h"
#include "addressbook/backend/ebook/e-book.h"
-#include <e-util/e-canvas.h>
-#include <e-util/e-util.h>
-#include <e-util/e-canvas-utils.h>
-#include <e-util/e-popup-menu.h>
+#include <gal/e-text/e-text.h>
+#include <gal/util/e-util.h>
+#include <gal/widgets/e-canvas-utils.h>
+#include <gal/widgets/e-canvas.h>
+#include <gal/widgets/e-popup-menu.h>
#include "addressbook/printing/e-contact-print.h"
#include "e-contact-editor.h"
#include "e-contact-save-as.h"
diff --git a/addressbook/gui/widgets/test-minicard-label.c b/addressbook/gui/widgets/test-minicard-label.c
index 57bc69222a..0566a85760 100644
--- a/addressbook/gui/widgets/test-minicard-label.c
+++ b/addressbook/gui/widgets/test-minicard-label.c
@@ -21,7 +21,7 @@
#include <gnome.h>
#include "e-minicard-label.h"
-#include <e-util/e-canvas.h>
+#include <gal/widgets/e-canvas.h>
/* This is a horrible thing to do, but it is just a test. */
GnomeCanvasItem *label;
diff --git a/addressbook/gui/widgets/test-reflow.c b/addressbook/gui/widgets/test-reflow.c
index 8013c428d5..2a8e7093fe 100644
--- a/addressbook/gui/widgets/test-reflow.c
+++ b/addressbook/gui/widgets/test-reflow.c
@@ -48,10 +48,10 @@
#include "config.h"
#include <gnome.h>
-#include <e-util/e-canvas.h>
-#include "e-reflow.h"
+#include <gal/widgets/e-canvas.h>
+#include <gal/widgets/e-reflow.h>
#include "e-minicard.h"
-#include "e-scroll-frame.h"
+#include <gal/widgets/e-scroll-frame.h>
/* This is a horrible thing to do, but it is just a test. */
GnomeCanvasItem *reflow;
generated by cgit (git 2.34.1) at 2025-01-01 12:54:31 +0800