Index: configure.in
===================================================================
--- configure.in	(revision 10410)
+++ configure.in	(working copy)
@@ -56,7 +56,7 @@ LIBGNOMEUI_REQUIRED=2.5.4
 LIBBONOBOUI_REQUIRED=2.1.1
 ORBIT_REQUIRED=2.4.0
 GNOME_VFS_REQUIRED=2.14.2
-LIBWNCK_REQUIRED=2.19.3
+LIBWNCK_REQUIRED=2.19.2
 GCONF_REQUIRED=2.6.1
 LIBGNOME_MENU_REQUIRED=2.11.1
 LIBECAL_REQUIRED=1.6.0
@@ -95,6 +95,8 @@ else
     if $PKG_CONFIG --exists libecal-1.2 libedataserverui-1.2; then
        AC_MSG_RESULT(yes)
        LIBECAL_REQUIREMENT="libecal-1.2 >= $LIBECAL_REQUIRED libedataserver-1.2 >= $LIBEDATASERVER_REQUIRED libedataserverui-1.2 >= $LIBEDATASERVERUI_REQUIRED"
+	   EDS_PREFIX=`$PKG_CONFIG --variable=prefix evolution-data-server-1.2`
+	   CLOCK_EDS_ICONDIR=$EDS_PREFIX/share/pixmaps/evolution-data-server
     else
        AC_MSG_RESULT(no)
     fi
@@ -103,6 +105,7 @@ fi
 if test -n "$LIBECAL_REQUIREMENT"; then
   AC_DEFINE([HAVE_LIBECAL], 1,
             [Defined when evolution-data-server libecal-1.2 and libedataserverui-1.2 are detected])
+  AC_SUBST(CLOCK_EDS_ICONDIR)
 fi
 AM_CONDITIONAL(HAVE_LIBECAL, test -n "$LIBECAL_REQUIREMENT")
 
Index: applets/clock/calendar-window.c
===================================================================
--- applets/clock/calendar-window.c	(revision 10410)
+++ applets/clock/calendar-window.c	(working copy)
@@ -543,14 +543,20 @@ set_renderer_pixbuf_pixmap_for_bday (Gtk
 	 * ...
 	 */
 	if (g_strrstr (type, "birthday") != 0)
-		path = CLOCK_ICONDIR"/icon_birthday_16.png"; 
+		path = CLOCK_EDS_ICONDIR"/icon_birthday_16.png"; 
 	else if (g_strrstr (type, "anniversary") != 0)
-		path = CLOCK_ICONDIR"/icon_anniversary_16.png"; 
+		path = CLOCK_EDS_ICONDIR"/icon_anniversary_16.png"; 
 	else
-		path = CLOCK_ICONDIR"/icon_unknown_16.png"; 
+		path = CLOCK_EDS_ICONDIR"/icon_unknown_16.png"; 
 
 	g_free (type);
 
+	// Check if file exists
+	if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
+		g_warning ("File '%s' does not exist.");
+		return;
+	}
+
 	pixbuf = gdk_pixbuf_new_from_file (path, &error);
 	if (error) {
 		g_warning ("Cannot load '%s': %s", path, error->message);
@@ -577,7 +583,13 @@ set_renderer_pixbuf_pixmap_for_weather (
 	GError      *error  = NULL;
 
 
-	path = CLOCK_ICONDIR"/icon_weather_16.png";
+	path = CLOCK_EDS_ICONDIR"/icon_weather_16.png";
+
+	// Check if file exists
+	if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) {
+		g_warning ("File '%s' does not exist.");
+		return;
+	}
 
 	pixbuf = gdk_pixbuf_new_from_file (path, &error);
 	if (error) {
Index: applets/clock/Makefile.am
===================================================================
--- applets/clock/Makefile.am	(revision 10410)
+++ applets/clock/Makefile.am	(working copy)
@@ -6,12 +6,14 @@ INCLUDES = 						\
 	$(WARN_CFLAGS) 					\
 	$(CLOCK_CFLAGS) 				\
 	-DDATADIR=\""$(datadir)"\"			\
-	-DCLOCK_ICONDIR=\""$(clockbitmapsdir)"\"			\
 	-DLIBDIR=\""$(libdir)"\"			\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"		\
 	-DPREFIX=\""$(prefix)"\"			\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
-	-DCLOCK_TIME_UTILITY="\"$(CLOCK_TIME_UTILITY)\""
+	-DCLOCK_TIME_UTILITY="\"$(CLOCK_TIME_UTILITY)\"" \
+	-DCLOCK_EDS_ICONDIR="\"$(CLOCK_EDS_ICONDIR)\""
+
+#	-DCLOCK_ICONDIR=\""$(clockbitmapsdir)"\"			
 
 if HAVE_LIBECAL
 CALENDAR_SOURCES =		\
@@ -20,11 +22,6 @@ CALENDAR_SOURCES =		\
 	calendar-sources.c	\
 	calendar-sources.h	\
 	calendar-debug.h
-#CLOCK_BITMAPS = 		\
-#	icon_anniversary_16.png \
-#	icon_birthday_16.png 	\
-#	icon_weather_16.png 	\
-#	icon_unknown_16.png 
 endif
 
 CLOCK_SOURCES = 		\
@@ -128,14 +125,10 @@ install-data-local:
 endif
 
 EXTRA_DIST =						\
-	$(CLOCK_BITMAPS)				\
 	GNOME_ClockApplet_Factory.server.in.in		\
 	$(schemas_in_files)				\
 	$(ui_DATA)
 
-clockbitmapsdir = $(datadir)/gnome-panel/pixmaps/clock
-clockbitmaps_DATA = $(CLOCK_BITMAPS)
-
 CLEANFILES =			\
 	$(BUILT_SOURCES)	\
 	$(server_in_files)	\
