dia r3876 - in trunk: . app lib

[hans svn gnome org]

Author: hans
Date: Thu Jan 10 22:16:02 2008
New Revision: 3876
URL: http://svn.gnome.org/viewvc/dia?rev=3876&view=rev

Log:
2008-01-10  Hans Breuer  <hans breuer org>

	* app/create_object.c(create_object_button_release) : don't crash on
	tool->obj being NULL, just do nothing than.

	* app/undo.c(310) : error C4033: 'undo_remove_to' must return a value
	  app/undo.c(312) : error C4047: '!=' : '
	void (__cdecl *)(struct _Change *,struct _Diagram *)' 
	differs in levels of indirection from 
	'void (__cdecl ** )(struct _Change *,struct _Diagram *)'

	* lib/libdia.def : reflect recent libdia API changes




Modified:
   trunk/ChangeLog
   trunk/app/create_object.c
   trunk/app/undo.c
   trunk/lib/libdia.def

Modified: trunk/app/create_object.c
==============================================================================
--- trunk/app/create_object.c	(original)
+++ trunk/app/create_object.c	Thu Jan 10 22:16:02 2008
@@ -125,6 +125,10 @@
 
   GList *parent_candidates;
 
+  g_return_if_fail (obj != NULL);
+  if (!obj) /* not sure if this isn't enough */
+    return; /* could be a legal invariant */
+
   if (tool->moving) {
     gdk_pointer_ungrab (event->time);
 

Modified: trunk/app/undo.c
==============================================================================
--- trunk/app/undo.c	(original)
+++ trunk/app/undo.c	Thu Jan 10 22:16:02 2008
@@ -307,8 +307,9 @@
 undo_remove_to(UndoStack *stack, UndoApplyFunc *type)
 {
   Change *current_change = stack->current_change;
-  if (current_change == NULL) return;
-  while (current_change && current_change->apply != type) {
+  if (current_change == NULL) 
+    return NULL;
+  while (current_change && current_change->apply != *type) {
     current_change = current_change->prev;
   }
   if (current_change != NULL) {

Modified: trunk/lib/libdia.def
==============================================================================
--- trunk/lib/libdia.def	(original)
+++ trunk/lib/libdia.def	Thu Jan 10 22:16:02 2008
@@ -7,7 +7,6 @@
  pretty_formated_xml
 
 ; exported functions
- active_focus
  apply_textattr_properties
  apply_textstr_properties
  arrow_bbox
@@ -383,8 +382,9 @@
  
  focus_get_object
  focus_get_first_on_object
- focus_previous
- focus_next
+ focus_previous_on_diagram
+ focus_next_on_diagram
+ 
 
  get_default_paper
  get_paper_bmargin
@@ -403,6 +403,7 @@
  group_objects
  group_type
 
+ get_active_focus
  give_focus
 ; give_focus_to_object
  
@@ -631,10 +632,10 @@
  rectangle_union
  rectangle_union
 
- remove_focus
- remove_focus_object
+ remove_focus_on_diagram
+ remove_focus_object 
 
- reset_foci
+ reset_foci_on_diagram
 
  rotate_matrix
  nearest_pow