aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Zheng <simon.zheng@sun.com>2006-01-11 18:33:24 +0800
committerHarry Lu <haip@src.gnome.org>2006-01-11 18:33:24 +0800
commit29267d077d14df77090cc200b791020274c5e31d (patch)
treecbcb2fa99c5666cff9bae3e54fa5dd0ae8edd5cc
parent9acafe39eb468bea91367555af7cb19cbcd4007f (diff)
downloadgsoc2013-evolution-29267d077d14df77090cc200b791020274c5e31d.tar.gz
gsoc2013-evolution-29267d077d14df77090cc200b791020274c5e31d.tar.zst
gsoc2013-evolution-29267d077d14df77090cc200b791020274c5e31d.zip
Remove e-util-marshal.list in current directory, and use the copy in
2006-01-10 Simon Zheng <simon.zheng@sun.com> * Makefile.am: * e-dateedit.c: * e-image-chooser.c: * e-printable.c: * e-reflow-model.c: * e-reflow.c: * e-search-bar.c: * e-selection-model.c: * gal-combo-box.c: Remove e-util-marshal.list in current directory, and use the copy in evolution/e-util directory instead. *e-util-marshal.list: removed svn path=/trunk/; revision=31134
-rw-r--r--widgets/misc/ChangeLog16
-rw-r--r--widgets/misc/Makefile.am6
-rw-r--r--widgets/misc/e-dateedit.c2
-rw-r--r--widgets/misc/e-image-chooser.c2
-rw-r--r--widgets/misc/e-printable.c2
-rw-r--r--widgets/misc/e-reflow-model.c2
-rw-r--r--widgets/misc/e-reflow.c2
-rw-r--r--widgets/misc/e-search-bar.c2
-rw-r--r--widgets/misc/e-selection-model.c2
-rw-r--r--widgets/misc/e-util-marshal.list52
-rw-r--r--widgets/misc/gal-combo-box.c2
11 files changed, 24 insertions, 66 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 0cb71a289a..edce747af3 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,19 @@
+2006-01-10 Simon Zheng <simon.zheng@sun.com>
+
+ * Makefile.am:
+ * e-dateedit.c:
+ * e-image-chooser.c:
+ * e-printable.c:
+ * e-reflow-model.c:
+ * e-reflow.c:
+ * e-search-bar.c:
+ * e-selection-model.c:
+ * gal-combo-box.c:
+ Remove e-util-marshal.list in current directory, and
+ use the copy in evolution/e-util directory instead.
+
+ *e-util-marshal.list: removed
+
2006-01-06 Parthasarathi Susarla <sparthasarathi@novell.com>
* e-search-bar.c:(clear_verb_cb): assign the data first
diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am
index 7160328d7c..243c219240 100644
--- a/widgets/misc/Makefile.am
+++ b/widgets/misc/Makefile.am
@@ -79,7 +79,6 @@ widgetsinclude_HEADERS = \
gal-combo-text.h
libemiscwidgets_la_SOURCES = \
- $(MARSHAL_GENERATED) \
$(widgetsinclude_HEADERS) \
$(pilot_sources) \
e-activity-handler.c \
@@ -126,8 +125,6 @@ libemiscwidgets_la_SOURCES = \
gal-combo-box.c \
gal-combo-text.c
-MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
-@EVO_MARSHAL_RULE@
libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED)
@@ -209,8 +206,6 @@ test_info_label_LDADD = \
$(top_builddir)/e-util/libeutil.la \
$(E_WIDGETS_LIBS)
-BUILT_SOURCES = $(MARSHAL_GENERATED)
-CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = \
$(glade_DATA) \
@@ -222,4 +217,3 @@ EXTRA_DIST = \
dist-hook:
-mkdir $(distdir)/pixmaps
cp $(srcdir)/pixmaps/*.xpm $(distdir)/pixmaps
- cd $(distdir); rm -f $(BUILT_SOURCES)
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 9b115e9151..9328236fcc 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -35,7 +35,7 @@
#endif
#include "e-dateedit.h"
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index 60529de65b..ed147c6d13 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -33,7 +33,7 @@
#include <libgnome/gnome-i18n.h>
#include "e-image-chooser.h"
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
struct _EImageChooserPrivate {
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index d8c1f115d4..ed12c9e488 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -25,7 +25,7 @@
#include <gtk/gtk.h>
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
#include "e-util/e-util.h"
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
index 7e3eadd3f3..a96b17fc68 100644
--- a/widgets/misc/e-reflow-model.c
+++ b/widgets/misc/e-reflow-model.c
@@ -23,7 +23,7 @@
#include <config.h>
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
#include "e-util/e-util.h"
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index df36dd81be..169e3675b0 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -31,7 +31,7 @@
#include "text/e-text.h"
#include "e-util/e-i18n.h"
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
#include "e-util/e-util.h"
#include "misc/e-unicode.h"
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 9e4d9b529a..c390de1524 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -47,7 +47,7 @@
#include <string.h>
#include "e-search-bar.h"
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
enum {
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index 9ddbc5339d..c34e3514ac 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -26,7 +26,7 @@
#include <gdk/gdkkeysyms.h>
#include "e-util/e-i18n.h"
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
#include "e-util/e-util.h"
#include "e-selection-model.h"
diff --git a/widgets/misc/e-util-marshal.list b/widgets/misc/e-util-marshal.list
deleted file mode 100644
index b478efb1ce..0000000000
--- a/widgets/misc/e-util-marshal.list
+++ /dev/null
@@ -1,52 +0,0 @@
-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
-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 62c8d98c08..93cc5205f6 100644
--- a/widgets/misc/gal-combo-box.c
+++ b/widgets/misc/gal-combo-box.c
@@ -29,7 +29,7 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "e-util-marshal.h"
+#include "e-util/e-util-marshal.h"
#include "e-util/e-util.h"
#include "gal-combo-box.h"