+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:
+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:
$(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 \
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
#include <bonobo/bonobo-main.h>
#include "e-contact.h"
#include "e-book-listener.h"
-#include "e-book-marshal.h"
#define d(x)
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);
+++ /dev/null
-NONE:NONE
-NONE:BOOL
-NONE:POINTER
-NONE:STRING
-NONE:INT
#include "e-book-view-listener.h"
#include "e-book-view.h"
#include "e-contact.h"
-#include "e-book-marshal.h"
#define d(x)
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);
#include "e-book-view.h"
#include "e-book-view-private.h"
#include "e-book.h"
-#include "e-book-marshal.h"
static GObjectClass *parent_class;
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);
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);
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);
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);
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);
#include <glib/gi18n-lib.h>
#include <libedataserver/e-component-listener.h>
-#include "e-book-marshal.h"
#include "e-book-listener.h"
#define d(x)
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);
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);
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] =
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;
#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>
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;
$(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 \
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:
#include <config.h>
#endif
-#include "e-data-book-marshal.h"
#include "e-book-backend-sync.h"
struct _EBookBackendSyncPrivate {
#include <config.h>
-#include "e-data-book-marshal.h"
#include "e-data-book-view.h"
#include "e-book-backend.h"
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);
}
#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>
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);
+++ /dev/null
-NONE:NONE
-NONE:POINTER
#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"
+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):
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",
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",
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",
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",
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",
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",
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",
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",
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);
}
-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
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",
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",
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",
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);
}
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",
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",
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",
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);
}
-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 \
#include "e-account-list.h"
#include "e-account.h"
-#include "e-data-server-marshal.h"
#include <string.h>
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] =
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] =
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);
}
-NONE:NONE
-NONE:OBJECT
-NONE:STRING
#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);
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;
#endif
#include <string.h>
-#include "e-data-server-marshal.h"
#include "e-uid.h"
#include "e-source-group.h"
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] =
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] =
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);
}
#endif
#include <string.h>
-#include "e-data-server-marshal.h"
#include "e-source-list.h"
struct _ESourceListPrivate {
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] =
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);
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);
}
#endif
#include <string.h>
-#include "e-data-server-marshal.h"
#include "e-uid.h"
#include "e-source.h"
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);
}
+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):
-NONE:NONE
-NONE:POINTER
BOOLEAN:OBJECT,BOXED
#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 {
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));
#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 {
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] =
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);
}
#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. */
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);
}
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] =
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",
+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.
-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
libexchange-storage-1.2.la
libexchange_storage_1_2_la_SOURCES = \
- $(MARSHAL_GENERATED) \
e-folder.c \
e-folder.h \
e-folder-exchange.c \
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 \
libexchange_storageinclude_HEADERS = \
e-folder.h \
e-folder-exchange.h \
- e-shell-marshal.h \
e-storage.h \
exchange-account.h \
exchange-constants.h \
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)
#endif
#include "e-folder.h"
-#include "e-shell-marshal.h"
#include <string.h>
#include <glib.h>
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",
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);
}
+++ /dev/null
-NONE:NONE
-NONE:POINTER
-NONE:POINTER,POINTER,POINTER,POINTER
-NONE:BOXED,OBJECT
-NONE:STRING
-NONE:STRING,POINTER,POINTER
-NONE:STRING,STRING
-NONE:INT
#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>
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] =
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] =
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);
}
#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"
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] =
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] =
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);
}
#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"
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);
}
#include "exchange-hierarchy.h"
#include "e-folder-exchange.h"
-#include "e2k-marshal.h"
enum {
NEW_FOLDER,
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] =
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);
}