Commit e4c07086 authored by Milan Crha's avatar Milan Crha

Bug 788370 - Rename address book WebDAV backend to CardDAV

parent 61fe6be6
...@@ -399,9 +399,9 @@ src/modules/backup-restore/evolution-backup-tool.c ...@@ -399,9 +399,9 @@ src/modules/backup-restore/evolution-backup-tool.c
src/modules/backup-restore/org-gnome-backup-restore.error.xml src/modules/backup-restore/org-gnome-backup-restore.error.xml
src/modules/bogofilter/evolution-bogofilter.c src/modules/bogofilter/evolution-bogofilter.c
src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in
src/modules/book-config-carddav/evolution-book-config-carddav.c
src/modules/book-config-google/evolution-book-config-google.c src/modules/book-config-google/evolution-book-config-google.c
src/modules/book-config-ldap/evolution-book-config-ldap.c src/modules/book-config-ldap/evolution-book-config-ldap.c
src/modules/book-config-webdav/evolution-book-config-webdav.c
src/modules/cal-config-caldav/evolution-cal-config-caldav.c src/modules/cal-config-caldav/evolution-cal-config-caldav.c
src/modules/cal-config-contacts/evolution-cal-config-contacts.c src/modules/cal-config-contacts/evolution-cal-config-contacts.c
src/modules/cal-config-google/e-cal-config-google.c src/modules/cal-config-google/e-cal-config-google.c
......
...@@ -93,9 +93,9 @@ add_subdirectory(mail) ...@@ -93,9 +93,9 @@ add_subdirectory(mail)
add_subdirectory(accounts-window) add_subdirectory(accounts-window)
add_subdirectory(alarm-notify) add_subdirectory(alarm-notify)
add_subdirectory(backup-restore) add_subdirectory(backup-restore)
add_subdirectory(book-config-carddav)
add_subdirectory(book-config-google) add_subdirectory(book-config-google)
add_subdirectory(book-config-local) add_subdirectory(book-config-local)
add_subdirectory(book-config-webdav)
add_subdirectory(cal-config-caldav) add_subdirectory(cal-config-caldav)
add_subdirectory(cal-config-contacts) add_subdirectory(cal-config-contacts)
add_subdirectory(cal-config-google) add_subdirectory(cal-config-google)
......
set(extra_deps) set(extra_deps)
set(sources set(sources
evolution-book-config-webdav.c evolution-book-config-carddav.c
) )
set(extra_defines) set(extra_defines)
set(extra_cflags) set(extra_cflags)
set(extra_incdirs) set(extra_incdirs)
set(extra_ldflags) set(extra_ldflags)
add_evolution_module(module-book-config-webdav add_evolution_module(module-book-config-carddav
sources sources
extra_deps extra_deps
extra_defines extra_defines
......
/* /*
* evolution-book-config-webdav.c * evolution-book-config-carddav.c
* *
* This program is free software; you can redistribute it and/or modify it * 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 * under the terms of the GNU Lesser General Public License as published by
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#include <e-util/e-util.h> #include <e-util/e-util.h>
typedef ESourceConfigBackend EBookConfigWebdav; typedef ESourceConfigBackend EBookConfigCardDAV;
typedef ESourceConfigBackendClass EBookConfigWebdavClass; typedef ESourceConfigBackendClass EBookConfigCardDAVClass;
typedef struct _Context Context; typedef struct _Context Context;
...@@ -43,15 +43,15 @@ void e_module_load (GTypeModule *type_module); ...@@ -43,15 +43,15 @@ void e_module_load (GTypeModule *type_module);
void e_module_unload (GTypeModule *type_module); void e_module_unload (GTypeModule *type_module);
/* Forward Declarations */ /* Forward Declarations */
GType e_book_config_webdav_get_type (void); GType e_book_config_carddav_get_type (void);
G_DEFINE_DYNAMIC_TYPE ( G_DEFINE_DYNAMIC_TYPE (
EBookConfigWebdav, EBookConfigCardDAV,
e_book_config_webdav, e_book_config_carddav,
E_TYPE_SOURCE_CONFIG_BACKEND) E_TYPE_SOURCE_CONFIG_BACKEND)
static void static void
book_config_webdav_context_free (Context *context) book_config_carddav_context_free (Context *context)
{ {
g_clear_object (&context->url_entry); g_clear_object (&context->url_entry);
g_clear_object (&context->find_button); g_clear_object (&context->find_button);
...@@ -61,15 +61,15 @@ book_config_webdav_context_free (Context *context) ...@@ -61,15 +61,15 @@ book_config_webdav_context_free (Context *context)
} }
static GtkWindow * static GtkWindow *
webdav_config_get_dialog_parent_cb (ECredentialsPrompter *prompter, carddav_config_get_dialog_parent_cb (ECredentialsPrompter *prompter,
GtkWindow *dialog) GtkWindow *dialog)
{ {
return dialog; return dialog;
} }
static void static void
book_config_webdav_run_dialog (GtkButton *button, book_config_carddav_run_dialog (GtkButton *button,
Context *context) Context *context)
{ {
ESourceConfig *config; ESourceConfig *config;
ESourceRegistry *registry; ESourceRegistry *registry;
...@@ -109,7 +109,7 @@ book_config_webdav_run_dialog (GtkButton *button, ...@@ -109,7 +109,7 @@ book_config_webdav_run_dialog (GtkButton *button,
G_BINDING_SYNC_CREATE); G_BINDING_SYNC_CREATE);
handler_id = g_signal_connect (prompter, "get-dialog-parent", handler_id = g_signal_connect (prompter, "get-dialog-parent",
G_CALLBACK (webdav_config_get_dialog_parent_cb), dialog); G_CALLBACK (carddav_config_get_dialog_parent_cb), dialog);
e_webdav_discover_dialog_refresh (dialog); e_webdav_discover_dialog_refresh (dialog);
...@@ -157,10 +157,10 @@ book_config_webdav_run_dialog (GtkButton *button, ...@@ -157,10 +157,10 @@ book_config_webdav_run_dialog (GtkButton *button,
} }
static gboolean static gboolean
book_config_webdav_uri_to_text (GBinding *binding, book_config_carddav_uri_to_text (GBinding *binding,
const GValue *source_value, const GValue *source_value,
GValue *target_value, GValue *target_value,
gpointer user_data) gpointer user_data)
{ {
SoupURI *soup_uri; SoupURI *soup_uri;
gchar *text; gchar *text;
...@@ -175,10 +175,10 @@ book_config_webdav_uri_to_text (GBinding *binding, ...@@ -175,10 +175,10 @@ book_config_webdav_uri_to_text (GBinding *binding,
} }
static gboolean static gboolean
book_config_webdav_text_to_uri (GBinding *binding, book_config_carddav_text_to_uri (GBinding *binding,
const GValue *source_value, const GValue *source_value,
GValue *target_value, GValue *target_value,
gpointer user_data) gpointer user_data)
{ {
ESource *source; ESource *source;
SoupURI *soup_uri; SoupURI *soup_uri;
...@@ -212,8 +212,8 @@ book_config_webdav_text_to_uri (GBinding *binding, ...@@ -212,8 +212,8 @@ book_config_webdav_text_to_uri (GBinding *binding,
} }
static void static void
book_config_webdav_insert_widgets (ESourceConfigBackend *backend, book_config_carddav_insert_widgets (ESourceConfigBackend *backend,
ESource *scratch_source) ESource *scratch_source)
{ {
ESourceConfig *config; ESourceConfig *config;
ESource *collection_source; ESource *collection_source;
...@@ -233,7 +233,7 @@ book_config_webdav_insert_widgets (ESourceConfigBackend *backend, ...@@ -233,7 +233,7 @@ book_config_webdav_insert_widgets (ESourceConfigBackend *backend,
g_object_set_data_full ( g_object_set_data_full (
G_OBJECT (backend), uid, context, G_OBJECT (backend), uid, context,
(GDestroyNotify) book_config_webdav_context_free); (GDestroyNotify) book_config_carddav_context_free);
e_book_source_config_add_offline_toggle ( e_book_source_config_add_offline_toggle (
E_BOOK_SOURCE_CONFIG (config), scratch_source); E_BOOK_SOURCE_CONFIG (config), scratch_source);
...@@ -254,7 +254,7 @@ book_config_webdav_insert_widgets (ESourceConfigBackend *backend, ...@@ -254,7 +254,7 @@ book_config_webdav_insert_widgets (ESourceConfigBackend *backend,
extension, "soup-uri", extension, "soup-uri",
widget, "label", widget, "label",
G_BINDING_SYNC_CREATE, G_BINDING_SYNC_CREATE,
book_config_webdav_uri_to_text, book_config_carddav_uri_to_text,
NULL, NULL,
g_object_ref (scratch_source), g_object_ref (scratch_source),
(GDestroyNotify) g_object_unref); (GDestroyNotify) g_object_unref);
...@@ -278,7 +278,7 @@ book_config_webdav_insert_widgets (ESourceConfigBackend *backend, ...@@ -278,7 +278,7 @@ book_config_webdav_insert_widgets (ESourceConfigBackend *backend,
g_signal_connect ( g_signal_connect (
widget, "clicked", widget, "clicked",
G_CALLBACK (book_config_webdav_run_dialog), context); G_CALLBACK (book_config_carddav_run_dialog), context);
} }
widget = gtk_check_button_new_with_label ( widget = gtk_check_button_new_with_label (
...@@ -300,15 +300,15 @@ book_config_webdav_insert_widgets (ESourceConfigBackend *backend, ...@@ -300,15 +300,15 @@ book_config_webdav_insert_widgets (ESourceConfigBackend *backend,
context->url_entry, "text", context->url_entry, "text",
G_BINDING_BIDIRECTIONAL | G_BINDING_BIDIRECTIONAL |
G_BINDING_SYNC_CREATE, G_BINDING_SYNC_CREATE,
book_config_webdav_uri_to_text, book_config_carddav_uri_to_text,
book_config_webdav_text_to_uri, book_config_carddav_text_to_uri,
NULL, (GDestroyNotify) NULL); NULL, (GDestroyNotify) NULL);
} }
} }
static gboolean static gboolean
book_config_webdav_check_complete (ESourceConfigBackend *backend, book_config_carddav_check_complete (ESourceConfigBackend *backend,
ESource *scratch_source) ESource *scratch_source)
{ {
SoupURI *soup_uri; SoupURI *soup_uri;
GtkEntry *entry; GtkEntry *entry;
...@@ -339,33 +339,33 @@ book_config_webdav_check_complete (ESourceConfigBackend *backend, ...@@ -339,33 +339,33 @@ book_config_webdav_check_complete (ESourceConfigBackend *backend,
} }
static void static void
e_book_config_webdav_class_init (ESourceConfigBackendClass *class) e_book_config_carddav_class_init (ESourceConfigBackendClass *class)
{ {
EExtensionClass *extension_class; EExtensionClass *extension_class;
extension_class = E_EXTENSION_CLASS (class); extension_class = E_EXTENSION_CLASS (class);
extension_class->extensible_type = E_TYPE_BOOK_SOURCE_CONFIG; extension_class->extensible_type = E_TYPE_BOOK_SOURCE_CONFIG;
class->parent_uid = "webdav-stub"; class->parent_uid = "carddav-stub";
class->backend_name = "webdav"; class->backend_name = "carddav";
class->insert_widgets = book_config_webdav_insert_widgets; class->insert_widgets = book_config_carddav_insert_widgets;
class->check_complete = book_config_webdav_check_complete; class->check_complete = book_config_carddav_check_complete;
} }
static void static void
e_book_config_webdav_class_finalize (ESourceConfigBackendClass *class) e_book_config_carddav_class_finalize (ESourceConfigBackendClass *class)
{ {
} }
static void static void
e_book_config_webdav_init (ESourceConfigBackend *backend) e_book_config_carddav_init (ESourceConfigBackend *backend)
{ {
} }
G_MODULE_EXPORT void G_MODULE_EXPORT void
e_module_load (GTypeModule *type_module) e_module_load (GTypeModule *type_module)
{ {
e_book_config_webdav_register_type (type_module); e_book_config_carddav_register_type (type_module);
} }
G_MODULE_EXPORT void G_MODULE_EXPORT void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment