dia r4207 - in trunk: . app lib

[hans svn gnome org]

Author: hans
Date: Sun Jan 18 17:53:05 2009
New Revision: 4207
URL: http://svn.gnome.org/viewvc/dia?rev=4207&view=rev

Log:
2009-01-18  Hans Breuer  <hans breuer org>

	* app/load_save.c(read_connections) : while playing with "All Objects"
	I've got "connection point %d does not exists", now I get the more
	useful "connection point 14 does not exist on 'SISSI - area'"
	Also there was some flaw with the wants_update calculation.

	* makefile.msc lib/libdia.def : build the unit test on win32, too.



Modified:
   trunk/ChangeLog
   trunk/app/load_save.c
   trunk/lib/dia_image.c
   trunk/lib/libdia.def
   trunk/makefile.msc

Modified: trunk/app/load_save.c
==============================================================================
--- trunk/app/load_save.c	(original)
+++ trunk/app/load_save.c	Sun Jan 18 17:53:05 2009
@@ -277,7 +277,7 @@
     } else {
       gboolean broken = FALSE;
       /* an invalid bounding box is a good sign for some need of corrections */
-      gboolean wants_update = obj->bounding_box.left >= obj->bounding_box.left 
+      gboolean wants_update = obj->bounding_box.right >= obj->bounding_box.left 
                            || obj->bounding_box.top >= obj->bounding_box.bottom;
       connections = obj_node->xmlChildrenNode;
       while ((connections!=NULL) &&
@@ -309,7 +309,8 @@
 	    broken = TRUE;
 	  } else if (handle < 0 || handle >= obj->num_handles) {
 	    message_error(_("Error loading diagram.\n"
-			    "connection handle does not exist."));
+			    "connection handle %d does not exist on '%s'."),
+			    handle, to->type->name);
 	    broken = TRUE;
 	  } else {
 	    if (conn == -1) { /* Find named connpoint */
@@ -336,8 +337,8 @@
 	      }
 	    } else {
 	      message_error(_("Error loading diagram.\n"
-			      "connection point %s does not exist."),
-			    connstr);
+			      "connection point %d does not exist on '%s'."),
+			    conn, to->type->name);
 	      broken = TRUE;
 	    }
 	  }

Modified: trunk/lib/dia_image.c
==============================================================================
--- trunk/lib/dia_image.c	(original)
+++ trunk/lib/dia_image.c	Sun Jan 18 17:53:05 2009
@@ -92,7 +92,7 @@
      * only if there is something else wrong while loading it.
      */
     if (g_file_test(filename, G_FILE_TEST_EXISTS))
-      g_warning ("%s", error->message);
+      message_warning ("%s", error->message);
     g_error_free (error);
     return NULL;
   }

Modified: trunk/lib/libdia.def
==============================================================================
--- trunk/lib/libdia.def	(original)
+++ trunk/lib/libdia.def	Sun Jan 18 17:53:05 2009
@@ -534,6 +534,7 @@
  parent_move_child_delta
 
  pdtpp_true
+ pdtpp_is_visible
 
  persistence_load
  persistence_save

Modified: trunk/makefile.msc
==============================================================================
--- trunk/makefile.msc	(original)
+++ trunk/makefile.msc	Sun Jan 18 17:53:05 2009
@@ -58,7 +58,10 @@
 	cd python
 	nmake -f makefile.msc
 	cd ..\..
-	
+	cd tests
+	nmake -f makefile.msc
+	cd ..
+
 clean :
 	del config.h
 	cd lib
@@ -72,6 +75,9 @@
 	cd python
 	nmake -f makefile.msc clean
 	cd ..\..
+	cd tests
+	nmake -f makefile.msc clean
+	cd ..
 	
 build:
 	md build