+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.
@EVO_MARSHAL_RULE@
lib_LTLIBRARIES = libedataserver.la
+noinst_PROGRAMS = test-source-list
libedataserver_la_SOURCES = \
$(MARSHAL_GENERATED) \
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 \
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
* 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 {
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] =
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] =
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);
}
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. */
return returned_buffer;
}
-
-
-E_MAKE_TYPE (e_source_group, "ESourceGroup", ESourceGroup, class_init, init, PARENT_TYPE)
* 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 {
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] =
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);
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);
}
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. */
return retval;
}
-
-
-E_MAKE_TYPE (e_source_list, "ESourceList", ESourceList, class_init, init, PARENT_TYPE)
* 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))
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);
}
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. */
g_free (color_string);
}
}
-
-
-E_MAKE_TYPE (e_source, "ESource", ESource, class_init, init, PARENT_TYPE)
#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;
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);