diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | plugins/webdav-account-setup/Makefile.am | 22 | ||||
| -rw-r--r-- | plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml | 22 | ||||
| -rw-r--r-- | plugins/webdav-account-setup/webdav-contacts-source.c | 370 |
5 files changed, 432 insertions, 1 deletions
@@ -1,3 +1,19 @@ +2008-08-04 Matthias Braun <matze@braunis.de> + + ** Fix for bug #544051 - Added a plugin for the WebDAV addressbook + account setup. + + * configure.in: + * plugins/webdav-account-setup/Makefile.am: + * plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml + : + * plugins/webdav-account-setup/webdav-contacts-source.c + (ensure_webdav_contacts_source_group), + (remove_webdav_contacts_source_group), (print_uri_noproto), + (set_ui_from_source), (set_source_from_ui), (on_entry_changed), + (on_toggle_changed), (destroy_ui_data), (plugin_webdav_contacts), + (e_plugin_lib_enable): + 2008-07-30 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #545558 diff --git a/configure.in b/configure.in index 2b06874558..2c4a3bd30d 100644 --- a/configure.in +++ b/configure.in @@ -1731,7 +1731,7 @@ AC_ARG_ENABLE([plugins], [enable_plugins="$enableval"],[enable_plugins=all]) dnl Add any new plugins here -plugins_base_always="calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup" +plugins_base_always="calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard mark-all-read groupwise-features groupwise-account-setup mail-account-disable publish-calendar caldav imap-features google-account-setup webdav-account-setup" plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" @@ -2049,6 +2049,7 @@ plugins/tnef-attachments/Makefile plugins/templates/Makefile plugins/face/Makefile plugins/external-editor/Makefile +plugins/webdav-account-setup/Makefile smime/Makefile smime/lib/Makefile smime/gui/Makefile diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am new file mode 100644 index 0000000000..ea2ea5fdcb --- /dev/null +++ b/plugins/webdav-account-setup/Makefile.am @@ -0,0 +1,22 @@ +INCLUDES = \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ + -I . \ + -I$(top_srcdir) + +@EVO_PLUGIN_RULE@ + +plugin_DATA = org-gnome-evolution-webdav.eplug +plugin_LTLIBRARIES = liborg-gnome-evolution-webdav.la + +liborg_gnome_evolution_webdav_la_SOURCES = \ + webdav-contacts-source.c + +liborg_gnome_evolution_webdav_la_LIBADD = \ + $(EPLUGIN_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 diff --git a/plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml b/plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml new file mode 100644 index 0000000000..6699a4ae8e --- /dev/null +++ b/plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml @@ -0,0 +1,22 @@ +<?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>A plugin to setup WebDAV contacts.</_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> diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c new file mode 100644 index 0000000000..8f944de5ed --- /dev/null +++ b/plugins/webdav-account-setup/webdav-contacts-source.c @@ -0,0 +1,370 @@ +/* + * + * 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 <glib.h> + +#include <gtk/gtk.h> + +#include <e-util/e-config.h> +#include <e-util/e-plugin.h> +#include <addressbook/gui/widgets/eab-config.h> + +#include <libedataserver/e-source.h> +#include <libedataserver/e-source-list.h> +#include <libedataserver/e-url.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); + +int +e_plugin_lib_enable(EPluginLib *ep, int enable); + +static void +ensure_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_name(source_list, _("WebDAV")); + + if (group == NULL) { + gboolean res; + + group = e_source_group_new(_("WebDAV"), BASE_URI); + res = e_source_list_add_group(source_list, group, -1); + + if (res == FALSE) { + g_warning("Could not add WebDAV source group!"); + } else { + e_source_list_sync(source_list, NULL); + } + + g_object_unref(group); + } + 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_name(source_list, _("WebDAV")); + + 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); +} + +/* stolen from caldav plugin which stole it from calendar-weather eplugin */ +static gchar * +print_uri_noproto(EUri *uri) +{ + gchar *uri_noproto; + + if (uri->port != 0) + uri_noproto = g_strdup_printf( + "%s%s%s%s%s%s%s:%d%s%s%s", + uri->user ? uri->user : "", + uri->authmech ? ";auth=" : "", + uri->authmech ? uri->authmech : "", + uri->passwd ? ":" : "", + uri->passwd ? uri->passwd : "", + uri->user ? "@" : "", + uri->host ? uri->host : "", + uri->port, + uri->path ? uri->path : "", + uri->query ? "?" : "", + uri->query ? uri->query : ""); + else + uri_noproto = g_strdup_printf( + "%s%s%s%s%s%s%s%s%s%s", + uri->user ? uri->user : "", + uri->authmech ? ";auth=" : "", + uri->authmech ? uri->authmech : "", + uri->passwd ? ":" : "", + uri->passwd ? uri->passwd : "", + uri->user ? "@" : "", + uri->host ? uri->host : "", + uri->path ? uri->path : "", + uri->query ? "?" : "", + uri->query ? uri->query : ""); + return uri_noproto; +} + +static void +set_ui_from_source(ui_data *data) +{ + ESource *source = data->source; + const char *url = e_source_get_uri(source); + EUri *uri = e_uri_new(url); + char *url_ui; + const char *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 */ + g_free(uri->protocol); + uri->protocol = g_strdup(use_ssl ? "https" : "http"); + + /* remove user/username and set user field */ + if (uri->user != NULL) { + gtk_entry_set_text(data->username_entry, uri->user); + g_free(uri->user); + uri->user = NULL; + } else { + gtk_entry_set_text(data->username_entry, ""); + } + + url_ui = e_uri_to_string(uri, TRUE); + gtk_entry_set_text(data->url_entry, url_ui); + + g_free(url_ui); + e_uri_free(uri); +} + +static void +set_source_from_ui(ui_data *data) +{ + ESource *source = data->source; + gboolean avoid_ifmatch = gtk_toggle_button_get_active(data->avoid_ifmatch_toggle); + const char *url = gtk_entry_get_text(data->url_entry); + EUri *uri = e_uri_new(url); + char *url_noprotocol; + gboolean use_ssl; + + e_source_set_property(source, "avoid_ifmatch", avoid_ifmatch ? "1" : "0"); + + /* put username into uri */ + g_free(uri->user); + uri->user = g_strdup(gtk_entry_get_text(data->username_entry)); + + if (uri->user[0] != '\0') { + e_source_set_property(source, "auth", "plain/password"); + e_source_set_property(source, "username", uri->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 (strcmp(uri->protocol, "https") == 0) { + use_ssl = TRUE; + } else { + use_ssl = FALSE; + } + e_source_set_property(source, "use_ssl", use_ssl ? "1" : "0"); + + url_noprotocol = print_uri_noproto(uri); + e_source_set_relative_uri(source, url_noprotocol); + g_free(url_noprotocol); + e_uri_free(uri); +} + +static void +on_entry_changed(GtkEntry *entry, gpointer user_data) +{ + (void) entry; + set_source_from_ui(user_data); +} + +static void +on_toggle_changed(GtkToggleButton *tb, gpointer user_data) +{ + (void) tb; + set_source_from_ui(user_data); +} + +static void +destroy_ui_data(gpointer data) +{ + ui_data *ui_data = data; + + gtk_widget_destroy(ui_data->box); + g_free(ui_data); +} + +GtkWidget * +plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data) +{ + EABConfigTargetSource *t = (EABConfigTargetSource *) data->target; + ESource *source; + ESourceGroup *group; + const char *base_uri; + GtkWidget *parent; + GtkWidget *vbox; + + GtkWidget *section; + GtkWidget *vbox2; + + GtkBox *hbox; + GtkWidget *spacer; + GtkWidget *label; + + ui_data *uidata; + + source = t->source; + group = e_source_peek_group (source); + + base_uri = e_source_group_peek_base_uri (group); + + g_object_set_data_full (G_OBJECT (epl), "widget", NULL, + (GDestroyNotify)gtk_widget_destroy); + + if (strcmp(base_uri, BASE_URI) != 0) { + 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); + gtk_label_set_markup(GTK_LABEL(section), _("<b>Server</b>")); + 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); + + label = gtk_label_new(_("URL:")); + gtk_box_pack_start(hbox, label, FALSE, FALSE, 0); + + uidata->url_entry = GTK_ENTRY(gtk_entry_new()); + gtk_box_pack_start(hbox, GTK_WIDGET(uidata->url_entry), TRUE, TRUE, 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); + + label = gtk_label_new_with_mnemonic(_("User_name:")); + gtk_box_pack_start(hbox, label, FALSE, FALSE, 0); + + uidata->username_entry = GTK_ENTRY(gtk_entry_new()); + gtk_box_pack_start(hbox, GTK_WIDGET(uidata->username_entry), TRUE, TRUE, 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); + + uidata->avoid_ifmatch_toggle = GTK_TOGGLE_BUTTON( + gtk_check_button_new_with_mnemonic( + _("_Avoid IfMatch (needed on apache < 2.2.8)"))); + gtk_box_pack_start(hbox, GTK_WIDGET(uidata->avoid_ifmatch_toggle), + FALSE, FALSE, 0); + + set_ui_from_source(uidata); + + gtk_widget_show_all(vbox2); + + uidata->box = vbox2; + g_object_set_data_full(G_OBJECT(epl), "widget", uidata, + destroy_ui_data); + + g_signal_connect(G_OBJECT(uidata->username_entry), "changed", + G_CALLBACK(on_entry_changed), uidata); + g_signal_connect(G_OBJECT(uidata->url_entry), "changed", + G_CALLBACK(on_entry_changed), uidata); + g_signal_connect(G_OBJECT(uidata->avoid_ifmatch_toggle), "toggled", + G_CALLBACK(on_toggle_changed), uidata); + + return NULL; +} + +int +e_plugin_lib_enable(EPluginLib *ep, int enable) +{ + if (enable) { + ensure_webdav_contacts_source_group(); + } else { + remove_webdav_contacts_source_group(); + } + return 0; +} + |