gnome-panel code freeze break request

[Mark McLoughlin <markmc redhat com>]

Hi,
	As per the evolution change which went in yesterday to change the
interface version in the OAFIIDs, we need to change the panel. However,
the nice thing is that we can now just make it use "-c calendar" now
rather than relying on the OAFIID.

	Okay to commit?

Cheers,
Mark.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/clock/ChangeLog,v
retrieving revision 1.557
diff -u -p -r1.557 ChangeLog
--- ChangeLog	30 Aug 2004 14:35:25 -0000	1.557
+++ ChangeLog	31 Aug 2004 07:25:57 -0000
@@ -0,0 +1,6 @@
+2004-08-31  Mark McLoughlin  <mark skynet ie>
+
+	* calendar-client.c: (calendar_client_launch_editor): use
+	"evolution -c calendar" rather than "evolution-1.5 -c OAFIID:.."
+	to launch calendar/tasks.
+
Index: calendar-client.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/clock/calendar-client.c,v
retrieving revision 1.9
diff -u -p -r1.9 calendar-client.c
--- calendar-client.c	24 Aug 2004 15:28:15 -0000	1.9
+++ calendar-client.c	31 Aug 2004 07:26:00 -0000
@@ -1986,10 +1986,6 @@ calendar_client_launch_editor (CalendarC
 			       GdkScreen          *screen,
 			       GError            **error)
 {
-#define EVOLUTION_COMMAND             "evolution-1.5"
-#define EVOLUTION_APPOINTMENTS_OAFIID "OAFIID:GNOME_Evolution_Calendar_Component:1.5"
-#define EVOLUTION_TASKS_OAFIID        "OAFIID:GNOME_Evolution_Tasks_Component:1.5"
-
   char     *command_line;
   gboolean  retval;
 
@@ -1997,19 +1993,12 @@ calendar_client_launch_editor (CalendarC
   g_return_val_if_fail (event_type == CALENDAR_EVENT_APPOINTMENT ||
 			event_type == CALENDAR_EVENT_TASK, FALSE);
 
-  command_line = g_strdup_printf ("%s -c %s",
-				  EVOLUTION_COMMAND,
-				  event_type == CALENDAR_EVENT_APPOINTMENT ?
-				      EVOLUTION_APPOINTMENTS_OAFIID :
-				      EVOLUTION_TASKS_OAFIID);
+  command_line = g_strdup_printf ("evolution -c %s",
+				  event_type == CALENDAR_EVENT_APPOINTMENT ? "calendar" : "tasks");
 
   retval = gdk_spawn_command_line_on_screen (screen, command_line, error);
 
   g_free (command_line);
 
   return retval;
-
-#undef EVOLUTION_COMMAND
-#undef EVOLUTION_APPOINTMENTS_OAFIID
-#undef EVOLUTION_TASKS_OAFIID
 }