Remove marshallers that are already in GLib (#400970)
authorRoss Burton <rburton@src.gnome.org>
Wed, 4 Apr 2007 21:32:02 +0000 (21:32 +0000)
committerRoss Burton <rburton@src.gnome.org>
Wed, 4 Apr 2007 21:32:02 +0000 (21:32 +0000)
svn path=/trunk/; revision=7685

42 files changed:
ChangeLog
addressbook/ChangeLog
addressbook/libebook/Makefile.am
addressbook/libebook/e-book-listener.c
addressbook/libebook/e-book-marshal.list [deleted file]
addressbook/libebook/e-book-view-listener.c
addressbook/libebook/e-book-view.c
addressbook/libebook/e-book.c
addressbook/libebook/e-destination.c
addressbook/libedata-book/Makefile.am
addressbook/libedata-book/e-book-backend-sync.c
addressbook/libedata-book/e-book-backend.c
addressbook/libedata-book/e-data-book-factory.c
addressbook/libedata-book/e-data-book-marshal.list [deleted file]
addressbook/libedata-book/e-data-book.c
calendar/ChangeLog
calendar/libecal/e-cal-listener.c
calendar/libecal/e-cal-marshal.list
calendar/libecal/e-cal-view-listener.c
calendar/libecal/e-cal-view.c
libedataserver/Makefile.am
libedataserver/e-account-list.c
libedataserver/e-data-server-marshal.list
libedataserver/e-iterator.c
libedataserver/e-source-group.c
libedataserver/e-source-list.c
libedataserver/e-source.c
libedataserverui/ChangeLog
libedataserverui/e-data-server-ui-marshal.list
libedataserverui/e-name-selector-entry.c
libedataserverui/e-name-selector-model.c
libedataserverui/e-source-option-menu.c
libedataserverui/e-source-selector.c
servers/exchange/ChangeLog
servers/exchange/lib/e2k-marshal.list
servers/exchange/storage/Makefile.am
servers/exchange/storage/e-folder.c
servers/exchange/storage/e-shell-marshal.list [deleted file]
servers/exchange/storage/e-storage.c
servers/exchange/storage/exchange-account.c
servers/exchange/storage/exchange-hierarchy-somedav.c
servers/exchange/storage/exchange-hierarchy.c

index d6124fb..efd3b9c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-04-04  Ross Burton  <ross@burtonini.com>
+
+       * libedataserver/e-source-group.c:
+       * libedataserver/e-data-server-marshal.list:
+       * libedataserver/e-account-list.c:
+       * libedataserver/e-source-list.c:
+       * libedataserver/e-iterator.c:
+       * libedataserver/e-source.c:
+       * libedataserver/Makefile.am:
+       Remove marshallers that are in GLib (#400970).
+
 2007-04-01  Matthew Barnes  <mbarnes@redhat.com>
 
        * libedataserver/e-source.c:
index 3deabbb..2a75f4b 100644 (file)
@@ -1,3 +1,20 @@
+2007-04-04  Ross Burton  <ross@openedhand.com>
+
+       * libebook/e-book-listener.c:
+       * libebook/e-destination.c:
+       * libebook/e-book-view-listener.c:
+       * libebook/e-book.c:
+       * libebook/e-book-view.c:
+       * libebook/Makefile.am:
+       * libebook/e-book-marshal.list:
+       * libedata-book/e-data-book-marshal.list:
+       * libedata-book/e-book-backend.c:
+       * libedata-book/e-book-backend-sync.c:
+       * libedata-book/e-data-book.c:
+       * libedata-book/Makefile.am:
+       * libedata-book/e-data-book-factory.c:
+       Remove marshallers that are in GLib (#400970).
+
 2007-04-03  Ross Burton  <ross@openedhand.com>
 
        * libebook/e-vcard.c:
index 7eb3b03..6317c77 100644 (file)
@@ -26,16 +26,11 @@ $(CORBA_GENERATED_H): $(idls)
        $(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/Evolution-DataServer-Addressbook.idl
 $(CORBA_GENERATED_C): $(CORBA_GENERATED_H)
 
-# The marshallers
-MARSHAL_GENERATED = e-book-marshal.c e-book-marshal.h
-@EVO_MARSHAL_RULE@
-
 # The library
 lib_LTLIBRARIES = libebook-1.2.la
 
 libebook_1_2_la_SOURCES =                                      \
        $(CORBA_GENERATED_C)                            \
-       $(MARSHAL_GENERATED)                            \
        e-address-western.c                             \
        e-book-listener.c                               \
        e-book-query.c                                  \
@@ -82,12 +77,11 @@ e-name-western-tables.h: e-name-western-tables.h.in
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libebook-$(API_VERSION).pc
 
-BUILT_SOURCES = $(CORBA_GENERATED) $(MARSHAL_GENERATED)
+BUILT_SOURCES = $(CORBA_GENERATED)
 CLEANFILES    = $(BUILT_SOURCES)
 DISTCLEANFILES = $(pkgconfig_DATA)
 
 EXTRA_DIST =                                           \
-       e-book-marshal.list                             \
        $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)     \
        e-name-western-tables.h.in                      \
        gen-western-table.py
index b11c364..88a1d4c 100644 (file)
@@ -13,7 +13,6 @@
 #include <bonobo/bonobo-main.h>
 #include "e-contact.h"
 #include "e-book-listener.h"
-#include "e-book-marshal.h"
 
 #define d(x)
 
@@ -461,7 +460,7 @@ e_book_listener_class_init (EBookListenerClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EBookListenerClass, response),
                              NULL, NULL,
-                             e_book_marshal_NONE__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
 
diff --git a/addressbook/libebook/e-book-marshal.list b/addressbook/libebook/e-book-marshal.list
deleted file mode 100644 (file)
index 680ea03..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-NONE:NONE
-NONE:BOOL
-NONE:POINTER
-NONE:STRING
-NONE:INT
index d27cbad..b2ca1e4 100644 (file)
@@ -14,7 +14,6 @@
 #include "e-book-view-listener.h"
 #include "e-book-view.h"
 #include "e-contact.h"
-#include "e-book-marshal.h"
 
 #define d(x)
 
@@ -384,7 +383,7 @@ e_book_view_listener_class_init (EBookViewListenerClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EBookViewListenerClass, response),
                              NULL, NULL,
-                             e_book_marshal_NONE__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE,
                              1, G_TYPE_POINTER);
 
index 74c5fd8..229ba6f 100644 (file)
@@ -14,7 +14,6 @@
 #include "e-book-view.h"
 #include "e-book-view-private.h"
 #include "e-book.h"
-#include "e-book-marshal.h"
 
 static GObjectClass *parent_class;
 
@@ -317,7 +316,7 @@ e_book_view_class_init (EBookViewClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EBookViewClass, contacts_changed),
                              NULL, NULL,
-                             e_book_marshal_NONE__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
 
@@ -327,7 +326,7 @@ e_book_view_class_init (EBookViewClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EBookViewClass, contacts_added),
                              NULL, NULL,
-                             e_book_marshal_NONE__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
 
@@ -337,7 +336,7 @@ e_book_view_class_init (EBookViewClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EBookViewClass, contacts_removed),
                              NULL, NULL,
-                             e_book_marshal_NONE__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
 
@@ -347,7 +346,7 @@ e_book_view_class_init (EBookViewClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EBookViewClass, sequence_complete),
                              NULL, NULL,
-                             e_book_marshal_NONE__INT,
+                             g_cclosure_marshal_VOID__INT,
                              G_TYPE_NONE, 1,
                              G_TYPE_INT);
 
@@ -357,7 +356,7 @@ e_book_view_class_init (EBookViewClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EBookViewClass, status_message),
                              NULL, NULL,
-                             e_book_marshal_NONE__STRING,
+                             g_cclosure_marshal_VOID__STRING,
                              G_TYPE_NONE, 1,
                              G_TYPE_STRING);
 
index fa7fad6..ed80d43 100644 (file)
@@ -17,7 +17,6 @@
 #include <glib/gi18n-lib.h>
 #include <libedataserver/e-component-listener.h>
 
-#include "e-book-marshal.h"
 #include "e-book-listener.h"
 
 #define d(x)
@@ -4066,7 +4065,7 @@ e_book_class_init (EBookClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EBookClass, writable_status),
                              NULL, NULL,
-                             e_book_marshal_NONE__BOOL,
+                             g_cclosure_marshal_VOID__BOOLEAN,
                              G_TYPE_NONE, 1,
                              G_TYPE_BOOLEAN);
        
@@ -4076,7 +4075,7 @@ e_book_class_init (EBookClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EBookClass, connection_status),
                              NULL, NULL,
-                             e_book_marshal_NONE__BOOL,
+                             g_cclosure_marshal_VOID__BOOLEAN,
                              G_TYPE_NONE, 1,
                              G_TYPE_BOOLEAN);
 
@@ -4086,7 +4085,7 @@ e_book_class_init (EBookClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EBookClass, auth_required),
                              NULL, NULL,
-                             e_book_marshal_NONE__NONE,
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 
        e_book_signals [BACKEND_DIED] =
@@ -4095,7 +4094,7 @@ e_book_class_init (EBookClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EBookClass, backend_died),
                              NULL, NULL,
-                             e_book_marshal_NONE__NONE,
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 
        object_class->dispose = e_book_dispose;
index 6a1bf4c..1a53c3d 100644 (file)
@@ -40,7 +40,6 @@
 #include <ctype.h>
 #include <string.h>
 #include <libebook/e-book.h>
-#include <libedataserver/e-data-server-marshal.h>
 
 #include <glib.h>
 #include <libxml/xmlmemory.h>
@@ -143,7 +142,7 @@ e_destination_class_init (EDestinationClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EDestinationClass, changed),
                              NULL, NULL,
-                             e_data_server_marshal_VOID__VOID,
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 
        object_class->dispose = e_destination_dispose;
index d8d4229..110a53d 100644 (file)
@@ -26,14 +26,10 @@ $(CORBA_GENERATED_H): $(idls)
        $(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/Evolution-DataServer-Addressbook.idl
 $(CORBA_GENERATED_C): $(CORBA_GENERATED_H)
 
-MARSHAL_GENERATED = e-data-book-marshal.c e-data-book-marshal.h
-@EVO_MARSHAL_RULE@
-
 # The library
 lib_LTLIBRARIES = libedata-book-1.2.la
 
 libedata_book_1_2_la_SOURCES =                         \
-       $(MARSHAL_GENERATED)                            \
        $(CORBA_GENERATED_C)                            \
        e-book-backend-factory.c                        \
        e-book-backend-sexp.c                           \
@@ -78,12 +74,11 @@ libedata_bookinclude_HEADERS =                              \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libedata-book-$(API_VERSION).pc
 
-BUILT_SOURCES = $(CORBA_GENERATED) $(MARSHAL_GENERATED)
+BUILT_SOURCES = $(CORBA_GENERATED)
 CLEANFILES = $(BUILT_SOURCES)
 DISTCLEANFILES = $(pkgconfig_DATA)
 
 EXTRA_DIST =                                           \
-       e-data-book-marshal.list                        \
        $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
 
 dist-hook:
index 69928f5..0a07a52 100644 (file)
@@ -10,7 +10,6 @@
 #include <config.h>
 #endif
 
-#include "e-data-book-marshal.h"
 #include "e-book-backend-sync.h"
 
 struct _EBookBackendSyncPrivate {
index 3b5dab2..343d94d 100644 (file)
@@ -8,7 +8,6 @@
 
 #include <config.h>
 
-#include "e-data-book-marshal.h"
 #include "e-data-book-view.h"
 #include "e-book-backend.h"
 
@@ -1067,7 +1066,7 @@ e_book_backend_class_init (EBookBackendClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (EBookBackendClass, last_client_gone),
                              NULL, NULL,
-                             e_data_book_marshal_NONE__NONE,
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 }
 
index abc897c..3893fee 100644 (file)
@@ -17,7 +17,6 @@
 #include <bonobo/bonobo-main.h>
 #include <bonobo/bonobo-arg.h>
 #include "libedataserver/e-data-server-module.h"
-#include "e-data-book-marshal.h"
 #include "e-data-book-factory.h"
 
 #include <backends/groupwise/e-book-backend-groupwise.h>
@@ -586,7 +585,7 @@ e_data_book_factory_class_init (EDataBookFactoryClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (EDataBookFactoryClass, last_book_gone),
                              NULL, NULL,
-                             e_data_book_marshal_NONE__NONE,
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 
 
diff --git a/addressbook/libedata-book/e-data-book-marshal.list b/addressbook/libedata-book/e-data-book-marshal.list
deleted file mode 100644 (file)
index 9d6744d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-NONE:NONE
-NONE:POINTER
index ffe767a..e4711d2 100644 (file)
@@ -13,7 +13,6 @@
 #include <bonobo/bonobo-arg.h>
 #include <libedataserver/e-list.h>
 #include <libebook/e-contact.h>
-#include "e-data-book-marshal.h"
 #include "e-data-book-view.h"
 #include "e-book-backend.h"
 #include "e-book-backend-sexp.h"
index 2f983dc..64d2b50 100644 (file)
@@ -1,3 +1,11 @@
+2007-04-04  Ross Burton  <ross@openedhand.com>
+
+       * libecal/e-cal-marshal.list:
+       * libecal/e-cal-listener.c:
+       * libecal/e-cal-view-listener.c:
+       * libecal/e-cal-view.c:
+       Remove marshallers that are in GLib (#400970).
+
 2007-04-01  Matthew Barnes  <mbarnes@redhat.com>
 
        * libedata-cal/e-data-cal-factory.c (get_backend_factory):
index 6019da8..5a42177 100644 (file)
@@ -816,7 +816,7 @@ e_cal_listener_class_init (ECalListenerClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ECalListenerClass, open),
                              NULL, NULL,
-                             e_cal_marshal_VOID__INT,
+                             g_cclosure_marshal_VOID__INT,
                              G_TYPE_NONE, 1, G_TYPE_INT);      
        signals[REMOVE] =
                g_signal_new ("remove",
@@ -824,7 +824,7 @@ e_cal_listener_class_init (ECalListenerClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ECalListenerClass, remove),
                              NULL, NULL,
-                             e_cal_marshal_VOID__INT,
+                             g_cclosure_marshal_VOID__INT,
                              G_TYPE_NONE, 1, G_TYPE_INT);
        signals[CREATE_OBJECT] =
                g_signal_new ("create_object",
@@ -840,7 +840,7 @@ e_cal_listener_class_init (ECalListenerClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ECalListenerClass, modify_object),
                              NULL, NULL,
-                             e_cal_marshal_VOID__INT,
+                             g_cclosure_marshal_VOID__INT,
                              G_TYPE_NONE, 1, G_TYPE_INT);      
        signals[REMOVE_OBJECT] =
                g_signal_new ("remove_object",
@@ -848,7 +848,7 @@ e_cal_listener_class_init (ECalListenerClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ECalListenerClass, remove_object),
                              NULL, NULL,
-                             e_cal_marshal_VOID__INT,
+                             g_cclosure_marshal_VOID__INT,
                              G_TYPE_NONE, 1, G_TYPE_INT);
        signals[DISCARD_ALARM] =
                g_signal_new ("discard_alarm",
@@ -856,7 +856,7 @@ e_cal_listener_class_init (ECalListenerClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ECalListenerClass, discard_alarm),
                              NULL, NULL,
-                             e_cal_marshal_VOID__INT,
+                             g_cclosure_marshal_VOID__INT,
                              G_TYPE_NONE, 1, G_TYPE_INT);
        signals[RECEIVE_OBJECTS] =
                g_signal_new ("receive_objects",
@@ -864,7 +864,7 @@ e_cal_listener_class_init (ECalListenerClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ECalListenerClass, receive_objects),
                              NULL, NULL,
-                             e_cal_marshal_VOID__INT,
+                             g_cclosure_marshal_VOID__INT,
                              G_TYPE_NONE, 1, G_TYPE_INT);
        signals[SEND_OBJECTS] =
                g_signal_new ("send_objects",
@@ -928,7 +928,7 @@ e_cal_listener_class_init (ECalListenerClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ECalListenerClass, set_default_timezone),
                              NULL, NULL,
-                             e_cal_marshal_VOID__INT,
+                             g_cclosure_marshal_VOID__INT,
                              G_TYPE_NONE, 1, G_TYPE_INT);
        signals[GET_CHANGES] =
                g_signal_new ("get_changes",
@@ -960,7 +960,7 @@ e_cal_listener_class_init (ECalListenerClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ECalListenerClass, auth_required),
                              NULL, NULL,
-                             e_cal_marshal_NONE__NONE,
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
        signals[BACKEND_ERROR] =
                g_signal_new ("backend_error",
@@ -968,7 +968,7 @@ e_cal_listener_class_init (ECalListenerClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ECalListenerClass, backend_error),
                              NULL, NULL,
-                             e_cal_marshal_VOID__STRING,
+                             g_cclosure_marshal_VOID__STRING,
                              G_TYPE_NONE, 1, G_TYPE_STRING);
 }
 
index eb2dc05..b1ae0a5 100644 (file)
@@ -1,18 +1,6 @@
-NONE:NONE
-NONE:INT
-NONE:POINTER
-NONE:STRING
 NONE:INT,STRING
 NONE:INT,BOOL
 NONE:INT,POINTER
 NONE:INT,POINTER,STRING
 NONE:STRING,INT
-NONE:INT,INT
 NONE:ENUM,ENUM
-NONE:ENUM,STRING
-NONE:STRING,BOOL,INT,INT
-NONE:STRING,STRING
-NONE:STRING,STRING,STRING
-NONE:POINTER,ENUM
-NONE:POINTER,STRING
-NONE:POINTER,POINTER
index e9e1e7d..26d75d6 100644 (file)
@@ -264,7 +264,7 @@ e_cal_view_listener_class_init (ECalViewListenerClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ECalViewListenerClass, objects_added),
                              NULL, NULL,
-                             e_cal_marshal_VOID__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
        signals[OBJECTS_MODIFIED] =
                g_signal_new ("objects_modified",
@@ -272,7 +272,7 @@ e_cal_view_listener_class_init (ECalViewListenerClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ECalViewListenerClass, objects_modified),
                              NULL, NULL,
-                             e_cal_marshal_VOID__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
        signals[OBJECTS_REMOVED] =
                g_signal_new ("objects_removed",
@@ -280,7 +280,7 @@ e_cal_view_listener_class_init (ECalViewListenerClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ECalViewListenerClass, objects_removed),
                              NULL, NULL,
-                             e_cal_marshal_VOID__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
        signals[VIEW_PROGRESS] =
                g_signal_new ("view_progress",
@@ -296,7 +296,7 @@ e_cal_view_listener_class_init (ECalViewListenerClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ECalViewListenerClass, view_done),
                              NULL, NULL,
-                             e_cal_marshal_VOID__INT,
+                             g_cclosure_marshal_VOID__INT,
                              G_TYPE_NONE, 1, G_TYPE_INT);
 }
 
index 3aece8e..bec008e 100644 (file)
@@ -263,7 +263,7 @@ e_cal_view_class_init (ECalViewClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ECalViewClass, objects_added),
                              NULL, NULL,
-                             e_cal_marshal_VOID__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
        signals[OBJECTS_MODIFIED] =
                g_signal_new ("objects_modified",
@@ -271,7 +271,7 @@ e_cal_view_class_init (ECalViewClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ECalViewClass, objects_modified),
                              NULL, NULL,
-                             e_cal_marshal_VOID__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
        signals[OBJECTS_REMOVED] =
                g_signal_new ("objects_removed",
@@ -279,7 +279,7 @@ e_cal_view_class_init (ECalViewClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ECalViewClass, objects_removed),
                              NULL, NULL,
-                             e_cal_marshal_VOID__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
        signals[VIEW_PROGRESS] =
                g_signal_new ("view_progress",
@@ -295,7 +295,7 @@ e_cal_view_class_init (ECalViewClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ECalViewClass, view_done),
                              NULL, NULL,
-                             e_cal_marshal_VOID__INT,
+                             g_cclosure_marshal_VOID__INT,
                              G_TYPE_NONE, 1, G_TYPE_INT);
 }
 
index a7ff316..0beebce 100644 (file)
@@ -9,15 +9,10 @@ INCLUDES =                                                            \
        -DE_DATA_SERVER_UI_GLADEDIR=\""$(gladedir)"\"                   \
        $(E_DATA_SERVER_CFLAGS)
 
-# The marshallers
-MARSHAL_GENERATED = e-data-server-marshal.c e-data-server-marshal.h
-@EVO_MARSHAL_RULE@
-
 lib_LTLIBRARIES = libedataserver-1.2.la
 noinst_PROGRAMS = test-source-list
 
 libedataserver_1_2_la_SOURCES =                \
-       $(MARSHAL_GENERATED)            \
        e-account-list.c                \
        e-account.c                     \
        e-categories.c                  \
index a9c640a..87c6dc1 100644 (file)
@@ -23,7 +23,6 @@
 
 #include "e-account-list.h"
 #include "e-account.h"
-#include "e-data-server-marshal.h"
 
 #include <string.h>
 
@@ -62,7 +61,7 @@ e_account_list_class_init (EAccountListClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EAccountListClass, account_added),
                              NULL, NULL,
-                             e_data_server_marshal_NONE__OBJECT,
+                             g_cclosure_marshal_VOID__OBJECT,
                              G_TYPE_NONE, 1,
                              E_TYPE_ACCOUNT);
        signals[ACCOUNT_CHANGED] =
@@ -71,7 +70,7 @@ e_account_list_class_init (EAccountListClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EAccountListClass, account_changed),
                              NULL, NULL,
-                             e_data_server_marshal_NONE__OBJECT,
+                             g_cclosure_marshal_VOID__OBJECT,
                              G_TYPE_NONE, 1,
                              E_TYPE_ACCOUNT);
        signals[ACCOUNT_REMOVED] =
@@ -80,7 +79,7 @@ e_account_list_class_init (EAccountListClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EAccountListClass, account_removed),
                              NULL, NULL,
-                             e_data_server_marshal_NONE__OBJECT,
+                             g_cclosure_marshal_VOID__OBJECT,
                              G_TYPE_NONE, 1,
                              E_TYPE_ACCOUNT);
 }
index 28da01c..1edf6d2 100644 (file)
@@ -9,7 +9,6 @@
 #include <config.h>
 
 #include "e-iterator.h"
-#include "e-data-server-marshal.h"
 
 static void e_iterator_init (EIterator *card);
 static void e_iterator_class_init (EIteratorClass *klass);
@@ -36,7 +35,7 @@ e_iterator_class_init (EIteratorClass *klass)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (EIteratorClass, invalidate),
                              NULL, NULL,
-                             e_data_server_marshal_NONE__NONE, /* XXX need a new marshaller here */
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 
        klass->invalidate = NULL;
index d076000..b14053f 100644 (file)
@@ -25,7 +25,6 @@
 #endif
 
 #include <string.h>
-#include "e-data-server-marshal.h"
 #include "e-uid.h"
 #include "e-source-group.h"
 
@@ -123,7 +122,7 @@ e_source_group_class_init (ESourceGroupClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceGroupClass, changed),
                              NULL, NULL,
-                             e_data_server_marshal_VOID__VOID,
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 
        signals[SOURCE_ADDED] = 
@@ -132,7 +131,7 @@ e_source_group_class_init (ESourceGroupClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceGroupClass, source_added),
                              NULL, NULL,
-                             e_data_server_marshal_VOID__OBJECT,
+                             g_cclosure_marshal_VOID__OBJECT,
                              G_TYPE_NONE, 1,
                              G_TYPE_OBJECT);
        signals[SOURCE_REMOVED] = 
@@ -141,7 +140,7 @@ e_source_group_class_init (ESourceGroupClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceGroupClass, source_removed),
                              NULL, NULL,
-                             e_data_server_marshal_VOID__OBJECT,
+                             g_cclosure_marshal_VOID__OBJECT,
                              G_TYPE_NONE, 1,
                              G_TYPE_OBJECT);
 }
index 93b350c..d5f1bdd 100644 (file)
@@ -25,7 +25,6 @@
 #endif
 
 #include <string.h>
-#include "e-data-server-marshal.h"
 #include "e-source-list.h"
 
 struct _ESourceListPrivate {
@@ -307,7 +306,7 @@ e_source_list_class_init (ESourceListClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceListClass, changed),
                              NULL, NULL,
-                             e_data_server_marshal_VOID__VOID,
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 
        signals[GROUP_REMOVED] = 
@@ -316,7 +315,7 @@ e_source_list_class_init (ESourceListClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceListClass, group_removed),
                              NULL, NULL,
-                             e_data_server_marshal_VOID__OBJECT,
+                             g_cclosure_marshal_VOID__OBJECT,
                              G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
 
@@ -326,7 +325,7 @@ e_source_list_class_init (ESourceListClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceListClass, group_added),
                              NULL, NULL,
-                             e_data_server_marshal_VOID__OBJECT,
+                             g_cclosure_marshal_VOID__OBJECT,
                              G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
 }
index 6ab50b7..4f9a9fb 100644 (file)
@@ -25,7 +25,6 @@
 #endif
 
 #include <string.h>
-#include "e-data-server-marshal.h"
 #include "e-uid.h"
 #include "e-source.h"
 
@@ -123,7 +122,7 @@ e_source_class_init (ESourceClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceClass, changed),
                              NULL, NULL,
-                             e_data_server_marshal_VOID__VOID,
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 }
 
index f758ddd..59180ce 100644 (file)
@@ -1,3 +1,12 @@
+2007-04-04  Ross Burton  <ross@openedhand.com>
+
+       * e-source-selector.c:
+       * e-name-selector-entry.c:
+       * e-data-server-ui-marshal.list:
+       * e-name-selector-model.c:
+       * e-source-option-menu.c:
+       Remove marshallers that are in GLib (#400970).
+
 2007-04-01  Matthew Barnes  <mbarnes@redhat.com>
 
        * e-source-selector.c (pixbuf_cell_data_func):
index 0a87ac8..4312be1 100644 (file)
@@ -38,7 +38,6 @@
 #include <libedataserverui/e-book-auth-util.h>
 #include <libedataserver/e-sexp.h>
 
-#include <libedataserverui/e-data-server-ui-marshal.h>
 #include "e-name-selector-entry.h"
 
 enum {
@@ -155,7 +154,7 @@ e_name_selector_entry_class_init (ENameSelectorEntryClass *name_selector_entry_c
                                         G_STRUCT_OFFSET (ENameSelectorEntryClass, updated),
                                         NULL,
                                         NULL,
-                                        e_data_server_ui_marshal_VOID__POINTER,
+                                        g_cclosure_marshal_VOID__POINTER,
                                         G_TYPE_NONE, 1, G_TYPE_POINTER);
 
        g_type_class_add_private (object_class, sizeof(ENameSelectorEntryPrivate));
index acad24b..b63fda9 100644 (file)
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <glib.h>
 #include <glib/gi18n-lib.h>
-#include <libedataserver/e-data-server-marshal.h>
 #include "e-name-selector-model.h"
 
 typedef struct {
@@ -113,7 +112,7 @@ e_name_selector_model_class_init (ENameSelectorModelClass *name_selector_model_c
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ENameSelectorModelClass, section_added),
                              NULL, NULL,
-                             e_data_server_marshal_VOID__STRING,
+                             g_cclosure_marshal_VOID__STRING,
                              G_TYPE_NONE, 1, G_TYPE_STRING);
 
        signals [SECTION_REMOVED] =
@@ -122,7 +121,7 @@ e_name_selector_model_class_init (ENameSelectorModelClass *name_selector_model_c
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ENameSelectorModelClass, section_removed),
                              NULL, NULL,
-                             e_data_server_marshal_VOID__STRING,
+                             g_cclosure_marshal_VOID__STRING,
                              G_TYPE_NONE, 1, G_TYPE_STRING);
 }
 
index 91cf2fb..cdd3472 100644 (file)
@@ -27,7 +27,6 @@
 #include <gtk/gtkmenu.h>
 #include <gtk/gtkmenuitem.h>
 
-#include "e-data-server-ui-marshal.h"
 #include "e-source-option-menu.h"
 
 /* We set data on each menu item specifying the corresponding ESource using this key.  */
@@ -239,7 +238,7 @@ e_source_option_menu_class_init (ESourceOptionMenuClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceOptionMenuClass, source_selected),
                              NULL, NULL,
-                             e_data_server_ui_marshal_VOID__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
 }
index 4e43e74..883575f 100644 (file)
@@ -716,7 +716,7 @@ e_source_selector_class_init (ESourceSelectorClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceSelectorClass, selection_changed),
                              NULL, NULL,
-                             e_data_server_ui_marshal_VOID__VOID,
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 
        signals[PRIMARY_SELECTION_CHANGED] = 
@@ -725,7 +725,7 @@ e_source_selector_class_init (ESourceSelectorClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceSelectorClass, primary_selection_changed),
                              NULL, NULL,
-                             e_data_server_ui_marshal_VOID__VOID,
+                             g_cclosure_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
        signals[POPUP_EVENT] =
                g_signal_new ("popup_event",
index 1c869fd..7227a9d 100644 (file)
@@ -1,3 +1,15 @@
+2007-04-04  Ross Burton  <ross@openedhand.com>
+
+       * storage/exchange-hierarchy.c:
+       * storage/e-shell-marshal.list:
+       * storage/exchange-account.c:
+       * storage/e-storage.c:
+       * storage/exchange-hierarchy-somedav.c:
+       * storage/e-folder.c:
+       * storage/Makefile.am:
+       * lib/e2k-marshal.list:
+       Remove marshallers that are in GLib already (#400970).
+
 2007-04-01  Matthew Barnes  <mbarnes@redhat.com>
 
        ** Various code clean-ups from Kjartan Maraas.
index acddf4a..a1e2e42 100644 (file)
@@ -1,10 +1 @@
-BOOL:INT,INT,INT
-BOOL:NONE
-NONE:BOOL,ULONG
-NONE:INT,INT
 NONE:INT,STRING,STRING
-NONE:NONE
-NONE:OBJECT
-NONE:POINTER
-NONE:STRING
-NONE:STRING,INT
index 0c132d3..3c32990 100644 (file)
@@ -26,7 +26,6 @@ lib_LTLIBRARIES =                                             \
        libexchange-storage-1.2.la
 
 libexchange_storage_1_2_la_SOURCES =                           \
-       $(MARSHAL_GENERATED)                                    \
        e-folder.c                                              \
        e-folder.h                                              \
        e-folder-exchange.c                                     \
@@ -59,22 +58,6 @@ libexchange_storage_1_2_la_SOURCES =                         \
        exchange-oof.h                                          \
        exchange-types.h                                        
 
-e-shell-marshal.h: e-shell-marshal.list
-       ( @GLIB_GENMARSHAL@ --prefix=e_shell_marshal $(srcdir)/e-shell-marshal.list --header > e-shell-marshal.h.tmp \
-       && mv e-shell-marshal.h.tmp e-shell-marshal.h ) \
-       || ( rm -f e-shell-marshal.h.tmp && exit 1 )
-
-e-shell-marshal.c: e-shell-marshal.h
-       ( (echo '#include "e-shell-marshal.h"'; @GLIB_GENMARSHAL@ --prefix=e_shell_marshal $(srcdir)/e-shell-marshal.list --body) > e-shell-marshal.c.tmp \
-       && mv e-shell-marshal.c.tmp e-shell-marshal.c ) \
-       || ( rm -f e-shell-marshal.c.tmp && exit 1 )
-
-MARSHAL_GENERATED = e-shell-marshal.c e-shell-marshal.h
-
-BUILT_SOURCES = $(MARSHAL_GENERATED)
-CLEANFILES = $(MARSHAL_GENERATED)
-NODIST_FILES = $(MARSHAL_GENERATED)
-
 libexchange_storage_1_2_la_LIBADD =                            \
        $(WIN32_BOOTSTRAP_LIBS)                                 \
        $(top_builddir)/servers/exchange/lib/libexchange.la     \
@@ -96,7 +79,6 @@ libexchange_storageincludedir = $(privincludedir)/exchange
 libexchange_storageinclude_HEADERS =                           \
        e-folder.h                                              \
        e-folder-exchange.h                                     \
-       e-shell-marshal.h                                       \
        e-storage.h                                             \
        exchange-account.h                                      \
        exchange-constants.h                                    \
@@ -115,7 +97,6 @@ libexchange_storageinclude_HEADERS =                                 \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libexchange-storage-$(API_VERSION).pc
 
-EXTRA_DIST = $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \
-               e-shell-marshal.list
+EXTRA_DIST = $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
 
 DISTCLEANFILES = $(pkgconfig_DATA)
index a23a995..8e5c2c9 100644 (file)
@@ -25,7 +25,6 @@
 #endif
 
 #include "e-folder.h"
-#include "e-shell-marshal.h"
 
 #include <string.h>
 #include <glib.h>
@@ -118,7 +117,7 @@ e_folder_class_init (EFolderClass *klass)
                                         G_SIGNAL_RUN_FIRST,
                                         G_STRUCT_OFFSET (EFolderClass, changed),
                                         NULL, NULL,
-                                        e_shell_marshal_NONE__NONE,
+                                        g_cclosure_marshal_VOID__VOID,
                                         G_TYPE_NONE, 0);
 
        signals[NAME_CHANGED] = g_signal_new ("name_changed",
@@ -126,7 +125,7 @@ e_folder_class_init (EFolderClass *klass)
                                              G_SIGNAL_RUN_FIRST,
                                              G_STRUCT_OFFSET (EFolderClass, name_changed),
                                              NULL, NULL,
-                                             e_shell_marshal_NONE__NONE,
+                                             g_cclosure_marshal_VOID__VOID,
                                              G_TYPE_NONE, 0);
 }
 
diff --git a/servers/exchange/storage/e-shell-marshal.list b/servers/exchange/storage/e-shell-marshal.list
deleted file mode 100644 (file)
index baf4906..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-NONE:NONE
-NONE:POINTER
-NONE:POINTER,POINTER,POINTER,POINTER
-NONE:BOXED,OBJECT
-NONE:STRING
-NONE:STRING,POINTER,POINTER
-NONE:STRING,STRING
-NONE:INT
index 4643867..c557903 100644 (file)
@@ -27,7 +27,6 @@
 #include "e-storage.h"
 
 #include "e-folder-tree.h"
-#include "e-shell-marshal.h"
 
 #include <glib/gi18n-lib.h>
 #include <libedataserver/e-data-server-util.h>
@@ -283,7 +282,7 @@ e_storage_class_init (EStorageClass *class)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (EStorageClass, new_folder),
                              NULL, NULL,
-                             e_shell_marshal_NONE__STRING,
+                             g_cclosure_marshal_VOID__STRING,
                              G_TYPE_NONE, 1,
                              G_TYPE_STRING);
        signals[UPDATED_FOLDER] =
@@ -292,7 +291,7 @@ e_storage_class_init (EStorageClass *class)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (EStorageClass, updated_folder),
                              NULL, NULL,
-                             e_shell_marshal_NONE__STRING,
+                             g_cclosure_marshal_VOID__STRING,
                              G_TYPE_NONE, 1,
                              G_TYPE_STRING);
        signals[REMOVED_FOLDER] =
@@ -301,7 +300,7 @@ e_storage_class_init (EStorageClass *class)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (EStorageClass, removed_folder),
                              NULL, NULL,
-                             e_shell_marshal_NONE__STRING,
+                             g_cclosure_marshal_VOID__STRING,
                              G_TYPE_NONE, 1,
                              G_TYPE_STRING);
 }
index a3c1f1a..06e0c72 100644 (file)
@@ -34,7 +34,6 @@
 #include "e2k-autoconfig.h"
 #include "e2k-encoding-utils.h"
 #include "e2k-kerberos.h"
-#include "e2k-marshal.h"
 #include "e2k-propnames.h"
 #include "e2k-uri.h"
 #include "e2k-utils.h"
@@ -121,7 +120,7 @@ class_init (GObjectClass *object_class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ExchangeAccountClass, connected),
                              NULL, NULL,
-                             e2k_marshal_NONE__OBJECT,
+                             g_cclosure_marshal_VOID__OBJECT,
                              G_TYPE_NONE, 1,
                              E2K_TYPE_CONTEXT);
        signals[NEW_FOLDER] =
@@ -130,7 +129,7 @@ class_init (GObjectClass *object_class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ExchangeAccountClass, new_folder),
                              NULL, NULL,
-                             e2k_marshal_NONE__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
        signals[REMOVED_FOLDER] =
@@ -139,7 +138,7 @@ class_init (GObjectClass *object_class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ExchangeAccountClass, removed_folder),
                              NULL, NULL,
-                             e2k_marshal_NONE__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
 }
index 8995531..3707232 100644 (file)
@@ -29,7 +29,6 @@
 #include "exchange-account.h"
 #include "e-folder-exchange.h"
 #include "e2k-propnames.h"
-#include "e2k-marshal.h"
 #include "e2k-uri.h"
 #include "e2k-utils.h"
 
@@ -78,7 +77,7 @@ class_init (GObjectClass *object_class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ExchangeHierarchySomeDAVClass, href_unreadable),
                              NULL, NULL,
-                             e2k_marshal_NONE__STRING,
+                             g_cclosure_marshal_VOID__STRING,
                              G_TYPE_NONE, 1,
                              G_TYPE_STRING);
 }
index 3011af7..5169609 100644 (file)
@@ -29,7 +29,6 @@
 
 #include "exchange-hierarchy.h"
 #include "e-folder-exchange.h"
-#include "e2k-marshal.h"
 
 enum {
        NEW_FOLDER,
@@ -91,7 +90,7 @@ class_init (GObjectClass *object_class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ExchangeHierarchyClass, new_folder),
                              NULL, NULL,
-                             e2k_marshal_NONE__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
        signals[REMOVED_FOLDER] =
@@ -100,7 +99,7 @@ class_init (GObjectClass *object_class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ExchangeHierarchyClass, removed_folder),
                              NULL, NULL,
-                             e2k_marshal_NONE__POINTER,
+                             g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
 }