use only libgnome stuff (no ui bits)

2003-11-14  JP Rosevear <jpr@ximian.com>

	* libedataserver/test-source-list.c: use only libgnome stuff (no
	ui bits)

	* libedataserver/e-source.c: ditto

	* libedataserver/e-source-list.c: ditto

	* libedataserver/e-source-group.c: remove use of gal bits, use
	local marshallers

	* libedataserver/Makefile.am: build and install e-source stuff

diff --git a/ChangeLog b/ChangeLog
index 87d0d4b..3223721 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2003-11-14  JP Rosevear <jpr@ximian.com>
+
+       * libedataserver/test-source-list.c: use only libgnome stuff (no
+       ui bits)
+
+       * libedataserver/e-source.c: ditto
+
+       * libedataserver/e-source-list.c: ditto
+
+       * libedataserver/e-source-group.c: remove use of gal bits, use
+       local marshallers
+
+       * libedataserver/Makefile.am: build and install e-source stuff
+
 2003-11-14  Rodrigo Moya <rodrigo@ximian.com>
 
        * src/server-interface-check.[ch]: fixed copyright comments.

diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index 894f314..4afbd37 100644 (file)
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -10,6 +10,7 @@ MARSHAL_GENERATED = e-data-server-marshal.c e-data-server-marshal.h
 @EVO_MARSHAL_RULE@
 
 lib_LTLIBRARIES = libedataserver.la
+noinst_PROGRAMS = test-source-list
 
 libedataserver_la_SOURCES =            \
        $(MARSHAL_GENERATED)            \
@@ -23,6 +24,9 @@ libedataserver_la_SOURCES =           \
        e-list-iterator.c               \
        e-memory.c                      \
        e-sexp.c                        \
+       e-source-group.c                \
+       e-source-list.c                 \
+       e-source.c                      \
        e-uid.c                         \
        e-url.c                         \
        e-util.c                        \
@@ -48,12 +52,18 @@ libedataserverinclude_HEADERS =             \
        e-list-iterator.h               \
        e-memory.h                      \
        e-sexp.h                        \
+       e-source-group.h                \
+       e-source-list.h                 \
+       e-source.h                      \
        e-uid.h                         \
        e-url.h                         \
        e-util.h                        \
        e-xml-hash-utils.h              \
        md5-utils.h
 
+test_source_list_SOURCES = test-source-list.c
+test_source_list_LDADD = libedataserver.la $(E_DATA_SERVER_LIBS)
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libedataserver-1.0.pc
 

diff --git a/libedataserver/e-source-group.c b/libedataserver/e-source-group.c
index 5fb5a97..3789d5b 100644 (file)
--- a/libedataserver/e-source-group.c
+++ b/libedataserver/e-source-group.c
@@ -20,21 +20,17 @@
  * Author: Ettore Perazzoli <ettore@ximian.com>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-
-#include "e-source-group.h"
-
-#include "e-uid.h"
-#include "e-util-marshal.h"
-
-#include <gal/util/e-util.h>
+#endif
 
 #include <string.h>
+#include "e-data-server-marshal.h"
+#include "e-uid.h"
+#include "e-source-group.h"
 
-#define PARENT_TYPE G_TYPE_OBJECT
 static GObjectClass *parent_class = NULL;
 
-
 /* Private members.  */
 
 struct _ESourceGroupPrivate {
@@ -128,7 +124,7 @@ class_init (ESourceGroupClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceGroupClass, changed),
                              NULL, NULL,
-                             e_util_marshal_VOID__VOID,
+                             e_data_server_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 
        signals[SOURCE_ADDED] = 
@@ -137,7 +133,7 @@ class_init (ESourceGroupClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceGroupClass, source_added),
                              NULL, NULL,
-                             e_util_marshal_VOID__OBJECT,
+                             e_data_server_marshal_VOID__OBJECT,
                              G_TYPE_NONE, 1,
                              G_TYPE_OBJECT);
        signals[SOURCE_REMOVED] = 
@@ -146,7 +142,7 @@ class_init (ESourceGroupClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceGroupClass, source_removed),
                              NULL, NULL,
-                             e_util_marshal_VOID__OBJECT,
+                             e_data_server_marshal_VOID__OBJECT,
                              G_TYPE_NONE, 1,
                              G_TYPE_OBJECT);
 }
@@ -160,6 +156,27 @@ init (ESourceGroup *source_group)
        source_group->priv = priv;
 }
 
+GType
+e_source_group_get_type (void)
+{
+       static GType e_source_group_type = 0;
+
+       if (!e_source_group_type) {
+               static GTypeInfo info = {
+                        sizeof (ESourceGroupClass),
+                        (GBaseInitFunc) NULL,
+                        (GBaseFinalizeFunc) NULL,
+                        (GClassInitFunc) class_init,
+                        NULL, NULL,
+                        sizeof (ESourceGroup),
+                        0,
+                        (GInstanceInitFunc) init
+                };
+               e_source_group_type = g_type_register_static (G_TYPE_OBJECT, "ESourceGroup", &info, 0);
+       }
+
+       return e_source_group_type;
+}
 
 /* Public methods.  */
 
@@ -600,6 +617,3 @@ e_source_group_to_xml (ESourceGroup *group)
 
        return returned_buffer;
 }
-
-
-E_MAKE_TYPE (e_source_group, "ESourceGroup", ESourceGroup, class_init, init, PARENT_TYPE)

diff --git a/libedataserver/e-source-list.c b/libedataserver/e-source-list.c
index abe2c63..c05061f 100644 (file)
--- a/libedataserver/e-source-list.c
+++ b/libedataserver/e-source-list.c
@@ -20,17 +20,14 @@
  * Author: Ettore Perazzoli <ettore@ximian.com>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-
-#include "e-source-list.h"
-
-#include "e-util-marshal.h"
+#endif
 
 #include <string.h>
-#include <gal/util/e-util.h>
-
+#include "e-data-server-marshal.h"
+#include "e-source-list.h"
 
-#define PARENT_TYPE G_TYPE_OBJECT
 static GObjectClass *parent_class = NULL;
 
 struct _ESourceListPrivate {
@@ -297,7 +294,7 @@ class_init (ESourceListClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceListClass, changed),
                              NULL, NULL,
-                             e_util_marshal_VOID__VOID,
+                             e_data_server_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 
        signals[GROUP_REMOVED] = 
@@ -306,7 +303,7 @@ class_init (ESourceListClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceListClass, group_removed),
                              NULL, NULL,
-                             e_util_marshal_VOID__OBJECT,
+                             e_data_server_marshal_VOID__OBJECT,
                              G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
 
@@ -316,7 +313,7 @@ class_init (ESourceListClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceListClass, group_added),
                              NULL, NULL,
-                             e_util_marshal_VOID__OBJECT,
+                             e_data_server_marshal_VOID__OBJECT,
                              G_TYPE_NONE, 1,
                              G_TYPE_POINTER);
 }
@@ -331,6 +328,27 @@ init (ESourceList *source_list)
        source_list->priv = priv;
 }
 
+GType
+e_source_list_get_type (void)
+{
+       static GType e_source_list_type = 0;
+
+       if (!e_source_list_type) {
+               static GTypeInfo info = {
+                        sizeof (ESourceListClass),
+                        (GBaseInitFunc) NULL,
+                        (GBaseFinalizeFunc) NULL,
+                        (GClassInitFunc) class_init,
+                        NULL, NULL,
+                        sizeof (ESourceList),
+                        0,
+                        (GInstanceInitFunc) init
+                };
+               e_source_list_type = g_type_register_static (G_TYPE_OBJECT, "ESourceList", &info, 0);
+       }
+
+       return e_source_list_type;
+}
 
 /* Public methods.  */
 
@@ -525,6 +543,3 @@ e_source_list_sync (ESourceList *list,
 
        return retval;
 }
-
-
-E_MAKE_TYPE (e_source_list, "ESourceList", ESourceList, class_init, init, PARENT_TYPE)

diff --git a/libedataserver/e-source.c b/libedataserver/e-source.c
index 593b770..c27ff27 100644 (file)
--- a/libedataserver/e-source.c
+++ b/libedataserver/e-source.c
@@ -20,18 +20,15 @@
  * Author: Ettore Perazzoli <ettore@ximian.com>
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-
-#include "e-source.h"
-
-#include "e-util-marshal.h"
-#include "e-uid.h"
+#endif
 
 #include <string.h>
-#include <gal/util/e-util.h>
-
+#include "e-data-server-marshal.h"
+#include "e-uid.h"
+#include "e-source.h"
 
-#define PARENT_TYPE G_TYPE_OBJECT
 static GObjectClass *parent_class = NULL;
 
 #define ES_CLASS(obj)  E_SOURCE_CLASS (G_OBJECT_GET_CLASS (obj))
@@ -123,7 +120,7 @@ class_init (ESourceClass *class)
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (ESourceClass, changed),
                              NULL, NULL,
-                             e_util_marshal_VOID__VOID,
+                             e_data_server_marshal_VOID__VOID,
                              G_TYPE_NONE, 0);
 }
 
@@ -136,6 +133,27 @@ init (ESource *source)
        source->priv = priv;
 }
 
+GType
+e_source_get_type (void)
+{
+       static GType e_source_type = 0;
+
+       if (!e_source_type) {
+               static GTypeInfo info = {
+                        sizeof (ESourceClass),
+                        (GBaseInitFunc) NULL,
+                        (GBaseFinalizeFunc) NULL,
+                        (GClassInitFunc) class_init,
+                        NULL, NULL,
+                        sizeof (ESource),
+                        0,
+                        (GInstanceInitFunc) init
+                };
+               e_source_type = g_type_register_static (G_TYPE_OBJECT, "ESource", &info, 0);
+       }
+
+       return e_source_type;
+}
 
 /* Public methods.  */
 
@@ -465,6 +483,3 @@ e_source_dump_to_xml_node (ESource *source,
                g_free (color_string);
        }
 }
-
-
-E_MAKE_TYPE (e_source, "ESource", ESource, class_init, init, PARENT_TYPE)

diff --git a/libedataserver/test-source-list.c b/libedataserver/test-source-list.c
index b869df0..dfa6ceb 100644 (file)
--- a/libedataserver/test-source-list.c
+++ b/libedataserver/test-source-list.c
@@ -24,12 +24,11 @@
 #include <config.h>
 #endif
 
+#include <glib.h>
+#include <libgnome/gnome-program.h>
+#include <libgnome/gnome-init.h>
 #include "e-source-list.h"
 
-#include <libgnomeui/gnome-ui-init.h>
-#include <glib/gmain.h>
-
-
 /* Globals. */
 
 static GMainLoop *main_loop = NULL;
@@ -504,7 +503,7 @@ main (int argc,
        GnomeProgram *program;
 
        program = gnome_program_init ("test-source-list", "0.0",
-                                     LIBGNOMEUI_MODULE, argc, argv,
+                                     LIBGNOME_MODULE, argc, argv,
                                      GNOME_PARAM_POPT_TABLE, options,
                                      NULL);