--- gnome-libs-1.4.2/libgnomeui/gnome-dateedit.c~	2007-02-27 13:18:31.000000000 +0100
+++ gnome-libs-1.4.2/libgnomeui/gnome-dateedit.c	2007-02-27 13:18:31.000000000 +0100
@@ -259,7 +259,7 @@
 		mtm->tm_min  = 0;
 		hit = g_new (hour_info_t, 1);
 
-		strftime (buffer, sizeof (buffer), "%X", mtm);
+		strftime (buffer, sizeof (buffer), "%R", mtm);
 		hit->hour = g_strdup (buffer);
 		hit->gde  = gde;
 
@@ -280,7 +280,7 @@
 
 			mtm->tm_min = j;
 			hit = g_new (hour_info_t, 1);
-			strftime (buffer, sizeof (buffer), "%X", mtm);
+			strftime (buffer, sizeof (buffer), "%R", mtm);
 			hit->hour = g_strdup (buffer);
 			hit->gde  = gde;
 
@@ -397,7 +397,7 @@
 	gtk_entry_set_text (GTK_ENTRY (gde->date_entry), buffer);
 
 	/* Set the time */
-	strftime (buffer, sizeof (buffer), "%X", mytm);
+	strftime (buffer, sizeof (buffer), "%T", mytm);
 	gtk_entry_set_text (GTK_ENTRY (gde->time_entry), buffer);
 }
 
@@ -575,8 +575,7 @@
 	/* FIXME: Is this the correct behaviour for an invalid date? */
 	if (!g_date_valid (date))
 	{
-		/* Shrug. Will today do? */
-		g_date_set_time (date, time (NULL));
+		return (time_t)-1;
 	}
 
 	tm.tm_mon = g_date_month (date);