/po/boldquot.sed
/po/en@boldquot.header
/po/en@quot.header
-/po/evolution-data-server-3.2.pot
+/po/evolution-data-server-3.4.pot
/po/insert-header.sin
/po/quot.sed
/po/remove-potcdate.sin
CALENDAR_DIR = calendar
endif
-SUBDIRS = libedataserver libebackend camel addressbook $(CALENDAR_DIR) libedataserverui tests docs art po
-DIST_SUBDIRS = libedataserver libebackend camel addressbook calendar libedataserverui tests docs art po vala
+SUBDIRS = libedataserver libebackend camel addressbook $(CALENDAR_DIR) libedataserverui services tests docs art po
+DIST_SUBDIRS = libedataserver libebackend camel addressbook calendar libedataserverui services tests docs art po vala
if HAVE_INTROSPECTION
if HAVE_VALA
libedata_book_1_2_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"libedata-book\" \
- -DLIBEXECDIR=\"$(libexecdir)\" \
+ -DBACKENDDIR=\"$(ebook_backenddir)\" \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook \
-I$(top_srcdir)/addressbook/libegdbus \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
libedata_book_1_2_la_SOURCES = \
+ $(ENUM_GENERATED) \
e-book-backend-factory.c \
e-book-backend-sexp.c \
e-book-backend-summary.c \
e-book-backend-sqlitedb.c \
e-book-backend-sync.c \
e-book-backend.c \
- e-data-book-view.c \
e-data-book.c \
- ximian-vcard.h \
- $(ENUM_GENERATED)
+ e-data-book-factory.c \
+ e-data-book-view.c \
+ ximian-vcard.h
libedata_book_1_2_la_LIBADD = \
- $(top_builddir)/addressbook/libegdbus/libegdbus-book.la \
$(top_builddir)/addressbook/libebook/libebook-1.2.la \
+ $(top_builddir)/addressbook/libegdbus/libegdbus-book.la \
$(top_builddir)/libedataserver/libedataserver-1.2.la \
$(top_builddir)/libebackend/libebackend-1.2.la \
$(DB_LIBS) \
libedata-book-1.2.la \
$(libedata_book_1_2_la_LIBADD)
-factory_PROGRAMS = e-addressbook-factory
-
-e_addressbook_factory_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DG_LOG_DOMAIN=\"libedata-book\" \
- -DE_PRGNAME=\"e-addressbook-factory\" \
- -DBACKENDDIR=\"$(ebook_backenddir)\" \
- -I$(top_srcdir) \
- -I$(top_srcdir)/addressbook \
- -I$(top_srcdir)/addressbook/libegdbus \
- -I$(top_builddir) \
- -I$(top_builddir)/addressbook \
- $(EVOLUTION_ADDRESSBOOK_CFLAGS) \
- $(GOA_CFLAGS) \
- $(FACTORY_GTK_CFLAGS)
-
-e_addressbook_factory_SOURCES = \
- e-data-book-factory.c \
- e-data-book-factory.h \
- e-data-book-migrate-basedir.c
-
-e_addressbook_factory_LDADD = \
- libedata-book-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la \
- $(top_builddir)/libebackend/libebackend-1.2.la \
- $(EVOLUTION_ADDRESSBOOK_LIBS) \
- $(GOA_LIBS) \
- $(FACTORY_GTK_LIBS)
-
%-$(API_VERSION).pc: %.pc
cp $< $@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libedata-book-$(API_VERSION).pc
-service_in_files = org.gnome.evolution.dataserver.AddressBook.service.in
-servicedir = $(datadir)/dbus-1/services
-service_DATA = $(service_in_files:.service.in=.service)
-@EVO_SUBST_SERVICE_RULE@
-
BUILT_SOURCES = $(ENUM_GENERATED)
-CLEANFILES = $(BUILT_SOURCES) $(service_DATA)
+CLEANFILES = $(BUILT_SOURCES)
DISTCLEANFILES = $(pkgconfig_DATA)
EXTRA_DIST = \
e-data-book-factory.xml \
e-data-book-view.xml \
e-data-book.xml \
- $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \
- $(service_in_files)
+ $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
-include $(top_srcdir)/git.mk
#include <unistd.h>
#include <glib/gi18n.h>
-#ifdef ENABLE_MAINTAINER_MODE
-#include <gtk/gtk.h>
-#endif
-
-#ifdef G_OS_UNIX
-#if GLIB_CHECK_VERSION(2,29,5)
-#include <glib-unix.h>
-#endif
-#endif
-
#ifdef HAVE_GOA
#define GOA_API_IS_SUBJECT_TO_CHANGE
#include <goa/goa.h>
#define GOA_KEY "goa-account-id"
#endif
+#include "e-book-backend.h"
#include "e-book-backend-factory.h"
-#include "e-data-book-factory.h"
#include "e-data-book.h"
-#include "e-book-backend.h"
+#include "e-data-book-factory.h"
#include "e-gdbus-book-factory.h"
-#ifdef G_OS_WIN32
-#include <windows.h>
-#include <conio.h>
-#ifndef PROCESS_DEP_ENABLE
-#define PROCESS_DEP_ENABLE 0x00000001
-#endif
-#ifndef PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION
-#define PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION 0x00000002
-#endif
-#endif
-
#define d(x)
#define E_DATA_BOOK_FACTORY_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_DATA_BOOK_FACTORY, EDataBookFactoryPrivate))
-/* Keep running after the last client is closed. */
-static gboolean opt_keep_running = FALSE;
-
-/* Convenience macro to test and set a GError/return on failure */
-#define g_set_error_val_if_fail(test, returnval, error, domain, code) \
- G_STMT_START { \
- if G_LIKELY (test) { \
- } else { \
- g_set_error_literal (error, domain, code, #test); \
- g_warning (#test " failed"); \
- return (returnval); \
- } \
- } G_STMT_END
-
G_DEFINE_TYPE (EDataBookFactory, e_data_book_factory, E_TYPE_DATA_FACTORY);
struct _EDataBookFactoryPrivate {
/* Takes ownership of the GoaObject. */
g_hash_table_insert (
- factory->priv->goa_accounts,
- g_strdup (goa_account_id), goa_object);
+ factory->priv->goa_accounts,
+ g_strdup (goa_account_id), goa_object);
}
g_list_free (list);
}
static void
-e_data_book_factory_accounts_changed_cb (GoaClient *client, GDBusObject *object, EDataBookFactory *factory)
+e_data_book_factory_accounts_changed_cb (GoaClient *client,
+ GDBusObject *object,
+ EDataBookFactory *factory)
{
e_data_book_factory_update_goa_accounts (factory);
}
#endif
-
-
static void
e_data_book_factory_init (EDataBookFactory *factory)
{
if (factory->priv->goa_client != NULL) {
e_data_book_factory_update_goa_accounts (factory);
- g_signal_connect (factory->priv->goa_client,
- "account_added", e_data_book_factory_accounts_changed_cb, factory);
- g_signal_connect (factory->priv->goa_client,
- "account_removed", e_data_book_factory_accounts_changed_cb, factory);
- g_signal_connect (factory->priv->goa_client,
- "account_changed", e_data_book_factory_accounts_changed_cb, factory);
+ g_signal_connect (
+ factory->priv->goa_client, "account_added",
+ e_data_book_factory_accounts_changed_cb, factory);
+ g_signal_connect (
+ factory->priv->goa_client, "account_removed",
+ e_data_book_factory_accounts_changed_cb, factory);
+ g_signal_connect (
+ factory->priv->goa_client, "account_changed",
+ e_data_book_factory_accounts_changed_cb, factory);
} else if (error != NULL) {
g_warning ("%s", error->message);
g_error_free (error);
#endif
}
-static GOptionEntry entries[] = {
-
- /* FIXME Have the description translated for 3.2, but this
- * option is to aid in testing and development so it
- * doesn't really matter. */
- { "keep-running", 'r', 0, G_OPTION_ARG_NONE, &opt_keep_running,
- "Keep running after the last client is closed", NULL },
- { NULL }
-};
-
-gint
-main (gint argc,
- gchar **argv)
-{
- GOptionContext *context;
- EDBusServer *server;
- GError *error = NULL;
-
-#ifdef G_OS_WIN32
- /* Reduce risks */
- {
- typedef BOOL (WINAPI *t_SetDllDirectoryA) (LPCSTR lpPathName);
- t_SetDllDirectoryA p_SetDllDirectoryA;
-
- p_SetDllDirectoryA = GetProcAddress (GetModuleHandle ("kernel32.dll"), "SetDllDirectoryA");
- if (p_SetDllDirectoryA)
- (*p_SetDllDirectoryA) ("");
- }
-#ifndef _WIN64
- {
- typedef BOOL (WINAPI *t_SetProcessDEPPolicy) (DWORD dwFlags);
- t_SetProcessDEPPolicy p_SetProcessDEPPolicy;
-
- p_SetProcessDEPPolicy = GetProcAddress (GetModuleHandle ("kernel32.dll"), "SetProcessDEPPolicy");
- if (p_SetProcessDEPPolicy)
- (*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE | PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION);
- }
-#endif
-#endif
-
- g_type_init ();
- g_set_prgname (E_PRGNAME);
- if (!g_thread_supported ()) g_thread_init (NULL);
-
- #ifdef ENABLE_MAINTAINER_MODE
- /* only to load gtk-modules, like bug-buddy's gnomesegvhandler, if possible */
- gtk_init_check (&argc, &argv);
- #endif
-
- context = g_option_context_new (NULL);
- g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
- g_option_context_parse (context, &argc, &argv, &error);
- g_option_context_free (context);
-
- if (error != NULL) {
- g_printerr ("%s\n", error->message);
- exit (EXIT_FAILURE);
- }
-
- /* Migrate user data from ~/.evolution to XDG base directories. */
- e_data_book_migrate_basedir ();
-
- server = g_initable_new (
- E_TYPE_DATA_BOOK_FACTORY, NULL, &error, NULL);
-
- if (error != NULL) {
- g_printerr ("%s\n", error->message);
- exit (EXIT_FAILURE);
- }
-
- g_print ("Server is up and running...\n");
-
- /* This SHOULD keep the server's use
- * count from ever reaching zero. */
- if (opt_keep_running)
- e_dbus_server_hold (server);
-
- e_dbus_server_run (server);
-
- g_object_unref (server);
-
- g_print ("Bye.\n");
-
- return 0;
-}
libedata_cal_1_2_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"libedata-cal\" \
- -DBASE_VERSION=\""$(BASE_VERSION)"\" \
+ -DBACKENDDIR=\"$(ecal_backenddir)\" \
-I$(top_srcdir) \
-I$(top_srcdir)/calendar \
-I$(top_srcdir)/calendar/libegdbus \
e-cal-backend-store.c \
e-cal-backend-file-store.c \
e-data-cal.c \
+ e-data-cal-factory.c \
e-data-cal-view.c
libedata_cal_1_2_la_LIBADD = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libedata-cal-$(API_VERSION).pc
-service_in_files = org.gnome.evolution.dataserver.Calendar.service.in
-servicedir = $(datadir)/dbus-1/services
-service_DATA = $(service_in_files:.service.in=.service)
-@EVO_SUBST_SERVICE_RULE@
-
BUILT_SOURCES = $(ENUM_GENERATED)
-CLEANFILES = $(BUILT_SOURCES) $(service_DATA)
-DISTCLEANFILES = $(pkgconfig_DATA) $(service_DATA)
+CLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES = $(pkgconfig_DATA)
EXTRA_DIST = \
e-data-cal-factory.xml \
e-data-cal-view.xml \
e-data-cal.xml \
- $(service_in_files) \
$(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
-
-factorydir = $(libexecdir)
-factory_PROGRAMS = e-calendar-factory
-
-e_calendar_factory_SOURCES = \
- e-data-cal-factory.c \
- e-data-cal-factory.h \
- e-data-cal-migrate-basedir.c
-
-e_calendar_factory_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DG_LOG_DOMAIN=\"libedata-cal\" \
- -DE_PRGNAME=\"e-calendar-factory\" \
- -DBACKENDDIR=\"$(ecal_backenddir)\" \
- -DLOCALEDIR=\"$(localedir)\" \
- -I$(top_srcdir) \
- -I$(top_srcdir)/calendar \
- -I$(top_srcdir)/calendar/libegdbus \
- -I$(top_builddir) \
- -I$(top_builddir)/calendar \
- $(LIBICAL_CFLAGS) \
- $(EVOLUTION_CALENDAR_CFLAGS) \
- $(FACTORY_GTK_CFLAGS)
-
-e_calendar_factory_LDADD = \
- $(top_builddir)/calendar/libecal/libecal-1.2.la \
- $(top_builddir)/calendar/libegdbus/libegdbus-cal.la \
- libedata-cal-1.2.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la \
- $(top_builddir)/libebackend/libebackend-1.2.la \
- $(FACTORY_GTK_LIBS)
-
-include $(top_srcdir)/git.mk
#include <unistd.h>
#include <glib/gi18n.h>
-#ifdef ENABLE_MAINTAINER_MODE
-#include <gtk/gtk.h>
-#endif
-
-#include <libedataserver/e-url.h>
-#include <libedataserver/e-source-list.h>
-#include <libecal/e-cal-client.h>
#include "e-cal-backend.h"
#include "e-cal-backend-factory.h"
#include "e-data-cal.h"
#include <libical/ical.h>
#endif
-#ifdef G_OS_WIN32
-#include <windows.h>
-#include <conio.h>
-#ifndef PROCESS_DEP_ENABLE
-#define PROCESS_DEP_ENABLE 0x00000001
-#endif
-#ifndef PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION
-#define PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION 0x00000002
-#endif
-#endif
-
#define d(x)
#define E_DATA_CAL_FACTORY_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_DATA_CAL_FACTORY, EDataCalFactoryPrivate))
-/* Keeps running after the last client is closed. */
-static gboolean opt_keep_running = FALSE;
-
-/* Convenience macro to test and set a GError/return on failure */
-#define g_set_error_val_if_fail(test, returnval, error, domain, code) \
- G_STMT_START { \
- if G_LIKELY (test) {} else { \
- g_set_error_literal (error, domain, code, #test); \
- g_warning(#test " failed"); \
- return (returnval); \
- } \
- } G_STMT_END
-
G_DEFINE_TYPE (EDataCalFactory, e_data_cal_factory, E_TYPE_DATA_FACTORY);
struct _EDataCalFactoryPrivate {
(GDestroyNotify) g_free,
(GDestroyNotify) NULL);
}
-
-static GOptionEntry entries[] = {
-
- /* FIXME Have the description translated for 3.2, but this
- * option is to aid in testing and development so it
- * doesn't really matter. */
- { "keep-running", 'r', 0, G_OPTION_ARG_NONE, &opt_keep_running,
- "Keep running after the last client is closed", NULL },
- { NULL }
-};
-
-gint
-main (gint argc,
- gchar **argv)
-{
- GOptionContext *context;
- EDBusServer *server;
- GError *error = NULL;
-
-#ifdef G_OS_WIN32
- /* Reduce risks */
- {
- typedef BOOL (WINAPI *t_SetDllDirectoryA) (LPCSTR lpPathName);
- t_SetDllDirectoryA p_SetDllDirectoryA;
-
- p_SetDllDirectoryA = GetProcAddress (GetModuleHandle ("kernel32.dll"), "SetDllDirectoryA");
- if (p_SetDllDirectoryA)
- (*p_SetDllDirectoryA) ("");
- }
-#ifndef _WIN64
- {
- typedef BOOL (WINAPI *t_SetProcessDEPPolicy) (DWORD dwFlags);
- t_SetProcessDEPPolicy p_SetProcessDEPPolicy;
-
- p_SetProcessDEPPolicy = GetProcAddress (GetModuleHandle ("kernel32.dll"), "SetProcessDEPPolicy");
- if (p_SetProcessDEPPolicy)
- (*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE | PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION);
- }
-#endif
-#endif
-
- setlocale (LC_ALL, "");
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-
- g_type_init ();
- g_set_prgname (E_PRGNAME);
- if (!g_thread_supported ()) g_thread_init (NULL);
-
- #ifdef ENABLE_MAINTAINER_MODE
- /* only to load gtk-modules, like bug-buddy's gnomesegvhandler, if possible */
- gtk_init_check (&argc, &argv);
- #endif
-
- context = g_option_context_new (NULL);
- g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
- g_option_context_parse (context, &argc, &argv, &error);
- g_option_context_free (context);
-
- if (error != NULL) {
- g_printerr ("%s\n", error->message);
- exit (EXIT_FAILURE);
- }
-
-#ifdef HAVE_ICAL_UNKNOWN_TOKEN_HANDLING
- ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN);
-#endif
-
- /* Migrate user data from ~/.evolution to XDG base directories. */
- e_data_cal_migrate_basedir ();
-
- server = g_initable_new (
- E_TYPE_DATA_CAL_FACTORY, NULL, &error, NULL);
-
- if (error != NULL) {
- g_printerr ("%s\n", error->message);
- exit (EXIT_FAILURE);
- }
-
- g_print ("Server is up and running...\n");
-
- /* This SHOULD keep the server's use
- * count from ever reaching zero. */
- if (opt_keep_running)
- e_dbus_server_hold (server);
-
- e_dbus_server_run (server);
-
- g_object_unref (server);
-
- g_print ("Bye.\n");
-
- return 0;
-}
[D-BUS Service]
Name=@CALENDAR_DBUS_SERVICE_NAME@
-Exec=@libexecdir@/e-calendar-factory
+Exec=@libexecdir@/evolution-calendar-factory
dnl *******************
dnl D-BUS service stuff
dnl *******************
-EVO_SUBST_SERVICE_RULE='%.service: %.service.in Makefile ; sed -e "s|\@libexecdir\@|$(libexecdir)|" -e s"|\@ADDRESS_BOOK_DBUS_SERVICE_NAME\@|$(ADDRESS_BOOK_DBUS_SERVICE_NAME)|" -e "s|\@CALENDAR_DBUS_SERVICE_NAME\@|$(CALENDAR_DBUS_SERVICE_NAME)|" $< > $@'
+m4_pattern_allow([AM_V_GEN])
+EVO_SUBST_SERVICE_RULE='%.service: %.service.in Makefile ; $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" -e s"|\@ADDRESS_BOOK_DBUS_SERVICE_NAME\@|$(ADDRESS_BOOK_DBUS_SERVICE_NAME)|" -e "s|\@CALENDAR_DBUS_SERVICE_NAME\@|$(CALENDAR_DBUS_SERVICE_NAME)|" $< > $@'
AC_SUBST(EVO_SUBST_SERVICE_RULE)
dnl ******************************
libedataserver/libedataserver.pc
libedataserverui/Makefile
libedataserverui/libedataserverui.pc
+services/Makefile
+services/evolution-addressbook-factory/Makefile
+services/evolution-calendar-factory/Makefile
tests/Makefile
tests/libebook/Makefile
tests/libebook/client/Makefile
</para>
+<!-- ##### ARG CamelSession:user-cache-dir ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG CamelSession:user-data-dir ##### -->
<para>
@CAMEL_FOLDER_TYPE_TRASH:
@CAMEL_FOLDER_TYPE_JUNK:
@CAMEL_FOLDER_TYPE_SENT:
+@CAMEL_FOLDER_TYPE_CONTACTS:
+@CAMEL_FOLDER_TYPE_EVENTS:
+@CAMEL_FOLDER_TYPE_MEMOS:
+@CAMEL_FOLDER_TYPE_TASKS:
@CAMEL_FOLDER_READONLY:
@CAMEL_FOLDER_CHECK_FOR_NEW:
@CAMEL_FOLDER_FLAGGED:
@CAMEL_STORE_IS_MIGRATING:
@CAMEL_STORE_REAL_JUNK_FOLDER:
@CAMEL_STORE_CAN_EDIT_FOLDERS:
+@CAMEL_STORE_USE_CACHE_DIR:
<!-- ##### ENUM CamelStorePermissionFlags ##### -->
<para>
--- /dev/null
+NULL =
+
+SUBDIRS = \
+ evolution-addressbook-factory \
+ evolution-calendar-factory \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
--- /dev/null
+NULL =
+
+service_in_files = org.gnome.evolution.dataserver.AddressBook.service.in
+servicedir = $(datadir)/dbus-1/services
+service_DATA = $(service_in_files:.service.in=.service)
+@EVO_SUBST_SERVICE_RULE@
+
+CLEANFILES = $(service_DATA)
+EXTRA_DIST = $(service_in_files)
+
+libexec_PROGRAMS = evolution-addressbook-factory
+
+evolution_addressbook_factory_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DG_LOG_DOMAIN=\"evolution-addressbook-factory\" \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook \
+ -I$(top_builddir) \
+ -I$(top_builddir)/addressbook \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+ $(FACTORY_GTK_CFLAGS) \
+ $(GOA_CFLAGS) \
+ $(NULL)
+
+evolution_addressbook_factory_SOURCES = \
+ evolution-addressbook-factory.c \
+ evolution-addressbook-factory-migrate-basedir.c \
+ $(NULL)
+
+evolution_addressbook_factory_LDADD = \
+ $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \
+ $(top_builddir)/libebackend/libebackend-1.2.la \
+ $(top_builddir)/libedataserver/libedataserver-1.2.la \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(FACTORY_GTK_LIBS) \
+ $(GOA_LIBS) \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
/*
- * e-data-book-migrate-basedir.c
+ * evolution-addressbook-factory-migrate-basedir.c
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
#include <glib/gstdio.h>
#include <libedataserver/e-data-server-util.h>
-void e_data_book_migrate_basedir (void);
+/* Forward Declarations */
+void evolution_addressbook_factory_migrate_basedir (void);
static gboolean
-data_book_migrate_rename (const gchar *old_filename,
- const gchar *new_filename)
+migrate_rename (const gchar *old_filename,
+ const gchar *new_filename)
{
gboolean old_filename_is_dir;
gboolean old_filename_exists;
}
static gboolean
-data_book_migrate_rmdir (const gchar *dirname)
+migrate_rmdir (const gchar *dirname)
{
GDir *dir = NULL;
gboolean success = TRUE;
}
static void
-data_book_migrate_process_corrections (GHashTable *corrections)
+migrate_process_corrections (GHashTable *corrections)
{
GHashTableIter iter;
gpointer old_filename;
g_hash_table_iter_init (&iter, corrections);
while (g_hash_table_iter_next (&iter, &old_filename, &new_filename)) {
- data_book_migrate_rename (old_filename, new_filename);
+ migrate_rename (old_filename, new_filename);
g_hash_table_iter_remove (&iter);
}
}
static gboolean
-data_book_migrate_move_contents (const gchar *src_directory,
- const gchar *dst_directory)
+migrate_move_contents (const gchar *src_directory,
+ const gchar *dst_directory)
{
GDir *dir;
GHashTable *corrections;
g_dir_close (dir);
- data_book_migrate_process_corrections (corrections);
+ migrate_process_corrections (corrections);
g_hash_table_destroy (corrections);
/* It's tempting to want to remove the source directory here.
}
static void
-data_book_migrate_fix_groupwise_bug (const gchar *old_base_dir)
+migrate_fix_groupwise_bug (const gchar *old_base_dir)
{
GDir *dir;
GHashTable *corrections;
g_dir_close (dir);
- data_book_migrate_process_corrections (corrections);
+ migrate_process_corrections (corrections);
g_hash_table_destroy (corrections);
exit:
}
static void
-data_book_migrate_to_user_cache_dir (const gchar *old_base_dir)
+migrate_to_user_cache_dir (const gchar *old_base_dir)
{
const gchar *new_cache_dir;
gchar *old_cache_dir;
src_directory = g_build_filename (old_cache_dir, "addressbook", NULL);
dst_directory = g_build_filename (new_cache_dir, "addressbook", NULL);
- data_book_migrate_move_contents (src_directory, dst_directory);
- data_book_migrate_rmdir (src_directory);
+ migrate_move_contents (src_directory, dst_directory);
+ migrate_rmdir (src_directory);
g_free (src_directory);
g_free (dst_directory);
/* Try to remove the old cache directory. Good chance this will
* fail on the first try, since Evolution puts stuff here too. */
- data_book_migrate_rmdir (old_cache_dir);
+ migrate_rmdir (old_cache_dir);
g_free (old_cache_dir);
}
static void
-data_book_migrate_to_user_data_dir (const gchar *old_base_dir)
+migrate_to_user_data_dir (const gchar *old_base_dir)
{
const gchar *new_data_dir;
gchar *src_directory;
src_directory = g_build_filename (old_base_dir, "addressbook", "local", NULL);
dst_directory = g_build_filename (new_data_dir, "addressbook", NULL);
- data_book_migrate_move_contents (src_directory, dst_directory);
- data_book_migrate_rmdir (src_directory);
+ migrate_move_contents (src_directory, dst_directory);
+ migrate_rmdir (src_directory);
g_free (src_directory);
g_free (dst_directory);
}
void
-e_data_book_migrate_basedir (void)
+evolution_addressbook_factory_migrate_basedir (void)
{
const gchar *home_dir;
gchar *old_base_dir;
if (!g_file_test (old_base_dir, G_FILE_TEST_IS_DIR))
goto exit;
- data_book_migrate_fix_groupwise_bug (old_base_dir);
+ migrate_fix_groupwise_bug (old_base_dir);
- data_book_migrate_to_user_cache_dir (old_base_dir);
- data_book_migrate_to_user_data_dir (old_base_dir);
+ migrate_to_user_cache_dir (old_base_dir);
+ migrate_to_user_data_dir (old_base_dir);
/* Try to remove the old base directory. Good chance this will
* fail on the first try, since Evolution puts stuff here too. */
- data_book_migrate_rmdir (old_base_dir);
+ migrate_rmdir (old_base_dir);
exit:
g_free (old_base_dir);
--- /dev/null
+/*
+ * evolution-addressbook-factory.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include <config.h>
+#include <locale.h>
+#include <glib/gi18n.h>
+
+#ifdef ENABLE_MAINTAINER_MODE
+#include <gtk/gtk.h>
+#endif
+
+#ifdef G_OS_UNIX
+#if GLIB_CHECK_VERSION(2,29,5)
+#include <glib-unix.h>
+#endif
+#endif
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#include <conio.h>
+#ifndef PROCESS_DEP_ENABLE
+#define PROCESS_DEP_ENABLE 0x00000001
+#endif
+#ifndef PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION
+#define PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION 0x00000002
+#endif
+#endif
+
+#include <libedata-book/e-data-book-factory.h>
+
+/* Keep running after the last client is closed. */
+static gboolean opt_keep_running = FALSE;
+
+static GOptionEntry entries[] = {
+
+ { "keep-running", 'r', 0, G_OPTION_ARG_NONE, &opt_keep_running,
+ N_("Keep running after the last client is closed"), NULL },
+ { NULL }
+};
+
+/* Forward Declarations */
+void evolution_addressbook_factory_migrate_basedir (void);
+
+gint
+main (gint argc,
+ gchar **argv)
+{
+ GOptionContext *context;
+ EDBusServer *server;
+ GError *error = NULL;
+
+#ifdef G_OS_WIN32
+ /* Reduce risks */
+ {
+ typedef BOOL (WINAPI *t_SetDllDirectoryA) (LPCSTR lpPathName);
+ t_SetDllDirectoryA p_SetDllDirectoryA;
+
+ p_SetDllDirectoryA = GetProcAddress (
+ GetModuleHandle ("kernel32.dll"),
+ "SetDllDirectoryA");
+
+ if (p_SetDllDirectoryA != NULL)
+ p_SetDllDirectoryA ("");
+ }
+#ifndef _WIN64
+ {
+ typedef BOOL (WINAPI *t_SetProcessDEPPolicy) (DWORD dwFlags);
+ t_SetProcessDEPPolicy p_SetProcessDEPPolicy;
+
+ p_SetProcessDEPPolicy = GetProcAddress (
+ GetModuleHandle ("kernel32.dll"),
+ "SetProcessDEPPolicy");
+
+ if (p_SetProcessDEPPolicy != NULL)
+ p_SetProcessDEPPolicy (
+ PROCESS_DEP_ENABLE |
+ PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION);
+ }
+#endif
+#endif
+
+ setlocale (LC_ALL, "");
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
+#ifdef ENABLE_MAINTAINER_MODE
+ /* This is only to load gtk-modules, like
+ * bug-buddy's gnomesegvhandler, if possible */
+ gtk_init_check (&argc, &argv);
+#else
+ g_type_init ();
+#endif
+
+ context = g_option_context_new (NULL);
+ g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+ g_option_context_parse (context, &argc, &argv, &error);
+ g_option_context_free (context);
+
+ if (error != NULL) {
+ g_printerr ("%s\n", error->message);
+ exit (EXIT_FAILURE);
+ }
+
+ /* Migrate user data from ~/.evolution to XDG base directories. */
+ evolution_addressbook_factory_migrate_basedir ();
+
+ server = g_initable_new (
+ E_TYPE_DATA_BOOK_FACTORY, NULL, &error, NULL);
+
+ if (error != NULL) {
+ g_printerr ("%s\n", error->message);
+ exit (EXIT_FAILURE);
+ }
+
+ g_print ("Server is up and running...\n");
+
+ /* This SHOULD keep the server's use
+ * count from ever reaching zero. */
+ if (opt_keep_running)
+ e_dbus_server_hold (server);
+
+ e_dbus_server_run (server);
+
+ g_object_unref (server);
+
+ g_print ("Bye.\n");
+
+ return 0;
+}
[D-BUS Service]
Name=@ADDRESS_BOOK_DBUS_SERVICE_NAME@
-Exec=@libexecdir@/e-addressbook-factory
+Exec=@libexecdir@/evolution-addressbook-factory
--- /dev/null
+NULL =
+
+service_in_files = org.gnome.evolution.dataserver.Calendar.service.in
+servicedir = $(datadir)/dbus-1/services
+service_DATA = $(service_in_files:.service.in=.service)
+@EVO_SUBST_SERVICE_RULE@
+
+CLEANFILES = $(service_DATA)
+EXTRA_DIST = $(service_in_files)
+
+libexec_PROGRAMS = evolution-calendar-factory
+
+evolution_calendar_factory_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DG_LOG_DOMAIN=\"evolution-calendar-factory\" \
+ -DLOCALEDIR=\"$(localedir)\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/calendar \
+ -I$(top_builddir) \
+ -I$(top_builddir)/calendar \
+ $(EVOLUTION_CALENDAR_CFLAGS) \
+ $(FACTORY_GTK_CFLAGS) \
+ $(NULL)
+
+evolution_calendar_factory_SOURCES = \
+ evolution-calendar-factory.c \
+ evolution-calendar-factory-migrate-basedir.c \
+ $(NULL)
+
+evolution_calendar_factory_LDADD = \
+ $(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
+ $(top_builddir)/libebackend/libebackend-1.2.la \
+ $(top_builddir)/libedataserver/libedataserver-1.2.la \
+ $(EVOLUTION_CALENDAR_LIBS) \
+ $(FACTORY_GTK_LIBS) \
+ $(NULL)
+
+-include $(top_srcdir)/git.mk
/*
- * e-data-cal-migrate-basedir.c
+ * evolution-calendar-factory-migrate-basedir.c
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
#include <glib/gstdio.h>
#include <libedataserver/e-data-server-util.h>
-void e_data_cal_migrate_basedir (void);
+/* Forward Declarations */
+void evolution_calendar_factory_migrate_basedir (void);
static gboolean
-data_cal_migrate_rename (const gchar *old_filename,
- const gchar *new_filename)
+migrate_rename (const gchar *old_filename,
+ const gchar *new_filename)
{
gboolean old_filename_is_dir;
gboolean old_filename_exists;
}
static gboolean
-data_cal_migrate_rmdir (const gchar *dirname)
+migrate_rmdir (const gchar *dirname)
{
GDir *dir = NULL;
gboolean success = TRUE;
}
static void
-data_cal_migrate_process_corrections (GHashTable *corrections)
+migrate_process_corrections (GHashTable *corrections)
{
GHashTableIter iter;
gpointer old_filename;
g_hash_table_iter_init (&iter, corrections);
while (g_hash_table_iter_next (&iter, &old_filename, &new_filename)) {
- data_cal_migrate_rename (old_filename, new_filename);
+ migrate_rename (old_filename, new_filename);
g_hash_table_iter_remove (&iter);
}
}
static gboolean
-data_cal_migrate_move_contents (const gchar *src_directory,
- const gchar *dst_directory)
+migrate_move_contents (const gchar *src_directory,
+ const gchar *dst_directory)
{
GDir *dir;
GHashTable *corrections;
g_dir_close (dir);
- data_cal_migrate_process_corrections (corrections);
+ migrate_process_corrections (corrections);
g_hash_table_destroy (corrections);
/* It's tempting to want to remove the source directory here.
}
static void
-data_cal_migrate_fix_exchange_bug (const gchar *old_base_dir)
+migrate_fix_exchange_bug (const gchar *old_base_dir)
{
GDir *dir;
GHashTable *corrections;
g_dir_close (dir);
- data_cal_migrate_process_corrections (corrections);
+ migrate_process_corrections (corrections);
g_hash_table_destroy (corrections);
exit:
}
static void
-data_cal_migrate_fix_memos_cache_bug (const gchar *old_base_dir)
+migrate_fix_memos_cache_bug (const gchar *old_base_dir)
{
gchar *src_directory;
gchar *dst_directory;
src_directory = g_build_filename (old_base_dir, "cache", "journal", NULL);
dst_directory = g_build_filename (old_base_dir, "cache", "memos", NULL);
- data_cal_migrate_move_contents (src_directory, dst_directory);
- data_cal_migrate_rmdir (src_directory);
+ migrate_move_contents (src_directory, dst_directory);
+ migrate_rmdir (src_directory);
g_free (src_directory);
g_free (dst_directory);
}
static void
-data_cal_migrate_to_user_cache_dir (const gchar *old_base_dir)
+migrate_to_user_cache_dir (const gchar *old_base_dir)
{
const gchar *new_cache_dir;
gchar *old_cache_dir;
src_directory = g_build_filename (old_cache_dir, "calendar", NULL);
dst_directory = g_build_filename (new_cache_dir, "calendar", NULL);
- data_cal_migrate_move_contents (src_directory, dst_directory);
- data_cal_migrate_rmdir (src_directory);
+ migrate_move_contents (src_directory, dst_directory);
+ migrate_rmdir (src_directory);
g_free (src_directory);
g_free (dst_directory);
src_directory = g_build_filename (old_cache_dir, "memos", NULL);
dst_directory = g_build_filename (new_cache_dir, "memos", NULL);
- data_cal_migrate_move_contents (src_directory, dst_directory);
- data_cal_migrate_rmdir (src_directory);
+ migrate_move_contents (src_directory, dst_directory);
+ migrate_rmdir (src_directory);
g_free (src_directory);
g_free (dst_directory);
src_directory = g_build_filename (old_cache_dir, "tasks", NULL);
dst_directory = g_build_filename (new_cache_dir, "tasks", NULL);
- data_cal_migrate_move_contents (src_directory, dst_directory);
- data_cal_migrate_rmdir (src_directory);
+ migrate_move_contents (src_directory, dst_directory);
+ migrate_rmdir (src_directory);
g_free (src_directory);
g_free (dst_directory);
/* Try to remove the old cache directory. Good chance this will
* fail on the first try, since Evolution puts stuff here too. */
- data_cal_migrate_rmdir (old_cache_dir);
+ migrate_rmdir (old_cache_dir);
g_free (old_cache_dir);
}
static void
-data_cal_migrate_to_user_data_dir (const gchar *old_base_dir)
+migrate_to_user_data_dir (const gchar *old_base_dir)
{
const gchar *new_data_dir;
gchar *src_directory;
src_directory = g_build_filename (old_base_dir, "calendar", "local", NULL);
dst_directory = g_build_filename (new_data_dir, "calendar", NULL);
- data_cal_migrate_move_contents (src_directory, dst_directory);
- data_cal_migrate_rmdir (src_directory);
+ migrate_move_contents (src_directory, dst_directory);
+ migrate_rmdir (src_directory);
g_free (src_directory);
g_free (dst_directory);
src_directory = g_build_filename (old_base_dir, "memos", "local", NULL);
dst_directory = g_build_filename (new_data_dir, "memos", NULL);
- data_cal_migrate_move_contents (src_directory, dst_directory);
- data_cal_migrate_rmdir (src_directory);
+ migrate_move_contents (src_directory, dst_directory);
+ migrate_rmdir (src_directory);
g_free (src_directory);
g_free (dst_directory);
src_directory = g_build_filename (old_base_dir, "tasks", "local", NULL);
dst_directory = g_build_filename (new_data_dir, "tasks", NULL);
- data_cal_migrate_move_contents (src_directory, dst_directory);
- data_cal_migrate_rmdir (src_directory);
+ migrate_move_contents (src_directory, dst_directory);
+ migrate_rmdir (src_directory);
g_free (src_directory);
g_free (dst_directory);
src_directory = g_build_filename (old_base_dir, "exchange", NULL);
dst_directory = g_build_filename (new_data_dir, "exchange", NULL);
- data_cal_migrate_move_contents (src_directory, dst_directory);
- data_cal_migrate_rmdir (src_directory);
+ migrate_move_contents (src_directory, dst_directory);
+ migrate_rmdir (src_directory);
g_free (src_directory);
g_free (dst_directory);
}
void
-e_data_cal_migrate_basedir (void)
+evolution_calendar_factory_migrate_basedir (void)
{
const gchar *home_dir;
gchar *old_base_dir;
if (!g_file_test (old_base_dir, G_FILE_TEST_IS_DIR))
goto exit;
- data_cal_migrate_fix_exchange_bug (old_base_dir);
- data_cal_migrate_fix_memos_cache_bug (old_base_dir);
+ migrate_fix_exchange_bug (old_base_dir);
+ migrate_fix_memos_cache_bug (old_base_dir);
- data_cal_migrate_to_user_cache_dir (old_base_dir);
- data_cal_migrate_to_user_data_dir (old_base_dir);
+ migrate_to_user_cache_dir (old_base_dir);
+ migrate_to_user_data_dir (old_base_dir);
/* Try to remove the old base directory. Good chance this will
* fail on the first try, since Evolution puts stuff here too. */
- data_cal_migrate_rmdir (old_base_dir);
+ migrate_rmdir (old_base_dir);
exit:
g_free (old_base_dir);
--- /dev/null
+/*
+ * evolution-calendar-factory.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+#include <config.h>
+#include <locale.h>
+#include <glib/gi18n.h>
+
+#ifdef ENABLE_MAINTAINER_MODE
+#include <gtk/gtk.h>
+#endif
+
+#ifdef HAVE_ICAL_UNKNOWN_TOKEN_HANDLING
+#include <libical/ical.h>
+#endif
+
+#ifdef G_OS_WIN32
+#include <windows.h>
+#include <conio.h>
+#ifndef PROCESS_DEP_ENABLE
+#define PROCESS_DEP_ENABLE 0x00000001
+#endif
+#ifndef PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION
+#define PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION 0x00000002
+#endif
+#endif
+
+#include <libedata-cal/e-data-cal-factory.h>
+
+/* Keeps running after the last client is closed. */
+static gboolean opt_keep_running = FALSE;
+
+static GOptionEntry entries[] = {
+
+ { "keep-running", 'r', 0, G_OPTION_ARG_NONE, &opt_keep_running,
+ N_("Keep running after the last client is closed"), NULL },
+ { NULL }
+};
+
+/* Forward Declarations */
+void evolution_calendar_factory_migrate_basedir (void);
+
+gint
+main (gint argc,
+ gchar **argv)
+{
+ GOptionContext *context;
+ EDBusServer *server;
+ GError *error = NULL;
+
+#ifdef G_OS_WIN32
+ /* Reduce risks */
+ {
+ typedef BOOL (WINAPI *t_SetDllDirectoryA) (LPCSTR lpPathName);
+ t_SetDllDirectoryA p_SetDllDirectoryA;
+
+ p_SetDllDirectoryA = GetProcAddress (
+ GetModuleHandle ("kernel32.dll"),
+ "SetDllDirectoryA");
+
+ if (p_SetDllDirectoryA != NULL)
+ p_SetDllDirectoryA ("");
+ }
+#ifndef _WIN64
+ {
+ typedef BOOL (WINAPI *t_SetProcessDEPPolicy) (DWORD dwFlags);
+ t_SetProcessDEPPolicy p_SetProcessDEPPolicy;
+
+ p_SetProcessDEPPolicy = GetProcAddress (
+ GetModuleHandle ("kernel32.dll"),
+ "SetProcessDEPPolicy");
+
+ if (p_SetProcessDEPPolicy != NULL)
+ p_SetProcessDEPPolicy (
+ PROCESS_DEP_ENABLE |
+ PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION);
+ }
+#endif
+#endif
+
+ setlocale (LC_ALL, "");
+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+
+#ifdef ENABLE_MAINTAINER_MODE
+ /* This is only to load gtk-modules, like
+ * bug-buddy's gnomesegvhandler, if possible. */
+ gtk_init_check (&argc, &argv);
+#else
+ g_type_init ();
+#endif
+
+ context = g_option_context_new (NULL);
+ g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+ g_option_context_parse (context, &argc, &argv, &error);
+ g_option_context_free (context);
+
+ if (error != NULL) {
+ g_printerr ("%s\n", error->message);
+ exit (EXIT_FAILURE);
+ }
+
+#ifdef HAVE_ICAL_UNKNOWN_TOKEN_HANDLING
+ ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN);
+#endif
+
+ /* Migrate user data from ~/.evolution to XDG base directories. */
+ evolution_calendar_factory_migrate_basedir ();
+
+ server = g_initable_new (
+ E_TYPE_DATA_CAL_FACTORY, NULL, &error, NULL);
+
+ if (error != NULL) {
+ g_printerr ("%s\n", error->message);
+ exit (EXIT_FAILURE);
+ }
+
+ g_print ("Server is up and running...\n");
+
+ /* This SHOULD keep the server's use
+ * count from ever reaching zero. */
+ if (opt_keep_running)
+ e_dbus_server_hold (server);
+
+ e_dbus_server_run (server);
+
+ g_object_unref (server);
+
+ g_print ("Bye.\n");
+
+ return 0;
+}
--- /dev/null
+[D-BUS Service]
+Name=@CALENDAR_DBUS_SERVICE_NAME@
+Exec=@libexecdir@/evolution-calendar-factory
projects / platform / upstream / evolution-data-server.git / commitdiff