evolution-data-server r9893 - branches/dbus/addressbook/libebook

[rburton svn gnome org]

Author: rburton
Date: Thu Jan  8 15:13:33 2009
New Revision: 9893
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9893&view=rev

Log:
Don't use custom marshalers

Modified:
   branches/dbus/addressbook/libebook/Makefile.am
   branches/dbus/addressbook/libebook/e-book-view.c
   branches/dbus/addressbook/libebook/e-book.c

Modified: branches/dbus/addressbook/libebook/Makefile.am
==============================================================================
--- branches/dbus/addressbook/libebook/Makefile.am	(original)
+++ branches/dbus/addressbook/libebook/Makefile.am	Thu Jan  8 15:13:33 2009
@@ -8,15 +8,10 @@
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
 	$(DBUS_GLIB_CFLAGS)
 
-# 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 =					\
-	$(MARSHAL_GENERATED)				\
 	$(DBUS_GENERATED_H)				\
 	e-address-western.c				\
 	e-book-query.c					\
@@ -64,12 +59,11 @@
 %-bindings.h: $(top_srcdir)/addressbook/libedata-book/%.xml
 	dbus-binding-tool --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
 
-BUILT_SOURCES = $(DBUS_GENERATED_H) $(MARSHAL_GENERATED)
+BUILT_SOURCES = $(DBUS_GENERATED_H)
 CLEANFILES    = $(BUILT_SOURCES)
 DISTCLEANFILES = $(pkgconfig_DATA)
 
 EXTRA_DIST = 						\
-	e-book-marshal.list				\
 	$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
 
 dist-hook:

Modified: branches/dbus/addressbook/libebook/e-book-view.c
==============================================================================
--- branches/dbus/addressbook/libebook/e-book-view.c	(original)
+++ branches/dbus/addressbook/libebook/e-book-view.c	Thu Jan  8 15:13:33 2009
@@ -24,7 +24,6 @@
 #include "e-book-view.h"
 #include "e-book-view-private.h"
 #include "e-data-book-view-bindings.h"
-#include "e-book-marshal.h"
 
 G_DEFINE_TYPE(EBookView, e_book_view, G_TYPE_OBJECT);
 
@@ -78,35 +77,35 @@
                                              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);
   signals [CONTACTS_REMOVED] = g_signal_new ("contacts_removed",
                                              G_OBJECT_CLASS_TYPE (object_class),
                                              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);
   signals [CONTACTS_ADDED] = g_signal_new ("contacts_added",
                                            G_OBJECT_CLASS_TYPE (object_class),
                                            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);
   signals [SEQUENCE_COMPLETE] = g_signal_new ("sequence_complete",
                                               G_OBJECT_CLASS_TYPE (object_class),
                                               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);
   signals [STATUS_MESSAGE] = g_signal_new ("status_message",
                                            G_OBJECT_CLASS_TYPE (object_class),
                                            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);
 }
 

Modified: branches/dbus/addressbook/libebook/e-book.c
==============================================================================
--- branches/dbus/addressbook/libebook/e-book.c	(original)
+++ branches/dbus/addressbook/libebook/e-book.c	Thu Jan  8 15:13:33 2009
@@ -31,7 +31,6 @@
 #include "e-data-book-factory-bindings.h"
 #include "e-data-book-bindings.h"
 #include "libedata-book/e-data-book-types.h"
-#include "e-book-marshal.h"
 
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus-glib-lowlevel.h>
@@ -155,7 +154,7 @@
 			      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);
   
@@ -165,7 +164,7 @@
                   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);
   
@@ -175,7 +174,7 @@
                   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] =
@@ -184,7 +183,7 @@
                   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);
   
   gobject_class->dispose = e_book_dispose;