diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | modules/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/cal-config-webcal/Makefile.am | 24 | ||||
| -rw-r--r-- | modules/cal-config-webcal/evolution-cal-config-webcal.c | 219 | ||||
| -rw-r--r-- | plugins/calendar-http/Makefile.am | 27 | ||||
| -rw-r--r-- | plugins/calendar-http/calendar-http.c | 265 | ||||
| -rw-r--r-- | plugins/calendar-http/org-gnome-calendar-http.eplug.xml | 35 |
7 files changed, 246 insertions, 329 deletions
diff --git a/configure.ac b/configure.ac index 148b6895dd..c54c246533 100644 --- a/configure.ac +++ b/configure.ac @@ -1298,7 +1298,7 @@ AC_ARG_ENABLE([plugins], [enable_plugins="$enableval"],[enable_plugins=all]) dnl Add any new plugins here -plugins_base_always="calendar-http itip-formatter default-source mark-all-read publish-calendar imap-features" +plugins_base_always="itip-formatter default-source mark-all-read publish-calendar imap-features" plugins_base="$plugins_base_always" dist_plugins_base="$plugins_base_always" @@ -1641,6 +1641,7 @@ modules/cal-config-contacts/Makefile modules/cal-config-google/Makefile modules/cal-config-local/Makefile modules/cal-config-weather/Makefile +modules/cal-config-webcal/Makefile modules/composer-autosave/Makefile modules/mailto-handler/Makefile modules/mdn/Makefile @@ -1657,7 +1658,6 @@ plugins/Makefile plugins/attachment-reminder/Makefile plugins/audio-inline/Makefile plugins/bbdb/Makefile -plugins/calendar-http/Makefile plugins/dbx-import/Makefile plugins/default-source/Makefile plugins/email-custom-header/Makefile diff --git a/modules/Makefile.am b/modules/Makefile.am index 0f1f6b5a93..46f4720796 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -33,6 +33,7 @@ SUBDIRS = \ cal-config-google \ cal-config-local \ $(CONFIG_WEATHER_DIR) \ + cal-config-webcal \ composer-autosave \ mailto-handler \ mdn \ diff --git a/modules/cal-config-webcal/Makefile.am b/modules/cal-config-webcal/Makefile.am new file mode 100644 index 0000000000..ef96ebfece --- /dev/null +++ b/modules/cal-config-webcal/Makefile.am @@ -0,0 +1,24 @@ +module_LTLIBRARIES = module-cal-config-webcal.la + +module_cal_config_webcal_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ + -DG_LOG_DOMAIN=\"evolution-cal-config-webcal\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) + +module_cal_config_webcal_la_SOURCES = \ + evolution-cal-config-webcal.c + +module_cal_config_webcal_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/calendar/gui/libevolution-calendar.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) + +module_cal_config_webcal_la_LDFLAGS = \ + -module -avoid-version $(NO_UNDEFINED) + +-include $(top_srcdir)/git.mk diff --git a/modules/cal-config-webcal/evolution-cal-config-webcal.c b/modules/cal-config-webcal/evolution-cal-config-webcal.c new file mode 100644 index 0000000000..9a42219c10 --- /dev/null +++ b/modules/cal-config-webcal/evolution-cal-config-webcal.c @@ -0,0 +1,219 @@ +/* + * evolution-cal-config-webcal.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-interval-chooser.h> +#include <misc/e-source-config-backend.h> +#include <calendar/gui/e-cal-source-config.h> + +typedef ESourceConfigBackend ECalConfigWebcal; +typedef ESourceConfigBackendClass ECalConfigWebcalClass; + +typedef struct _Context Context; + +struct _Context { + GtkWidget *url_entry; +}; + +/* Module Entry Points */ +void e_module_load (GTypeModule *type_module); +void e_module_unload (GTypeModule *type_module); + +/* Forward Declarations */ +GType e_cal_config_webcal_get_type (void); + +G_DEFINE_DYNAMIC_TYPE ( + ECalConfigWebcal, + e_cal_config_webcal, + E_TYPE_SOURCE_CONFIG_BACKEND) + +static void +cal_config_webcal_context_free (Context *context) +{ + g_object_unref (context->url_entry); + + g_slice_free (Context, context); +} + +static gboolean +cal_config_webcal_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 +cal_config_webcal_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 +cal_config_webcal_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) cal_config_webcal_context_free); + + e_cal_source_config_add_offline_toggle ( + E_CAL_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); + + e_source_config_add_refresh_interval (config, scratch_source); + + extension_name = E_SOURCE_EXTENSION_WEBDAV_BACKEND; + extension = e_source_get_extension (scratch_source, extension_name); + + g_object_bind_property_full ( + extension, "soup-uri", + context->url_entry, "text", + G_BINDING_BIDIRECTIONAL | + G_BINDING_SYNC_CREATE, + cal_config_webcal_uri_to_text, + cal_config_webcal_text_to_uri, + NULL, (GDestroyNotify) NULL); +} + +static gboolean +cal_config_webcal_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_cal_config_webcal_class_init (ESourceConfigBackendClass *class) +{ + EExtensionClass *extension_class; + + extension_class = E_EXTENSION_CLASS (class); + extension_class->extensible_type = E_TYPE_CAL_SOURCE_CONFIG; + + class->parent_uid = "webcal-stub"; + class->backend_name = "webcal"; + class->insert_widgets = cal_config_webcal_insert_widgets; + class->check_complete = cal_config_webcal_check_complete; +} + +static void +e_cal_config_webcal_class_finalize (ESourceConfigBackendClass *class) +{ +} + +static void +e_cal_config_webcal_init (ESourceConfigBackend *backend) +{ +} + +G_MODULE_EXPORT void +e_module_load (GTypeModule *type_module) +{ + e_cal_config_webcal_register_type (type_module); +} + +G_MODULE_EXPORT void +e_module_unload (GTypeModule *type_module) +{ +} diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am deleted file mode 100644 index 7333fd31d5..0000000000 --- a/plugins/calendar-http/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -@EVO_PLUGIN_RULE@ - -plugin_DATA = org-gnome-calendar-http.eplug - -plugin_LTLIBRARIES = liborg-gnome-calendar-http.la - -liborg_gnome_calendar_http_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I$(top_srcdir) \ - $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) - -liborg_gnome_calendar_http_la_SOURCES = calendar-http.c - -liborg_gnome_calendar_http_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - -liborg_gnome_calendar_http_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) - -EXTRA_DIST = org-gnome-calendar-http.eplug.xml - -BUILT_SOURCES = $(plugin_DATA) -CLEANFILES = $(BUILT_SOURCES) - --include $(top_srcdir)/git.mk diff --git a/plugins/calendar-http/calendar-http.c b/plugins/calendar-http/calendar-http.c deleted file mode 100644 index a4524401be..0000000000 --- a/plugins/calendar-http/calendar-http.c +++ /dev/null @@ -1,265 +0,0 @@ -/* - * - * - * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <gtk/gtk.h> -#include <e-util/e-config.h> -#include <e-util/e-plugin-util.h> -#include <calendar/gui/e-cal-config.h> -#include <libedataserver/e-source.h> -#include <libsoup/soup.h> -#include <glib/gi18n.h> -#include <string.h> - -GtkWidget *e_calendar_http_url (EPlugin *epl, EConfigHookItemFactoryData *data); -GtkWidget *e_calendar_http_refresh (EPlugin *epl, EConfigHookItemFactoryData *data); -gboolean e_calendar_http_check (EPlugin *epl, EConfigHookPageCheckData *data); -GtkWidget * e_calendar_http_secure (EPlugin *epl, EConfigHookItemFactoryData *data); -GtkWidget *e_calendar_http_auth (EPlugin *epl, EConfigHookItemFactoryData *data); - -gint e_plugin_lib_enable (EPlugin *ep, gint enable); - -gint -e_plugin_lib_enable (EPlugin *ep, - gint enable) -{ - return 0; -} - -static void -url_changed (GtkEntry *entry, - ESource *source) -{ - SoupURI *uri; - gchar *relative_uri; - - uri = soup_uri_new (gtk_entry_get_text (GTK_ENTRY (entry))); - - if (!uri) - return; - - if (uri->scheme && strncmp (uri->scheme, "https", sizeof ("https") - 1) == 0) { - gpointer secure_checkbox; - - secure_checkbox = g_object_get_data ( - G_OBJECT (gtk_widget_get_parent (GTK_WIDGET (entry))), - "secure_checkbox"); - - gtk_toggle_button_set_active ( - GTK_TOGGLE_BUTTON (secure_checkbox), TRUE); - } - - soup_uri_set_user (uri, e_source_get_property (source, "username")); - relative_uri = e_plugin_util_uri_no_proto (uri); - e_source_set_relative_uri (source, relative_uri); - g_free (relative_uri); - soup_uri_free (uri); -} - -GtkWidget * -e_calendar_http_url (EPlugin *epl, - EConfigHookItemFactoryData *data) -{ - GtkWidget *entry; - ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; - SoupURI *uri; - gchar *uri_text; - - if ((!e_plugin_util_is_source_proto (t->source, "http") && - !e_plugin_util_is_source_proto (t->source, "https") && - !e_plugin_util_is_source_proto (t->source, "webcal"))) { - return NULL; - } - - uri_text = e_source_get_uri (t->source); - uri = soup_uri_new (uri_text); - g_free (uri_text); - - if (uri) { - soup_uri_set_user (uri, NULL); - soup_uri_set_password (uri, NULL); - - uri_text = soup_uri_to_string (uri, FALSE); - soup_uri_free (uri); - } else { - uri_text = g_strdup (""); - } - - entry = e_plugin_util_add_entry (data->parent, _("_URL:"), NULL, NULL); - gtk_entry_set_text (GTK_ENTRY (entry), uri_text); - g_signal_connect ( - entry, "changed", - G_CALLBACK (url_changed), t->source); - g_free (uri_text); - - return entry; -} - -GtkWidget * -e_calendar_http_refresh (EPlugin *epl, - EConfigHookItemFactoryData *data) -{ - ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; - - if ((!e_plugin_util_is_source_proto (t->source, "http") && - !e_plugin_util_is_source_proto (t->source, "https") && - !e_plugin_util_is_source_proto (t->source, "webcal"))) { - return NULL; - } - - return e_plugin_util_add_refresh ( - data->parent, _("Re_fresh:"), t->source, "refresh"); -} - -GtkWidget * -e_calendar_http_secure (EPlugin *epl, - EConfigHookItemFactoryData *data) -{ - ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; - GtkWidget *secure_setting, *ignore_cert, *grid; - - if ((!e_plugin_util_is_source_proto (t->source, "http") && - !e_plugin_util_is_source_proto (t->source, "https") && - !e_plugin_util_is_source_proto (t->source, "webcal"))) { - return NULL; - } - - secure_setting = e_plugin_util_add_check ( - NULL, _("Use _secure connection"), - t->source, "use_ssl", "1", "0"); - - /* Store pointer to secure checkbox so we can retrieve it in url_changed() */ - g_object_set_data ( - G_OBJECT (data->parent), "secure_checkbox", - (gpointer) secure_setting); - - ignore_cert = e_plugin_util_add_check (NULL, _("_Ignore invalid SSL certificate"), t->source, "ignore-invalid-cert", "1", NULL); - - g_object_bind_property ( - secure_setting, "active", - ignore_cert, "sensitive", - G_BINDING_SYNC_CREATE); - - grid = gtk_grid_new (); - gtk_grid_attach (GTK_GRID (grid), secure_setting, 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (grid), ignore_cert, 0, 1, 1, 1); - gtk_widget_show_all (grid); - - if (GTK_IS_TABLE (data->parent)) { - gint row; - - g_object_get (data->parent, "n-rows", &row, NULL); - - gtk_table_attach (GTK_TABLE (data->parent), grid, 1, 2, row , row + 1, GTK_FILL, 0, 0, 0); - } else { - gtk_container_add (GTK_CONTAINER (data->parent), grid); - } - - return grid; -} - -static void -username_changed (GtkEntry *entry, - ESource *source) -{ - const gchar *username; - gchar *uri; - - username = gtk_entry_get_text (GTK_ENTRY (entry)); - - if (username && username[0]) { - e_source_set_property (source, "auth", "1"); - e_source_set_property (source, "username", username); - } else { - e_source_set_property (source, "auth", NULL); - e_source_set_property (source, "username", NULL); - username = NULL; - } - - uri = e_source_get_uri (source); - if (uri != NULL) { - SoupURI *suri; - gchar *ruri; - - suri = soup_uri_new (uri); - if (!suri) - return; - - soup_uri_set_user (suri, username); - soup_uri_set_password (suri, NULL); - - ruri = e_plugin_util_uri_no_proto (suri); - e_source_set_relative_uri (source, ruri); - soup_uri_free (suri); - g_free (ruri); - g_free (uri); - } -} - -GtkWidget * -e_calendar_http_auth (EPlugin *epl, - EConfigHookItemFactoryData *data) -{ - ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; - GtkWidget *entry; - const gchar *username; - - if ((!e_plugin_util_is_source_proto (t->source, "http") && - !e_plugin_util_is_source_proto (t->source, "https") && - !e_plugin_util_is_source_proto (t->source, "webcal"))) { - return NULL; - } - - username = e_source_get_property (t->source, "username"); - - entry = e_plugin_util_add_entry (data->parent, _("Userna_me:"), NULL, NULL); - gtk_entry_set_text (GTK_ENTRY (entry), username ? username : ""); - g_signal_connect ( - entry, "changed", - G_CALLBACK (username_changed), t->source); - - return entry; -} - -gboolean -e_calendar_http_check (EPlugin *epl, - EConfigHookPageCheckData *data) -{ - /* FIXME - check pageid */ - ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target; - gboolean ok = FALSE; - - if (!e_plugin_util_is_group_proto (e_source_peek_group (t->source), "webcal")) - return TRUE; - - if (e_plugin_util_is_source_proto (t->source, "file")) - return FALSE; - - ok = e_plugin_util_is_source_proto (t->source, "webcal") || - e_plugin_util_is_source_proto (t->source, "http") || - e_plugin_util_is_source_proto (t->source, "https") || - e_plugin_util_is_source_proto (t->source, "file"); - - return ok; -} diff --git a/plugins/calendar-http/org-gnome-calendar-http.eplug.xml b/plugins/calendar-http/org-gnome-calendar-http.eplug.xml deleted file mode 100644 index 32f2abe499..0000000000 --- a/plugins/calendar-http/org-gnome-calendar-http.eplug.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> -<e-plugin-list> - <e-plugin - type="shlib" - location="@PLUGINDIR@/liborg-gnome-calendar-http@SOEXT@" - id="org.gnome.evolution.calendar.http" - _name="Web Calendars" - system_plugin="true"> - <author name="David Trowbridge" email="David.Trowbridge@Colorado.edu"/> - <_description>Add web calendars to Evolution.</_description> - <hook class="org.gnome.evolution.calendar.config:1.0"> - <group - target="source" - id="org.gnome.evolution.calendar.calendarProperties" - check="e_calendar_http_check"> - <item - type="item_table" - path="00.general/00.source/40.url" - factory="e_calendar_http_url"/> - <item - type="item_table" - path="00.general/00.source/50.secure" - factory="e_calendar_http_secure"/> - <item - type="item_table" - path="00.general/00.source/51.auth" - factory="e_calendar_http_auth"/> - <item - type="item_table" - path="00.general/00.source/60.refresh" - factory="e_calendar_http_refresh"/> - </group> - </hook> - </e-plugin> -</e-plugin-list> |