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

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Jan 15 10:27:15 2008
New Revision: 14232

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14232
Log:
* Update patch 60_caldav-clock-appointments to not use a colon for now, it
  seems it's encoded in the URI in some way; closes: #454318.

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

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=14232&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog (original)
+++ desktop/unstable/gnome-panel/debian/changelog Tue Jan 15 10:27:15 2008
@@ -1,3 +1,10 @@
+gnome-panel (2.20.3-2) UNRELEASED; urgency=low
+
+  * Update patch 60_caldav-clock-appointments to not use a colon for now, it
+    seems it's encoded in the URI in some way; closes: #454318.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 15 Jan 2008 11:24:51 +0100
+
 gnome-panel (2.20.3-1) unstable; urgency=low
 
   [ Loic Minier ]

Modified: 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=14232&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/60_caldav-clock-appointments.patch (original)
+++ desktop/unstable/gnome-panel/debian/patches/60_caldav-clock-appointments.patch Tue Jan 15 10:27:15 2008
@@ -1,6 +1,5 @@
-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.
+calendar-window.c: (is_appointment): 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
@@ -10,9 +9,9 @@
  	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 (strcmp (uri, "file") == 0 ||
++			strcmp (uri, "webcal") == 0 ||
++			strcmp (uri, "caldav") == 0);
  	return FALSE;
  }