r13741 - in /desktop/unstable/gnome-panel/debian: changelog patches/60_caldav-clock-appointments.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Dec  4 17:24:36 2007
New Revision: 13741

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13741
Log:
* New patch, 60_caldav-clock-appointments, allows display of caldav://
  calendars in clock applet; thanks Roland Mas; closes: #454318.

Added:
    desktop/unstable/gnome-panel/debian/patches/60_caldav-clock-appointments.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=13741&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog (original)
+++ desktop/unstable/gnome-panel/debian/changelog Tue Dec  4 17:24:36 2007
@@ -1,3 +1,10 @@
+gnome-panel (2.20.2-3) UNRELEASED; urgency=low
+
+  * New patch, 60_caldav-clock-appointments, allows display of caldav://
+    calendars in clock applet; thanks Roland Mas; closes: #454318.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 04 Dec 2007 18:23:24 +0100
+
 gnome-panel (2.20.2-2) unstable; urgency=low
 
   * debian/gnome-panel-data.postinst:

Added: desktop/unstable/gnome-panel/debian/patches/60_caldav-clock-appointments.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/60_caldav-clock-appointments.patch?rev=13741&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/60_caldav-clock-appointments.patch (added)
+++ desktop/unstable/gnome-panel/debian/patches/60_caldav-clock-appointments.patch Tue Dec  4 17:24:36 2007
@@ -1,0 +1,18 @@
+calendar-window.c: (is_appointment): Tighten checks to match the
+full protocol ("file:", not "file") and merge fix by Roland Mas to match
+"caldav:" as well.  GNOME #501569, Debian #454318.
+
+--- gnome-panel-2.20.2/applets/clock/calendar-window.c	2007-11-27 01:02:56.000000000 +0100
++++ gnome-panel-2.20.2.new/applets/clock/calendar-window.c	2007-12-04 18:22:47.000000000 +0100
+@@ -369,8 +369,9 @@
+ 
+ 	gtk_tree_model_get (model, iter, APPOINTMENT_COLUMN_URI, &uri, -1);
+ 	if (uri)
+-		return (strcmp (uri, "file") == 0 ||
+-			strcmp (uri, "webcal") == 0);
++		return (strcmp (uri, "file:") == 0 ||
++			strcmp (uri, "webcal:") == 0 ||
++			strcmp (uri, "caldav:") == 0);
+ 	return FALSE;
+ }
+