dia r3912 - in trunk: . objects/standard

[hans svn gnome org]

Author: hans
Date: Sun Mar  9 17:27:05 2008
New Revision: 3912
URL: http://svn.gnome.org/viewvc/dia?rev=3912&view=rev

Log:
2008-03-09  Hans Breuer  <hans breuer org>

	* objects/standard/outline.c : don't make Dia crash by returning NULL
	from get_object_menu. Fixes bug #503899
	


Modified:
   trunk/ChangeLog
   trunk/objects/standard/outline.c

Modified: trunk/objects/standard/outline.c
==============================================================================
--- trunk/objects/standard/outline.c	(original)
+++ trunk/objects/standard/outline.c	Sun Mar  9 17:27:05 2008
@@ -126,7 +126,7 @@
   (MoveHandleFunc)      outline_move_handle,
   (GetPropertiesFunc)   object_create_props_dialog,
   (ApplyPropertiesDialogFunc) object_apply_props_from_dialog,
-  (ObjectMenuFunc)      outline_get_object_menu,
+  (ObjectMenuFunc)      NULL, /* outline_get_object_menu, */
   (DescribePropsFunc)   outline_describe_props,
   (GetPropsFunc)        outline_get_props,
   (SetPropsFunc)        outline_set_props,
@@ -414,11 +414,13 @@
   /* the last one */
   DIA_RENDERER_GET_CLASS (renderer)->draw_bezier (renderer, &pts[n], i - n - 1, &outline->line_color);
 }
+#if 0 /* returning NULL crashes Dia, the method must be NULL if there is nothing to do */
 static DiaMenu *
 outline_get_object_menu(Outline *outline, Point *clickedpoint)
 {
   return NULL;
 }
+#endif
 /*! A standard props compliant object needs to describe its parameters */
 static PropDescription *
 outline_describe_props (Outline *outline)