aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-12-15 18:31:56 +0800
committerMilan Crha <mcrha@redhat.com>2011-12-15 18:31:56 +0800
commit09b17320afb38fc5550f28200935df242c29bf07 (patch)
treec446a14b066d31dd1b883d3cda5c6ff97d8b6ee2
parentc01655aa3ffed339cf485d162b24fad88b116b30 (diff)
downloadgsoc2013-evolution-09b17320afb38fc5550f28200935df242c29bf07.tar.gz
gsoc2013-evolution-09b17320afb38fc5550f28200935df242c29bf07.tar.zst
gsoc2013-evolution-09b17320afb38fc5550f28200935df242c29bf07.zip
Bug #561696 - Invitation's "Open Calendar" button jumps to current day
-rw-r--r--modules/calendar/e-cal-shell-backend.c6
-rw-r--r--plugins/itip-formatter/itip-formatter.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index 6541863b32..399a5ea80c 100644
--- a/modules/calendar/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
@@ -558,7 +558,7 @@ cal_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
header = (gchar *) cp;
header[header_len] = '\0';
- cp += header_len + 2;
+ cp += header_len + 1;
content_len = strcspn (cp, "&");
@@ -579,10 +579,10 @@ cal_shell_backend_handle_uri_cb (EShellBackend *shell_backend,
comp_rid = g_strdup (content);
g_free (content);
- cp += content_len + 1;
+ cp += content_len;
if (*cp == '&') {
cp++;
- if (strcmp (cp, "amp;") == 0)
+ if (strncmp (cp, "amp;", 4) == 0)
cp += 4;
}
}
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index b7ac7be82e..687dc26a53 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -2521,7 +2521,7 @@ idle_open_cb (gpointer data)
start = isodate_from_time_t (pitip->start_time);
end = isodate_from_time_t (pitip->end_time);
m = mail_msg_new (&open_calendar_info);
- m->command = g_strdup_printf ("evolution \"calendar:///?startdate=&%s&enddate=&%s\"", start, end);
+ m->command = g_strdup_printf ("evolution \"calendar:///?startdate=%s&enddate=%s\"", start, end);
mail_msg_slow_ordered_push (m);
g_free (start);