aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/caldav
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/caldav')
-rw-r--r--plugins/caldav/ChangeLog124
-rw-r--r--plugins/caldav/caldav-browse-server.c11
-rw-r--r--plugins/caldav/caldav-source.c22
3 files changed, 26 insertions, 131 deletions
diff --git a/plugins/caldav/ChangeLog b/plugins/caldav/ChangeLog
deleted file mode 100644
index 9a9bae7398..0000000000
--- a/plugins/caldav/ChangeLog
+++ /dev/null
@@ -1,124 +0,0 @@
-2009-04-28 Milan Crha <mcrha@redhat.com>
-
- ** Fix for bug #578335
-
- * caldav-source.c: (user_changed), (location_changed):
- Revert part of bug #562990, as EPassword requires username
- as part of an URL to store passwords properly to a keyring.
-
-2009-04-24 Milan Crha <mcrha@redhat.com>
-
- ** Part of fix for bug #569652
-
- * caldav-source.c: (ensure_caldav_source_group):
- Use new ESourceList API (simplifies code).
-
-2009-04-24 Milan Crha <mcrha@redhat.com>
-
- ** Fix for bug #572348
-
- * caldav-source.c: Remove deprecated Gtk+ symbols.
-
-2009-02-26 Matthew Barnes <mbarnes@redhat.com>
-
- ** Fixes part of bug #572950
-
- * Makefile.am:
- Fix ordering of -I compiler directives. Patch by Daniel Macks.
-
-2008-12-08 Milan Crha <mcrha@redhat.com>
-
- ** Fix for bug #562990
-
- * caldav-source.c: (user_changed), (oge_caldav): Use 'username'
- property of the ESource to read/write user name, not the uri.
-
-2008-11-28 Milan Crha <mcrha@redhat.com>
-
- ** Part of fix for bug #503662
-
- * caldav-source.c: (user_changed):
- Set NULL properly to protect against using already freed memory.
-
-2008-11-28 Milan Crha <mcrha@redhat.com>
-
- ** Part of fix for bug #359745
-
- * caldav-source.c: (ensure_caldav_source_group),
- (e_plugin_lib_enable): Ensure source group for VTODO and VJOURNAL too.
- * caldav-source.c: (set_refresh_time), (get_refresh_minutes),
- (spin_changed), (option_changed), (oge_caldav):
- Be able to change refresh time for the CalDAV sources.
- * org-gnome-evolution-caldav.eplug.xml:
- Show CalDAV options under all the other standard options.
-
-2008-09-02 Sankar P <psankar@novell.com>
-
-License Changes
-
- * caldav-source.c:
-
-2008-08-07 Paul Bolle <pebolle@tiscali.nl>
-
- ** Fixes bug #546785
-
- * caldav-source.c: (e_plugin_lib_enable): The caldav plugin is noisy
- when enabled:
- "CalDAV Eplugin starting up ..."
- Make this plugin just as polite as google-account-setup.
-
-2008-07-31 Matthew Barnes <mbarnes@redhat.com>
-
- ** Fixes part of bug #545568
-
- * org-gnome-caldav.eplug.xml:
- Add "system_plugin=true" so it's not shown in the Plugin Manager.
- This plugin is not designed to be disabled by the user.
-
-2007-10-26 Kjartan Maraas <kmaraas@gnome.org>
-
- * caldav-source.c: (ensure_caldav_source_group):
- ANSIfication of function declaration.
-
-2007-05-12 Matthew Barnes <mbarnes@redhat.com>
-
- ** Fixes part of bug #337616
-
- * Makefile.am: Add "eplug" file to CLEANFILES.
-
-2006-08-28 Kjartan Maraas <kmaraas@gnome.org>
-
- * org-gnome-evolution-caldav.eplug.xml: Mark name and
- description for translation.
- Makefile.am: Rename the above from .in to .xml
-
-2006-06-15 Tor Lillqvist <tml@novell.com>
-
- * Makefile.am: Use NO_UNDEFINED.
-
- * org-gnome-evolution-caldav.eplug.in: Use SOEXT.
-
-2006-03-28 Jeff Cai <jeff.cai@sun.com>
-
- ** Fixes #333881
- * caldav-source.c: (oge_caldav):
- Set an empty string instead of null for a TEXT entry.
-
-2006-02-22 Irene.Huang <Irene.Huang@sun.com>
-
- Fixes bug #328252
-
- * Makefile.am: Add $(EVOLUTION_CALENDAR_LIBS)
- to liborg_gnome_evolution_caldav_la_LIBADD.
-
-2006-01-16 Harish Krishnaswamy <kharish@novell.com>
-
- * Makefile.am : Integrate with eplugin make
- scripts and add a ChangeLog file for the eplugin.
-
-2006-01-16 Harish Krishnaswamy <kharish@novell.com>
-
- * caldav*: 'Import' the CalDAV eplugin
- implementation into evolution. Please
- refer evolution-caldav module in cvs.gnome.org for
- prior Change history.
diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c
index ff19ff0c38..8b2d1ae0e4 100644
--- a/plugins/caldav/caldav-browse-server.c
+++ b/plugins/caldav/caldav-browse-server.c
@@ -39,7 +39,6 @@
#include <libedataserverui/e-passwords.h>
#include <e-util/e-dialog-utils.h>
-#include <widgets/misc/e-spinner.h>
#include "caldav-browse-server.h"
@@ -789,6 +788,7 @@ soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gbool
if (!password || !*password || retrying) {
gchar *pass, *prompt, *add = NULL;
+ gchar *bold_user, *bold_host;
if (retrying && msg && msg->reason_phrase) {
add = g_strdup_printf (_("Previous attempt failed: %s"), msg->reason_phrase);
@@ -796,7 +796,11 @@ soup_authenticate (SoupSession *session, SoupMessage *msg, SoupAuth *auth, gbool
add = g_strdup_printf (_("Previous attempt failed with code %d"), msg->status_code);
}
- prompt = g_strdup_printf (_("Enter password for user <b>%s</b> on server <b>%s</b>"), username, soup_auth_get_host (auth));
+ bold_user = g_strconcat ("<b>", username, "</b>", NULL);
+ bold_host = g_strconcat ("<b>", soup_auth_get_host (auth), "</b>", NULL);
+ prompt = g_strdup_printf (_("Enter password for user %s on server %s"), bold_user, bold_host);
+ g_free (bold_user);
+ g_free (bold_host);
if (add) {
gchar *tmp;
@@ -1180,7 +1184,8 @@ init_dialog (GtkDialog *dialog, GtkWidget **new_url_entry, const gchar *url, con
info_box = gtk_hbox_new (FALSE, 2);
- spinner = e_spinner_new_spinning_small_shown ();
+ spinner = gtk_spinner_new ();
+ gtk_spinner_start (GTK_SPINNER (spinner));
gtk_box_pack_start (GTK_BOX (info_box), spinner, FALSE, FALSE, 0);
g_object_set_data (G_OBJECT (dialog), "caldav-spinner", spinner);
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index 5691fdde45..a3129af3a4 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.c
@@ -185,6 +185,7 @@ oge_caldav (EPlugin *epl,
SoupURI *suri;
GtkWidget *parent, *location, *ssl, *user, *browse_cal;
gchar *uri, *username;
+ guint n_rows;
source = t->source;
@@ -214,25 +215,38 @@ oge_caldav (EPlugin *epl,
location = e_plugin_util_add_entry (parent, _("_URL:"), NULL, NULL);
gtk_entry_set_text (GTK_ENTRY (location), uri);
- g_signal_connect (G_OBJECT (location), "changed", G_CALLBACK (location_changed_cb), source);
+
+ g_signal_connect (
+ location, "changed",
+ G_CALLBACK (location_changed_cb), source);
ssl = e_plugin_util_add_check (parent, _("Use _SSL"), source, "ssl", "1", "0");
user = e_plugin_util_add_entry (parent, _("User_name:"), NULL, NULL);
gtk_entry_set_text (GTK_ENTRY (user), username ? username : "");
- g_signal_connect (G_OBJECT (user), "changed", G_CALLBACK (user_changed_cb), source);
+
+ g_signal_connect (
+ user, "changed",
+ G_CALLBACK (user_changed_cb), source);
g_free (uri);
g_free (username);
browse_cal = gtk_button_new_with_mnemonic (_("Brows_e server for a calendar"));
gtk_widget_show (browse_cal);
- gtk_table_attach (GTK_TABLE (parent), browse_cal, 1, 2, GTK_TABLE (parent)->nrows, GTK_TABLE (parent)->nrows + 1, GTK_FILL, 0, 0, 0);
+ g_object_get (parent, "n-rows", &n_rows, NULL);
+ gtk_table_attach (
+ GTK_TABLE (parent), browse_cal, 1, 2,
+ n_rows, n_rows + 1, GTK_FILL, 0, 0, 0);
g_object_set_data (G_OBJECT (browse_cal), "caldav-url", location);
g_object_set_data (G_OBJECT (browse_cal), "caldav-username", user);
g_object_set_data (G_OBJECT (browse_cal), "caldav-ssl", ssl);
- g_signal_connect (G_OBJECT (browse_cal), "clicked", G_CALLBACK (browse_cal_clicked_cb), GINT_TO_POINTER (t->source_type));
+
+ g_signal_connect (
+ browse_cal, "clicked",
+ G_CALLBACK (browse_cal_clicked_cb),
+ GINT_TO_POINTER (t->source_type));
e_plugin_util_add_refresh (parent, _("Re_fresh:"), source, "refresh");
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-08 14:27:56 +0800