[evolution-patches] 61776

[JP Rosevear <jpr novell com>]

-JP
-- 
JP Rosevear <jpr novell com>
Novell, Inc.

? 61451.patch
? 61776.patch
? cal-conduits.patch
? cal-name.patch
? nav-scroll-2.patch
? nav-scroll-3.patch
? nav-scroll.patch
? gui/Helgdagar_2004.ics
? gui/cal-comp.patch
? gui/month.patch
? gui/monthview.patch
? gui/nav-scroll.patch
? gui/navigator.patch
? gui/new-editor-2.patch
? gui/new-editor.patch
? gui/old-e-cal-model.h
? gui/old.c
? gui/scroll.patch
? gui/sel.patch
? gui/summary.patch
? gui/temp2.c
? gui/alarm-notify/alarm.patch
? gui/dialogs/alarm-dialog.gladep
? gui/dialogs/alarm-list-dialog.gladep
? gui/dialogs/calendar-setup.gladep
? gui/dialogs/event-page.gladep
? gui/dialogs/meeting-page.gladep
? gui/dialogs/recurrence-page.gladep
? gui/dialogs/temp.c
? gui/dialogs/temp2.c
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2450
diff -u -r1.2450 ChangeLog
--- ChangeLog	19 Jul 2004 22:02:28 -0000	1.2450
+++ ChangeLog	21 Jul 2004 20:35:43 -0000
@@ -1,3 +1,10 @@
+2004-07-21  JP Rosevear  <jpr novell com>
+
+	Fixes #61776
+	
+	* gui/e-calendar-table.c (clipboard_get_text_cb): make sure the
+	text is not NULL
+
 2004-07-16  JP Rosevear  <jpr novell com>
 
 	Fixes #61451
Index: gui/e-calendar-table.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-table.c,v
retrieving revision 1.121
diff -u -r1.121 e-calendar-table.c
--- gui/e-calendar-table.c	14 Jul 2004 02:20:55 -0000	1.121
+++ gui/e-calendar-table.c	21 Jul 2004 20:35:44 -0000
@@ -838,7 +838,6 @@
 static void
 clipboard_get_text_cb (GtkClipboard *clipboard, const gchar *text, ECalendarTable *cal_table)
 {
-	char *comp_str;
 	icalcomponent *icalcomp;
 	char *uid;
 	ECalComponent *comp;
@@ -847,8 +846,10 @@
 
 	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
 
-	comp_str = (char *) text;
-	icalcomp = icalparser_parse_string ((const char *) comp_str);
+	if (!text || !*text)
+		return;
+
+	icalcomp = icalparser_parse_string (text);
 	if (!icalcomp)
 		return;