dia r4282 - in trunk: . app plug-ins/dxf

[hans svn gnome org]

Author: hans
Date: Sun Feb 15 17:16:59 2009
New Revision: 4282
URL: http://svn.gnome.org/viewvc/dia?rev=4282&view=rev

Log:
2009-02-15  Hans Breuer  <hans breuer org>

	* app/interface.c : don't add "Standard - Outline" when !HAVE_CAIRO
	* app/create_tool.c : the error message for failing to create an object
	was assuming the typename to be valid (crashing during message)



Modified:
   trunk/ChangeLog
   trunk/app/create_object.c
   trunk/app/interface.c
   trunk/plug-ins/dxf/dxf-import.c

Modified: trunk/app/create_object.c
==============================================================================
--- trunk/app/create_object.c	(original)
+++ trunk/app/create_object.c	Sun Feb 15 17:16:59 2009
@@ -68,7 +68,7 @@
   if (!obj) {
     tool->moving = FALSE;
     tool->handle = NULL;
-    message_error(_("'%s' creation failed"), tool->objtype->name);
+    message_error(_("'%s' creation failed"), tool->objtype ? tool->objtype->name : "NULL");
     return;
   }
 

Modified: trunk/app/interface.c
==============================================================================
--- trunk/app/interface.c	(original)
+++ trunk/app/interface.c	Sun Feb 15 17:16:59 2009
@@ -238,12 +238,14 @@
     "I",
     "ToolsImage",
     { CREATE_OBJECT_TOOL, "Standard - Image", NULL }
+#ifdef HAVE_CAIRO
   },
   { NULL,
     N_("Outline"),
     NULL,
     "ToolsOutline",
     { CREATE_OBJECT_TOOL, "Standard - Outline", NULL }
+#endif
   }
 };
 

Modified: trunk/plug-ins/dxf/dxf-import.c
==============================================================================
--- trunk/plug-ins/dxf/dxf-import.c	(original)
+++ trunk/plug-ins/dxf/dxf-import.c	Sun Feb 15 17:16:59 2009
@@ -515,7 +515,7 @@
                     if( is_equal( start.y, end.y ))
                     {
                         continue; /* better than complaining? */
-                        g_warning(_("Bad vertex bulge\n") );
+                        g_warning("Bad vertex bulge");
                     }
                     else if( start.y > center.y )
                     {
@@ -533,7 +533,7 @@
                     if( is_equal( start.x, end.x ))
                     {
                         continue;
-                        g_warning( _("Bad vertex bulge\n") );
+                        g_warning("Bad vertex bulge");
                     }
                     else if( start.x > center.x )
                     {
@@ -1364,7 +1364,7 @@
 		}
 	    }
 	   else
-	     g_warning(_("Unknown dxf code %d\n"), data->code);
+	     g_warning("Unknown dxf code %d", data->code);
         }
     }while((data->code != 0) || (strcmp(data->value, "EOF") != 0));