aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc
diff options
context:
space:
mode:
authorKaushal Kumar <kakumar@novell.com>2005-06-17 23:20:35 +0800
committerKaushal Kumar <kaushal@src.gnome.org>2005-06-17 23:20:35 +0800
commit27a61acf278caf11e5e203d4ee13e107d5b84b2d (patch)
tree3cfc4a916ecfd4d75587e6939b4e4990a35eb5d1 /widgets/misc
parent5a7ddf3c6dab1474185d7c92a1413601878eb690 (diff)
downloadgsoc2013-evolution-27a61acf278caf11e5e203d4ee13e107d5b84b2d.tar.gz
gsoc2013-evolution-27a61acf278caf11e5e203d4ee13e107d5b84b2d.tar.zst
gsoc2013-evolution-27a61acf278caf11e5e203d4ee13e107d5b84b2d.zip
Retired GAL from Head. The relevant files have moved inside evolution.
2005-06-17 Kaushal Kumar <kakumar@novell.com> * Retired GAL from Head. The relevant files have moved inside evolution. Thanks to JP Rosevear for performing the cvs surgery. The files have been moved in the following order. evolution/e-util <- gal/gal/util evolution/a11y <- gal/gal/a11y evolution/a11y/e-table <- gal/gal/a11y/e-table evolution/a11y/e-text <- gal/gal/a11y/e-text evolution/widgets/table <- gal/gal/e-table evolution/widgets/text <- gal/gal/e-text evolution/widgets/misc <- gal/gal/widgets evolution/widgets/misc/pixmaps <- gal/gal/widgets/pixmaps evolution/widgets/menus <- gal/gal/menus Following is the summary of changes done to fix the build:- - New files added to cvs repository, - a11y/e-table/Makefile.am - a11y/e-text/Makefile.am - widgets/table/Makefile.am - widgets/text/Makefile.am - widgets/misc/pixmaps/Makefile.am - iconv-detect.h - iconv-detect.c - Updated configure.in. - Updated all the relevant Makefile.am files. - Updated the include paths to replace all gal references. - Updated the marshal list to suit gal files requirements. svn path=/trunk/; revision=29522
Diffstat (limited to 'widgets/misc')
-rw-r--r--widgets/misc/Makefile.am60
-rw-r--r--widgets/misc/e-activity-handler.c2
-rw-r--r--widgets/misc/e-calendar-item.c2
-rw-r--r--widgets/misc/e-calendar.h2
-rw-r--r--widgets/misc/e-canvas-background.c12
-rw-r--r--widgets/misc/e-canvas-vbox.c4
-rw-r--r--widgets/misc/e-canvas.c4
-rw-r--r--widgets/misc/e-cell-date-edit.c4
-rw-r--r--widgets/misc/e-cell-date-edit.h2
-rw-r--r--widgets/misc/e-cell-percent.h2
-rw-r--r--widgets/misc/e-dateedit.c2
-rw-r--r--widgets/misc/e-multi-config-dialog.c10
-rw-r--r--widgets/misc/e-printable.c14
-rw-r--r--widgets/misc/e-reflow-model.c14
-rw-r--r--widgets/misc/e-reflow.c13
-rw-r--r--widgets/misc/e-reflow.h6
-rw-r--r--widgets/misc/e-search-bar.c4
-rw-r--r--widgets/misc/e-selection-model-array.c4
-rw-r--r--widgets/misc/e-selection-model-array.h4
-rw-r--r--widgets/misc/e-selection-model-simple.c2
-rw-r--r--widgets/misc/e-selection-model-simple.h2
-rw-r--r--widgets/misc/e-selection-model.c13
-rw-r--r--widgets/misc/e-selection-model.h2
-rw-r--r--widgets/misc/e-unicode.c4
-rw-r--r--widgets/misc/e-util-marshal.list52
-rw-r--r--widgets/misc/gal-combo-box.c11
-rw-r--r--widgets/misc/gal-combo-text.c2
-rw-r--r--widgets/misc/gal-combo-text.h2
-rw-r--r--widgets/misc/pixmaps/Makefile.am9
-rw-r--r--widgets/misc/test-color.c2
30 files changed, 190 insertions, 76 deletions
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 03ab98864f..73095b8432 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -1,11 +1,16 @@
INCLUDES = \
-I$(top_srcdir) \
- -I$(top_srcdir)/a11y/widgets/ \
+ -I$(top_srcdir)/a11y/widgets \
+ -I$(top_srcdir)/widgets/ \
-DMAP_DIR=\""$(imagesdir)"\" \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DG_LOG_DOMAIN=__FILE__ \
- $(E_WIDGETS_CFLAGS)
+ $(E_WIDGETS_CFLAGS) \
+ $(EXTRA_GNOME_CFLAGS) \
+ $(ICONV_CFLAGS)
+
privlib_LTLIBRARIES = \
libemiscwidgets.la \
@@ -21,7 +26,11 @@ pilot_sources =
pilot_headers =
endif
-glade_DATA = e-send-options.glade
+glade_DATA = e-send-options.glade \
+ gal-categories.glade
+
+libemiscwidgets_la_LDFLAGS = $(ICONV_LIBS)
+
widgetsinclude_HEADERS = \
$(pilot_headers) \
@@ -47,7 +56,25 @@ widgetsinclude_HEADERS = \
e-task-bar.h \
e-task-widget.h \
e-send-options.h \
- e-url-entry.h
+ e-url-entry.h \
+ e-canvas-background.h \
+ e-canvas-utils.h \
+ e-canvas-vbox.h \
+ e-canvas.h \
+ e-cursors.h \
+ e-gui-utils.h \
+ e-hsv-utils.h \
+ e-popup-menu.h \
+ e-printable.h \
+ e-reflow-model.h \
+ e-reflow.h \
+ e-selection-model-array.h \
+ e-selection-model-simple.h \
+ e-selection-model.h \
+ e-unicode.h \
+ e-colors.h \
+ gal-combo-box.h \
+ gal-combo-text.h
libemiscwidgets_la_SOURCES = \
$(MARSHAL_GENERATED) \
@@ -75,13 +102,34 @@ libemiscwidgets_la_SOURCES = \
e-task-bar.c \
e-task-widget.c \
e-send-options.c \
- e-url-entry.c
+ e-url-entry.c \
+ e-canvas-background.c \
+ e-canvas-utils.c \
+ e-canvas-vbox.c \
+ e-canvas.c \
+ e-cursors.c \
+ e-gui-utils.c \
+ e-hsv-utils.c \
+ e-popup-menu.c \
+ e-printable.c \
+ e-reflow-model.c \
+ e-reflow.c \
+ e-selection-model-array.c \
+ e-selection-model-simple.c \
+ e-selection-model.c \
+ e-unicode.c \
+ e-colors.c \
+ gal-combo-box.c \
+ gal-combo-text.c
MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
@EVO_MARSHAL_RULE@
libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/widgets/table/libetable.la \
+ $(top_builddir)/widgets/text/libetext.la \
$(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la \
+ $(top_builddir)/a11y/libevolution-a11y.la \
$(E_WIDGETS_LIBS)
libefilterbar_la_SOURCES = \
@@ -156,4 +204,6 @@ EXTRA_DIST = \
ChangeLog.pre-1-4
dist-hook:
+ -mkdir $(distdir)/pixmaps
+ cp $(srcdir)/pixmaps/*.xpm $(distdir)/pixmaps
cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index cdbe7518b5..8a5e129300 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -32,7 +32,7 @@
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-popup-menu.h>
-#include <gal/widgets/e-popup-menu.h>
+#include <widgets/misc/e-popup-menu.h>
#define ICON_SIZE 16
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index c3134c07fe..010d5f6c7a 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -44,7 +44,7 @@
#include <gtk/gtksignal.h>
#include <gdk/gdkkeysyms.h>
#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
static const int e_calendar_item_days_in_month[12] = {
31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
index 1fe6d2500c..a9a0cad6d0 100644
--- a/widgets/misc/e-calendar.h
+++ b/widgets/misc/e-calendar.h
@@ -24,7 +24,7 @@
#define _E_CALENDAR_H_
#include <gtk/gtkwidget.h>
-#include <gal/widgets/e-canvas.h>
+#include <widgets/misc/e-canvas.h>
#include "e-calendar-item.h"
#ifdef __cplusplus
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index ad9f2b002b..569fe2b783 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -30,11 +30,11 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-canvas.h"
-#include "gal/widgets/e-canvas-utils.h"
-#include "gal/widgets/e-hsv-utils.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util.h"
+#include "widgets/misc/e-canvas.h"
+#include "widgets/misc/e-canvas-utils.h"
+#include "widgets/misc/e-hsv-utils.h"
#include "e-canvas-background.h"
@@ -512,7 +512,7 @@ ecb_class_init (GObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ECanvasBackgroundClass, style_set),
NULL, NULL,
- e_marshal_NONE__OBJECT,
+ e_util_marshal_NONE__OBJECT,
G_TYPE_NONE, 1, GTK_TYPE_STYLE);
}
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index 4c7969ff66..8ec99ca0af 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -28,8 +28,8 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util.h"
#include "e-canvas.h"
#include "e-canvas-utils.h"
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index d7c2832e9b..18903a325e 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -25,7 +25,7 @@
#include <gtk/gtk.h>
-#include "gal/util/e-util.h"
+#include "e-util/e-util.h"
#include "e-canvas.h"
@@ -105,7 +105,7 @@ e_canvas_class_init (ECanvasClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ECanvasClass, reflow),
NULL, NULL,
- e_marshal_NONE__NONE,
+ e_util_marshal_NONE__NONE,
G_TYPE_NONE, 0);
}
diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
index 12167e3185..5f27f0349a 100644
--- a/widgets/misc/e-cell-date-edit.c
+++ b/widgets/misc/e-cell-date-edit.c
@@ -40,8 +40,8 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include <gal/e-table/e-table-item.h>
-#include <gal/e-table/e-cell-text.h>
+#include <table/e-table-item.h>
+#include <table/e-cell-text.h>
#include <libgnomeui/gnome-messagebox.h>
#include <libgnome/gnome-i18n.h>
diff --git a/widgets/misc/e-cell-date-edit.h b/widgets/misc/e-cell-date-edit.h
index 6f1dacbb58..dba88b8f65 100644
--- a/widgets/misc/e-cell-date-edit.h
+++ b/widgets/misc/e-cell-date-edit.h
@@ -30,7 +30,7 @@
#define _E_CELL_DATE_EDIT_H_
#include <time.h>
-#include <gal/e-table/e-cell-popup.h>
+#include <table/e-cell-popup.h>
#define E_CELL_DATE_EDIT_TYPE (e_cell_date_edit_get_type ())
#define E_CELL_DATE_EDIT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_DATE_EDIT_TYPE, ECellDateEdit))
diff --git a/widgets/misc/e-cell-percent.h b/widgets/misc/e-cell-percent.h
index 6207e0c878..c738631ebf 100644
--- a/widgets/misc/e-cell-percent.h
+++ b/widgets/misc/e-cell-percent.h
@@ -29,7 +29,7 @@
#ifndef _E_CELL_PERCENT_H_
#define _E_CELL_PERCENT_H_
-#include <gal/e-table/e-cell-text.h>
+#include <table/e-cell-text.h>
#define E_CELL_PERCENT_TYPE (e_cell_percent_get_type ())
#define E_CELL_PERCENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_PERCENT_TYPE, ECellPercent))
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index ddd4e3f4dc..739146710b 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -58,7 +58,7 @@
#include <atk/atkrelation.h>
#include <atk/atkrelationset.h>
#include <libgnome/gnome-i18n.h>
-#include <gal/util/e-util.h>
+#include <e-util/e-util.h>
#include "e-util/e-time-utils.h"
#include "e-calendar.h"
diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c
index 499ef97554..fb850bc597 100644
--- a/widgets/misc/e-multi-config-dialog.c
+++ b/widgets/misc/e-multi-config-dialog.c
@@ -28,11 +28,11 @@
#include "e-clipped-label.h"
-#include <gal/e-table/e-table-scrolled.h>
-#include <gal/e-table/e-table-memory-store.h>
-#include <gal/e-table/e-cell-pixbuf.h>
-#include <gal/e-table/e-cell-vbox.h>
-#include <gal/e-table/e-cell-text.h>
+#include <table/e-table-scrolled.h>
+#include <table/e-table-memory-store.h>
+#include <table/e-cell-pixbuf.h>
+#include <table/e-cell-vbox.h>
+#include <table/e-cell-text.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index d4f2da36c9..d8c1f115d4 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -25,7 +25,9 @@
#include <gtk/gtk.h>
-#include "gal/util/e-util.h"
+#include "e-util-marshal.h"
+
+#include "e-util/e-util.h"
#include "e-printable.h"
@@ -59,7 +61,7 @@ e_printable_class_init (GtkObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EPrintableClass, print_page),
NULL, NULL,
- e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
+ e_util_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
G_TYPE_NONE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE,
G_TYPE_DOUBLE, G_TYPE_BOOLEAN);
@@ -69,7 +71,7 @@ e_printable_class_init (GtkObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EPrintableClass, data_left),
NULL, NULL,
- e_marshal_BOOLEAN__NONE,
+ e_util_marshal_BOOLEAN__NONE,
G_TYPE_BOOLEAN, 0, G_TYPE_NONE);
e_printable_signals [RESET] =
@@ -78,7 +80,7 @@ e_printable_class_init (GtkObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EPrintableClass, reset),
NULL, NULL,
- e_marshal_NONE__NONE,
+ e_util_marshal_NONE__NONE,
G_TYPE_NONE, 0, G_TYPE_NONE);
e_printable_signals [HEIGHT] =
@@ -87,7 +89,7 @@ e_printable_class_init (GtkObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EPrintableClass, height),
NULL, NULL,
- e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
+ e_util_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
G_TYPE_DOUBLE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE,
G_TYPE_DOUBLE, G_TYPE_BOOLEAN);
@@ -97,7 +99,7 @@ e_printable_class_init (GtkObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EPrintableClass, will_fit),
NULL, NULL,
- e_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
+ e_util_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
G_TYPE_BOOLEAN, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE,
G_TYPE_DOUBLE, G_TYPE_BOOLEAN);
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
index 340cd04736..7e3eadd3f3 100644
--- a/widgets/misc/e-reflow-model.c
+++ b/widgets/misc/e-reflow-model.c
@@ -23,7 +23,9 @@
#include <config.h>
-#include "gal/util/e-util.h"
+#include "e-util-marshal.h"
+
+#include "e-util/e-util.h"
#include "e-reflow-model.h"
@@ -162,7 +164,7 @@ e_reflow_model_class_init (GObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EReflowModelClass, model_changed),
NULL, NULL,
- e_marshal_NONE__NONE,
+ e_util_marshal_NONE__NONE,
G_TYPE_NONE, 0);
e_reflow_model_signals [COMPARISON_CHANGED] =
@@ -171,7 +173,7 @@ e_reflow_model_class_init (GObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EReflowModelClass, comparison_changed),
NULL, NULL,
- e_marshal_NONE__NONE,
+ e_util_marshal_NONE__NONE,
G_TYPE_NONE, 0);
e_reflow_model_signals [MODEL_ITEMS_INSERTED] =
@@ -180,7 +182,7 @@ e_reflow_model_class_init (GObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EReflowModelClass, model_items_inserted),
NULL, NULL,
- e_marshal_NONE__INT_INT,
+ e_util_marshal_NONE__INT_INT,
G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
e_reflow_model_signals [MODEL_ITEM_CHANGED] =
@@ -189,7 +191,7 @@ e_reflow_model_class_init (GObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EReflowModelClass, model_item_changed),
NULL, NULL,
- e_marshal_NONE__INT,
+ e_util_marshal_NONE__INT,
G_TYPE_NONE, 1, G_TYPE_INT);
e_reflow_model_signals [MODEL_ITEM_REMOVED] =
@@ -198,7 +200,7 @@ e_reflow_model_class_init (GObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EReflowModelClass, model_item_removed),
NULL, NULL,
- e_marshal_NONE__INT,
+ e_util_marshal_NONE__INT,
G_TYPE_NONE, 1, G_TYPE_INT);
klass->set_width = NULL;
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index afbc3ca781..90eb9864a6 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -29,10 +29,11 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "gal/e-text/e-text.h"
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
-#include "gal/widgets/e-unicode.h"
+#include "text/e-text.h"
+#include "e-util/e-i18n.h"
+#include "e-util-marshal.h"
+#include "e-util/e-util.h"
+#include "widgets/misc/e-unicode.h"
#include "e-canvas.h"
#include "e-canvas-utils.h"
@@ -1473,7 +1474,7 @@ e_reflow_class_init (EReflowClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EReflowClass, selection_event),
NULL, NULL,
- e_marshal_INT__OBJECT_BOXED,
+ e_util_marshal_INT__OBJECT_BOXED,
G_TYPE_INT, 2, G_TYPE_OBJECT,
GDK_TYPE_EVENT);
@@ -1483,7 +1484,7 @@ e_reflow_class_init (EReflowClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EReflowClass, column_width_changed),
NULL, NULL,
- e_marshal_NONE__DOUBLE,
+ e_util_marshal_NONE__DOUBLE,
G_TYPE_NONE, 1, G_TYPE_DOUBLE);
}
diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h
index b37e028340..f69abaf111 100644
--- a/widgets/misc/e-reflow.h
+++ b/widgets/misc/e-reflow.h
@@ -25,9 +25,9 @@
#define __E_REFLOW_H__
#include <libgnomecanvas/gnome-canvas.h>
-#include <gal/widgets/e-reflow-model.h>
-#include <gal/widgets/e-selection-model.h>
-#include <gal/util/e-sorter-array.h>
+#include <widgets/misc/e-reflow-model.h>
+#include <widgets/misc/e-selection-model.h>
+#include <e-util/e-sorter-array.h>
#ifdef __cplusplus
extern "C" {
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 72a4494dc4..5a7bac4edc 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -36,8 +36,8 @@
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtkmain.h>
-#include <gal/widgets/e-unicode.h>
-#include <gal/widgets/e-gui-utils.h>
+#include <widgets/misc/e-unicode.h>
+#include <widgets/misc/e-gui-utils.h>
#include <libgnome/gnome-i18n.h>
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index 782dd30d69..07e60a8065 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -25,8 +25,8 @@
#include <gtk/gtk.h>
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-util.h"
#include "e-selection-model-array.h"
diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h
index a533030f92..fd5255e308 100644
--- a/widgets/misc/e-selection-model-array.h
+++ b/widgets/misc/e-selection-model-array.h
@@ -25,8 +25,8 @@
#define _E_SELECTION_MODEL_ARRAY_H_
#include <gtk/gtkobject.h>
-#include <gal/widgets/e-selection-model.h>
-#include <gal/util/e-bit-array.h>
+#include <widgets/misc/e-selection-model.h>
+#include <e-util/e-bit-array.h>
#ifdef __cplusplus
extern "C" {
diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c
index ea03b74b75..ad33815135 100644
--- a/widgets/misc/e-selection-model-simple.c
+++ b/widgets/misc/e-selection-model-simple.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "gal/util/e-util.h"
+#include "e-util/e-util.h"
#include "e-selection-model-array.h"
#include "e-selection-model-simple.h"
diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h
index 6b4f84b4f9..00b8c3a781 100644
--- a/widgets/misc/e-selection-model-simple.h
+++ b/widgets/misc/e-selection-model-simple.h
@@ -24,7 +24,7 @@
#ifndef _E_SELECTION_MODEL_SIMPLE_H_
#define _E_SELECTION_MODEL_SIMPLE_H_
-#include <gal/widgets/e-selection-model-array.h>
+#include <widgets/misc/e-selection-model-array.h>
#ifdef __cplusplus
extern "C" {
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index 8ab880f848..9ddbc5339d 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -25,8 +25,9 @@
#include <gdk/gdkkeysyms.h>
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-util.h"
+#include "e-util/e-i18n.h"
+#include "e-util-marshal.h"
+#include "e-util/e-util.h"
#include "e-selection-model.h"
@@ -155,7 +156,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESelectionModelClass, cursor_changed),
NULL, NULL,
- e_marshal_NONE__INT_INT,
+ e_util_marshal_NONE__INT_INT,
G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
e_selection_model_signals [CURSOR_ACTIVATED] =
@@ -164,7 +165,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESelectionModelClass, cursor_activated),
NULL, NULL,
- e_marshal_NONE__INT_INT,
+ e_util_marshal_NONE__INT_INT,
G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
e_selection_model_signals [SELECTION_CHANGED] =
@@ -173,7 +174,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESelectionModelClass, selection_changed),
NULL, NULL,
- e_marshal_NONE__NONE,
+ e_util_marshal_NONE__NONE,
G_TYPE_NONE, 0);
e_selection_model_signals [SELECTION_ROW_CHANGED] =
@@ -182,7 +183,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESelectionModelClass, selection_row_changed),
NULL, NULL,
- e_marshal_NONE__INT,
+ e_util_marshal_NONE__INT,
G_TYPE_NONE, 1, G_TYPE_INT);
klass->cursor_changed = NULL;
diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h
index a78bdfd9c3..775d514d61 100644
--- a/widgets/misc/e-selection-model.h
+++ b/widgets/misc/e-selection-model.h
@@ -25,7 +25,7 @@
#define _E_SELECTION_MODEL_H_
#include <gtk/gtkobject.h>
-#include <gal/util/e-sorter.h>
+#include <e-util/e-sorter.h>
#include <gdk/gdkevents.h>
#ifdef __cplusplus
diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c
index 1d41c28e25..510f2c9849 100644
--- a/widgets/misc/e-unicode.c
+++ b/widgets/misc/e-unicode.c
@@ -40,8 +40,8 @@
#include <gtk/gtk.h>
#include <libxml/xmlmemory.h>
-#include "gal/util/e-i18n.h"
-#include "gal/util/e-iconv.h"
+#include "e-util/e-i18n.h"
+#include "e-util/e-iconv.h"
#include "e-unicode.h"
diff --git a/widgets/misc/e-util-marshal.list b/widgets/misc/e-util-marshal.list
index 787be7d723..b478efb1ce 100644
--- a/widgets/misc/e-util-marshal.list
+++ b/widgets/misc/e-util-marshal.list
@@ -1,4 +1,52 @@
-NONE:NONE
+BOOLEAN:INT,INT,OBJECT,INT,INT,UINT
+BOOLEAN:INT,POINTER,INT,OBJECT,INT,INT,UINT
+BOOLEAN:NONE
+BOOLEAN:OBJECT
+BOOLEAN:OBJECT,DOUBLE,DOUBLE,BOOLEAN
+BOOLEAN:POINTER,POINTER,INT,INT,INT
+BOOLEAN:POINTER,POINTER,POINTER,INT,INT,INT
+BOOLEAN:STRING,INT
+DOUBLE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
+INT:BOXED
+INT:INT
+INT:INT,INT,BOXED
+INT:INT,POINTER,INT,BOXED
+INT:OBJECT,BOXED
+INT:POINTER
+NONE:BOXED
+NONE:BOXED,INT
+NONE:BOXED,INT,INT
+NONE:DOUBLE
NONE:INT
+NONE:INT,INT
+NONE:INT,INT,BOXED
+NONE:INT,INT,OBJECT
+NONE:INT,INT,OBJECT,BOXED,UINT,UINT
+NONE:INT,INT,OBJECT,INT,INT,BOXED,UINT,UINT
+NONE:INT,INT,OBJECT,POINTER,UINT,UINT
+NONE:INT,INT,OBJECT,UINT
+NONE:INT,INT,STRING,STRING
+NONE:INT,INT,STRING,STRING,POINTER
+NONE:INT,POINTER
+NONE:INT,POINTER,INT,BOXED
+NONE:INT,POINTER,INT,OBJECT
+NONE:INT,POINTER,INT,OBJECT,BOXED,UINT,UINT
+NONE:INT,POINTER,INT,OBJECT,INT,INT,BOXED,UINT,UINT
+NONE:INT,POINTER,INT,OBJECT,UINT
+NONE:INT,STRING
+NONE:NONE
+NONE:OBJECT
+NONE:OBJECT,OBJECT
+NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN
NONE:POINTER
-BOOLEAN:OBJECT,BOXED
+NONE:POINTER,BOOLEAN
+NONE:POINTER,BOOLEAN,BOOLEAN,BOOLEAN
+NONE:POINTER,INT
+NONE:POINTER,INT,INT
+NONE:POINTER,INT,INT,INT
+NONE:POINTER,INT,INT,INT,INT
+NONE:POINTER,INT,OBJECT
+NONE:POINTER,POINTER
+NONE:POINTER,POINTER,INT
+OBJECT:OBJECT,DOUBLE,DOUBLE,BOOLEAN
+POINTER:NONE
diff --git a/widgets/misc/gal-combo-box.c b/widgets/misc/gal-combo-box.c
index c27ead20bf..62c8d98c08 100644
--- a/widgets/misc/gal-combo-box.c
+++ b/widgets/misc/gal-combo-box.c
@@ -29,7 +29,8 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "gal/util/e-util.h"
+#include "e-util-marshal.h"
+#include "e-util/e-util.h"
#include "gal-combo-box.h"
@@ -136,7 +137,7 @@ gal_combo_box_class_init (GObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GalComboBoxClass, pop_down_widget),
NULL, NULL,
- e_marshal_POINTER__NONE,
+ e_util_marshal_POINTER__NONE,
G_TYPE_POINTER, 0, G_TYPE_NONE);
gal_combo_box_signals [POP_DOWN_DONE] = g_signal_new (
@@ -145,7 +146,7 @@ gal_combo_box_class_init (GObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GalComboBoxClass, pop_down_done),
NULL, NULL,
- e_marshal_BOOLEAN__OBJECT,
+ e_util_marshal_BOOLEAN__OBJECT,
G_TYPE_BOOLEAN, 1, G_TYPE_OBJECT);
gal_combo_box_signals [PRE_POP_DOWN] = g_signal_new (
@@ -154,7 +155,7 @@ gal_combo_box_class_init (GObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GalComboBoxClass, pre_pop_down),
NULL, NULL,
- e_marshal_NONE__NONE,
+ e_util_marshal_NONE__NONE,
G_TYPE_NONE, 0);
gal_combo_box_signals [POST_POP_HIDE] = g_signal_new (
@@ -163,7 +164,7 @@ gal_combo_box_class_init (GObjectClass *object_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GalComboBoxClass, post_pop_hide),
NULL, NULL,
- e_marshal_NONE__NONE,
+ e_util_marshal_NONE__NONE,
G_TYPE_NONE, 0);
}
diff --git a/widgets/misc/gal-combo-text.c b/widgets/misc/gal-combo-text.c
index 41d61145b6..e9e825d396 100644
--- a/widgets/misc/gal-combo-text.c
+++ b/widgets/misc/gal-combo-text.c
@@ -26,7 +26,7 @@
#include <gtk/gtk.h>
-#include "gal/util/e-util.h"
+#include "e-util/e-util.h"
#include "gal-combo-text.h"
diff --git a/widgets/misc/gal-combo-text.h b/widgets/misc/gal-combo-text.h
index c507651dd1..f53d924c5a 100644
--- a/widgets/misc/gal-combo-text.h
+++ b/widgets/misc/gal-combo-text.h
@@ -23,7 +23,7 @@
#ifndef _GAL_COMBO_TEXT_H
#define _GAL_COMBO_TEXT_H
-#include <gal/widgets/gal-combo-box.h>
+#include <widgets/misc/gal-combo-box.h>
#ifdef __cplusplus
extern "C" {
diff --git a/widgets/misc/pixmaps/Makefile.am b/widgets/misc/pixmaps/Makefile.am
new file mode 100644
index 0000000000..5092e20ba3
--- /dev/null
+++ b/widgets/misc/pixmaps/Makefile.am
@@ -0,0 +1,9 @@
+pixmaps = \
+ cursor_cross.xpm \
+ cursor_hand_closed.xpm \
+ cursor_hand_open.xpm \
+ cursor_zoom_in.xpm \
+ cursor_zoom_out.xpm
+
+EXTRA_DIST = \
+ $(pixmaps)
diff --git a/widgets/misc/test-color.c b/widgets/misc/test-color.c
index 9bb6fe1cf2..492cb65c3c 100644
--- a/widgets/misc/test-color.c
+++ b/widgets/misc/test-color.c
@@ -24,7 +24,7 @@
#include <gnome.h>
-#include "gal/util/e-i18n.h"
+#include "e-util/e-i18n.h"
#include "color-palette.h"
#include "e-colors.h"