Commit 8b03b8a2 authored by Matthew Barnes's avatar Matthew Barnes
Browse files

Add 'book-config-webdav' module.

Registers the "WebDAV" backend in EBookSourceConfig widgets.

Replaces the 'webdav-account-setup' plugin.
parent 4c9c82d8
......@@ -1298,7 +1298,7 @@ AC_ARG_ENABLE([plugins],
[enable_plugins="$enableval"],[enable_plugins=all])
dnl Add any new plugins here
plugins_base_always="calendar-file calendar-http itip-formatter default-source mark-all-read publish-calendar caldav imap-features google-account-setup webdav-account-setup"
plugins_base_always="calendar-file calendar-http itip-formatter default-source mark-all-read publish-calendar caldav imap-features google-account-setup"
plugins_base="$plugins_base_always"
dist_plugins_base="$plugins_base_always calendar-weather"
......@@ -1636,6 +1636,7 @@ modules/backup-restore/Makefile
modules/book-config-google/Makefile
modules/book-config-ldap/Makefile
modules/book-config-local/Makefile
modules/book-config-webdav/Makefile
modules/composer-autosave/Makefile
modules/mailto-handler/Makefile
modules/mdn/Makefile
......@@ -1676,7 +1677,6 @@ plugins/save-calendar/Makefile
plugins/templates/Makefile
plugins/tnef-attachments/Makefile
plugins/vcard-inline/Makefile
plugins/webdav-account-setup/Makefile
smclient/Makefile
smime/Makefile
smime/lib/Makefile
......
......@@ -23,6 +23,7 @@ SUBDIRS = \
book-config-google \
$(CONFIG_LDAP_DIR) \
book-config-local \
book-config-webdav \
composer-autosave \
mailto-handler \
mdn \
......
module_LTLIBRARIES = module-book-config-webdav.la
module_book_config_webdav_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/widgets \
-DG_LOG_DOMAIN=\"evolution-book-config-webdav\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS)
module_book_config_webdav_la_SOURCES = \
evolution-book-config-webdav.c
module_book_config_webdav_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/addressbook/printing/libecontactprint.la \
$(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \
$(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \
$(top_builddir)/addressbook/util/libeabutil.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS)
module_book_config_webdav_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
-include $(top_srcdir)/git.mk
/*
* evolution-book-config-webdav.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 <glib/gi18n-lib.h>
#include <libebackend/e-extension.h>
#include <libedataserver/e-source-authentication.h>
#include <libedataserver/e-source-webdav.h>
#include <misc/e-source-config-backend.h>
#include <addressbook/gui/widgets/e-book-source-config.h>
typedef ESourceConfigBackend EBookConfigWebdav;
typedef ESourceConfigBackendClass EBookConfigWebdavClass;
typedef struct _Context Context;
struct _Context {
GtkWidget *url_entry;
GtkWidget *avoid_ifmatch;
};
/* Module Entry Points */
void e_module_load (GTypeModule *type_module);
void e_module_unload (GTypeModule *type_module);
/* Forward Declarations */
GType e_book_config_webdav_get_type (void);
G_DEFINE_DYNAMIC_TYPE (
EBookConfigWebdav,
e_book_config_webdav,
E_TYPE_SOURCE_CONFIG_BACKEND)
static void
book_config_webdav_context_free (Context *context)
{
g_object_unref (context->url_entry);
g_object_unref (context->avoid_ifmatch);
g_slice_free (Context, context);
}
static gboolean
book_config_webdav_uri_to_text (GBinding *binding,
const GValue *source_value,
GValue *target_value,
gpointer user_data)
{
SoupURI *soup_uri;
gchar *text;
soup_uri = g_value_get_boxed (source_value);
soup_uri_set_user (soup_uri, NULL);
text = soup_uri_to_string (soup_uri, FALSE);
g_value_take_string (target_value, text);
return TRUE;
}
static gboolean
book_config_webdav_text_to_uri (GBinding *binding,
const GValue *source_value,
GValue *target_value,
gpointer user_data)
{
GObject *target;
ESource *source;
SoupURI *soup_uri;
ESourceAuthentication *extension;
const gchar *extension_name;
const gchar *text;
const gchar *user;
text = g_value_get_string (source_value);
soup_uri = soup_uri_new (text);
if (soup_uri == NULL)
return FALSE;
target = g_binding_get_target (binding);
source = e_source_extension_get_source (E_SOURCE_EXTENSION (target));
extension_name = E_SOURCE_EXTENSION_AUTHENTICATION;
extension = e_source_get_extension (source, extension_name);
user = e_source_authentication_get_user (extension);
soup_uri_set_user (soup_uri, user);
g_value_take_boxed (target_value, soup_uri);
return TRUE;
}
static void
book_config_webdav_insert_widgets (ESourceConfigBackend *backend,
ESource *scratch_source)
{
ESourceConfig *config;
ESourceExtension *extension;
GtkWidget *widget;
Context *context;
const gchar *extension_name;
const gchar *uid;
context = g_slice_new (Context);
uid = e_source_get_uid (scratch_source);
config = e_source_config_backend_get_config (backend);
g_object_set_data_full (
G_OBJECT (backend), uid, context,
(GDestroyNotify) book_config_webdav_context_free);
e_book_source_config_add_offline_toggle (
E_BOOK_SOURCE_CONFIG (config), scratch_source);
widget = gtk_entry_new ();
e_source_config_insert_widget (
config, scratch_source, _("URL:"), widget);
context->url_entry = g_object_ref (widget);
gtk_widget_show (widget);
e_source_config_add_secure_connection_for_webdav (
config, scratch_source);
e_source_config_add_user_entry (config, scratch_source);
widget = gtk_check_button_new_with_label (
_("Avoid IfMatch (needed on Apache < 2.2.8)"));
e_source_config_insert_widget (
config, scratch_source, NULL, widget);
context->avoid_ifmatch = g_object_ref (widget);
gtk_widget_show (widget);
extension_name = E_SOURCE_EXTENSION_WEBDAV_BACKEND;
extension = e_source_get_extension (scratch_source, extension_name);
g_object_bind_property (
extension, "avoid-ifmatch",
context->avoid_ifmatch, "active",
G_BINDING_BIDIRECTIONAL |
G_BINDING_SYNC_CREATE);
g_object_bind_property_full (
extension, "soup-uri",
context->url_entry, "text",
G_BINDING_BIDIRECTIONAL |
G_BINDING_SYNC_CREATE,
book_config_webdav_uri_to_text,
book_config_webdav_text_to_uri,
NULL, (GDestroyNotify) g_object_unref);
}
static gboolean
book_config_webdav_check_complete (ESourceConfigBackend *backend,
ESource *scratch_source)
{
SoupURI *soup_uri;
GtkEntry *entry;
Context *context;
const gchar *uri_string;
const gchar *uid;
gboolean complete;
uid = e_source_get_uid (scratch_source);
context = g_object_get_data (G_OBJECT (backend), uid);
g_return_val_if_fail (context != NULL, FALSE);
entry = GTK_ENTRY (context->url_entry);
uri_string = gtk_entry_get_text (entry);
soup_uri = soup_uri_new (uri_string);
complete = SOUP_URI_VALID_FOR_HTTP (soup_uri);
if (soup_uri != NULL)
soup_uri_free (soup_uri);
return complete;
}
static void
e_book_config_webdav_class_init (ESourceConfigBackendClass *class)
{
EExtensionClass *extension_class;
extension_class = E_EXTENSION_CLASS (class);
extension_class->extensible_type = E_TYPE_BOOK_SOURCE_CONFIG;
class->parent_uid = "webdav-stub";
class->backend_name = "webdav";
class->insert_widgets = book_config_webdav_insert_widgets;
class->check_complete = book_config_webdav_check_complete;
}
static void
e_book_config_webdav_class_finalize (ESourceConfigBackendClass *class)
{
}
static void
e_book_config_webdav_init (ESourceConfigBackend *backend)
{
}
G_MODULE_EXPORT void
e_module_load (GTypeModule *type_module)
{
e_book_config_webdav_register_type (type_module);
}
G_MODULE_EXPORT void
e_module_unload (GTypeModule *type_module)
{
}
@EVO_PLUGIN_RULE@
plugin_DATA = org-gnome-evolution-webdav.eplug
plugin_LTLIBRARIES = liborg-gnome-evolution-webdav.la
liborg_gnome_evolution_webdav_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I . \
-I$(top_srcdir) \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS)
liborg_gnome_evolution_webdav_la_SOURCES = \
webdav-contacts-source.c
liborg_gnome_evolution_webdav_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS)
liborg_gnome_evolution_webdav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
EXTRA_DIST = \
org-gnome-evolution-webdav.eplug.xml
CLEANFILES = org-gnome-evolution-webdav.eplug
-include $(top_srcdir)/git.mk
<?xml version="1.0"?>
<e-plugin-list>
<e-plugin id="org.gnome.evolution.webdav"
type="shlib"
_name="WebDAV contacts"
location="@PLUGINDIR@/liborg-gnome-evolution-webdav@SOEXT@"
load-on-startup="false"
localedir = "@LOCALEDIR@">
<author name="Matthias Braun"
email="matze@braunis.de"/>
<_description>Add WebDAV contacts to Evolution.</_description>
<hook class="org.gnome.evolution.addressbook.config:1.0">
<group target="source"
id="com.novell.evolution.addressbook.config.accountEditor">
<item type="item"
path="00.general/10.display/00.WebDAV"
factory="plugin_webdav_contacts"/>
</group>
</hook>
</e-plugin>
</e-plugin-list>
/*
*
* Copyright (C) 2008 Matthias Braun <matze@braunis.de>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU Lesser General Public
* License as published by the Free Software Foundation.
*
* 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 this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include <e-util/e-config.h>
#include <e-util/e-plugin.h>
#include <e-util/e-plugin-util.h>
#include <shell/e-shell.h>
#include <addressbook/gui/widgets/eab-config.h>
#include <libedataserver/e-source.h>
#include <libedataserver/e-source-list.h>
#include <libedataserver/e-account-list.h>
#define BASE_URI "webdav://"
typedef struct {
ESource *source;
GtkWidget *box;
GtkEntry *url_entry;
GtkEntry *username_entry;
GtkToggleButton *avoid_ifmatch_toggle;
} ui_data;
GtkWidget * plugin_webdav_contacts (EPlugin *epl,
EConfigHookItemFactoryData *data);
gint
e_plugin_lib_enable (EPlugin *ep,
gint enable);
static void
ensure_webdav_contacts_source_group (void)
{
EShellBackend *backend;
ESourceList *source_list = NULL;
backend = e_shell_get_backend_by_name (e_shell_get_default (), "contacts");
g_return_if_fail (backend != NULL);
g_object_get (G_OBJECT (backend), "source-list", &source_list, NULL);
g_return_if_fail (source_list != NULL);
e_source_list_ensure_group (source_list, _("WebDAV"), BASE_URI, FALSE);
g_object_unref (source_list);
}
static void
remove_webdav_contacts_source_group (void)
{
ESourceList *source_list;
ESourceGroup *group;
source_list = e_source_list_new_for_gconf_default (
"/apps/evolution/addressbook/sources");
if (source_list == NULL) {
return;
}
group = e_source_list_peek_group_by_base_uri (source_list, BASE_URI);
if (group) {
GSList *sources;
sources = e_source_group_peek_sources (group);
if (NULL == sources) {
e_source_list_remove_group (source_list, group);
e_source_list_sync (source_list, NULL);
}
}
g_object_unref (source_list);
}
static void
set_ui_from_source (ui_data *data)
{
ESource *source = data->source;
const gchar *url = e_source_get_uri (source);
SoupURI *suri = soup_uri_new (url);
gchar *url_ui;
const gchar *property;
gboolean use_ssl;
gboolean avoid_ifmatch;
property = e_source_get_property(source, "use_ssl");
if (property != NULL && strcmp(property, "1") == 0) {
use_ssl = TRUE;
} else {
use_ssl = FALSE;
}
property = e_source_get_property(source, "avoid_ifmatch");
if (property != NULL && strcmp(property, "1") == 0) {
avoid_ifmatch = TRUE;
} else {
avoid_ifmatch = FALSE;
}
gtk_toggle_button_set_active (data->avoid_ifmatch_toggle, avoid_ifmatch);
/* it's really a http or https protocol */
if (suri) {
gint port;
port = soup_uri_get_port (suri);
soup_uri_set_scheme (suri, use_ssl ? "https" : "http");
if (port > 0 && port != soup_uri_get_port (suri))
soup_uri_set_port (suri, port);
}
/* remove user/username and set user field */
if (suri && suri->user != NULL) {
gtk_entry_set_text (data->username_entry, suri->user);
soup_uri_set_user (suri, NULL);
} else {
gtk_entry_set_text(data->username_entry, "");
}
if (suri)
url_ui = soup_uri_to_string (suri, FALSE);
else
url_ui = g_strdup ("");
gtk_entry_set_text (data->url_entry, url_ui);
g_free (url_ui);
if (suri)
soup_uri_free (suri);
}
static void
set_source_from_ui (ui_data *data)
{
ESource *source = data->source;
gboolean avoid_ifmatch;
const gchar *url = gtk_entry_get_text (data->url_entry);
SoupURI *suri = soup_uri_new (url);
gchar *url_noprotocol;
gboolean use_ssl;
if (!suri)
return;
avoid_ifmatch = gtk_toggle_button_get_active (data->avoid_ifmatch_toggle);
e_source_set_property(source, "avoid_ifmatch", avoid_ifmatch ? "1" : "0");
/* put username into uri */
soup_uri_set_user (suri, gtk_entry_get_text (data->username_entry));
if (suri->user && *suri->user) {
e_source_set_property(source, "auth", "plain/password");
e_source_set_property(source, "username", suri->user);
} else {
e_source_set_property(source, "auth", NULL);
e_source_set_property(source, "username", NULL);
}
/* set use_ssl based on protocol in URL */
if (suri->scheme && g_str_equal (suri->scheme, "https")) {
use_ssl = TRUE;
} else {
use_ssl = FALSE;
}
e_source_set_property(source, "use_ssl", use_ssl ? "1" : "0");
url_noprotocol = e_plugin_util_uri_no_proto (suri);
e_source_set_relative_uri (source, url_noprotocol);
g_free (url_noprotocol);
soup_uri_free (suri);
}
static void
destroy_ui_data (gpointer data)
{
ui_data *ui = data;
if (ui && ui->box)
gtk_widget_destroy (ui->box);
g_free (ui);
}
GtkWidget *
plugin_webdav_contacts (EPlugin *epl,
EConfigHookItemFactoryData *data)
{
EABConfigTargetSource *t = (EABConfigTargetSource *) data->target;
ESource *source;
GtkWidget *parent;
GtkWidget *vbox;
GtkWidget *section;
GtkWidget *vbox2;
GtkWidget *ignore_cert;
GtkBox *hbox;
GtkWidget *spacer;
GtkWidget *label;
ui_data *uidata;
gchar *buff;
source = t->source;
g_object_set_data (G_OBJECT (epl), "wwidget", NULL);
if (!e_plugin_util_is_group_proto (e_source_peek_group (source), BASE_URI)) {
return NULL;
}
uidata = g_malloc0 (sizeof (uidata[0]));
uidata->source = source;
/* Build up the UI */
parent = data->parent;
vbox = gtk_widget_get_ancestor (gtk_widget_get_parent (parent), GTK_TYPE_VBOX);
vbox2 = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0);
section = gtk_label_new (NULL);
buff = g_strconcat ("<b>", _("Server"), "</b>", NULL);
gtk_label_set_markup (GTK_LABEL (section), buff);
g_free (buff);
gtk_misc_set_alignment (GTK_MISC (section), 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (vbox2), section, FALSE, FALSE, 0);
hbox = GTK_BOX (gtk_hbox_new (FALSE, 10));
gtk_box_pack_start (GTK_BOX (vbox2), GTK_WIDGET (hbox), TRUE, TRUE, 0);
spacer = gtk_label_new(" ");
gtk_box_pack_start (hbox, spacer, FALSE, FALSE, 0);