Bug#454318: gnome-panel: Clock applet doesn't show personal remote calendar events

[Roland Mas]

Package: gnome-panel
Version: 2.20.2-2
Severity: normal
Tags: patch

Hi,

Since it's not unusual for me to be away from home, and to use one
laptop or the other in addition to the classical desktop PC, I'm
storing my appointments and calendar events on a CalDAV server.
Evolution can access it just fine, and the clock applet (well, its
calendar widget) can also access it, presumably through EDS, since the
days where I have appointments are displayed in bold.

  The problem is that not all appointments and events are expanded
into the "pop-up" subwindow when the corresponding day is clicked.  I
initially thought only whole-day appointments were listed, but I was
wrong, and apparently the discriminating factor is the calendar in
which the event is stored.  Actually, the access method for that
calendar.  I peeked into
gnome-panel-2.20.2/applets/clock/calendar-window.c, and I found that
is_appointment() hardcodes a test for two methods:

,----
| 		return (strcmp (uri, "file") == 0 ||
| 			strcmp (uri, "webcal") == 0);
`----

Adding a similar test for "caldav" (see diff) fixes the bug.  I also
suggest switching to "file://", "webcal://" and "caldav://", but
that's probably minor.

diff -ru ./gnome-panel-2.20.2-2.orig/applets/clock/calendar-window.c gnome-panel-2.20.2/applets/clock/calendar-window.c
--- ./gnome-panel-2.20.2-2.orig/applets/clock/calendar-window.c	2007-11-27 01:02:56.000000000 +0100
+++ gnome-panel-2.20.2/applets/clock/calendar-window.c	2007-12-04 17:20:50.000000000 +0100
@@ -370,7 +370,8 @@
 	gtk_tree_model_get (model, iter, APPOINTMENT_COLUMN_URI, &uri, -1);
 	if (uri)
 		return (strcmp (uri, "file") == 0 ||
-			strcmp (uri, "webcal") == 0);
+			strcmp (uri, "webcal") == 0 ||
+			strcmp (uri, "caldav") == 0);
 	return FALSE;
 }
 
diff -ru ./gnome-panel-2.20.2-2.orig/debian/changelog gnome-panel-2.20.2/debian/changelog
--- ./gnome-panel-2.20.2-2.orig/debian/changelog	2007-12-04 17:36:37.000000000 +0100
+++ gnome-panel-2.20.2/debian/changelog	2007-12-04 17:23:39.000000000 +0100
@@ -1,3 +1,9 @@
+gnome-panel (2.20.2-2+lolando) unstable; urgency=low
+
+  * Bugfix in clock applet: display caldav events too.
+
+ -- Roland Mas <lolando at debian.org>  Tue, 04 Dec 2007 17:23:40 +0100
+
 gnome-panel (2.20.2-2) unstable; urgency=low
 
   * debian/gnome-panel-data.postinst:


-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-3-k7 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages gnome-panel depends on:
ii  gnome-about                 2.20.2-1     The GNOME about box
ii  gnome-control-center        1:2.20.1-2   utilities to configure the GNOME d
ii  gnome-desktop-data          2.20.2-1     Common files for GNOME 2 desktop a
ii  gnome-menus                 2.20.2-1     an implementation of the freedeskt
ii  gnome-panel-data            2.20.2-2     common files for the GNOME Panel
ii  libatk1.0-0                 1.20.0-1     The ATK accessibility toolkit
ii  libbonobo2-0                2.20.1-1     Bonobo CORBA interfaces library
ii  libbonoboui2-0              2.20.0-1     The Bonobo UI library
ii  libc6                       2.7-3        GNU C Library: Shared libraries
ii  libcairo2                   1.4.10-1     The Cairo 2D vector graphics libra
ii  libdbus-glib-1-2            0.74-1       simple interprocess messaging syst
ii  libecal1.2-7                1.12.1-1     Client library for evolution calen
ii  libedataserver1.2-9         1.12.1-1     Utility library for evolution data
ii  libedataserverui1.2-8       1.12.1-1     GUI utility library for evolution 
ii  libgconf2-4                 2.20.1-1     GNOME configuration database syste
ii  libglade2-0                 1:2.6.2-1    library to load .glade files at ru
ii  libglib2.0-0                2.14.4-2     The GLib library of C routines
ii  libgnome-desktop-2          2.20.2-1     Utility library for loading .deskt
ii  libgnome-menu2              2.20.2-1     an implementation of the freedeskt
ii  libgnome2-0                 2.20.1.1-1   The GNOME 2 library - runtime file
ii  libgnomeui-0                2.20.1.1-1   The GNOME 2 libraries (User Interf
ii  libgnomevfs2-0              1:2.20.1-1   GNOME Virtual File System (runtime
ii  libgtk2.0-0                 2.12.2-1     The GTK+ graphical user interface 
ii  liborbit2                   1:2.14.7-0.1 libraries for ORBit2 - a CORBA ORB
ii  libpanel-applet2-0          2.20.2-2     library for GNOME Panel applets
ii  libpango1.0-0               1.18.3-1     Layout and rendering of internatio
ii  libwnck22                   2.20.2-1     Window Navigator Construction Kit 
ii  libx11-6                    2:1.0.3-7    X11 client-side library
ii  libxau6                     1:1.0.3-2    X11 authorisation library
ii  menu-xdg                    0.3          freedesktop.org menu compliant win

Versions of packages gnome-panel recommends:
ii  alacarte                     0.11.3-1    easy GNOME menu editing tool
ii  evolution-data-server        1.12.1-1    evolution database backend server
ii  gnome-applets                2.20.0-1+b1 Various applets for GNOME 2 panel 
ii  gnome-icon-theme             2.20.0-1    GNOME Desktop icon theme
ii  gnome-session                2.20.2-1    The GNOME 2 Session Manager

-- no debconf information