dia r4055 - in trunk: . data lib sheets

[hans svn gnome org]

Author: hans
Date: Mon May 26 18:49:26 2008
New Revision: 4055
URL: http://svn.gnome.org/viewvc/dia?rev=4055&view=rev

Log:
2008-05-26  Hans Breuer  <hans breuer org>

	* lib/diagdkrenderer.c : don't rely on shortcut evaluation working
	with the preprocessor, fixes bug #534801 

	* sheets/checktrans.py : gracefully fail on missing dependencies.
	The translation report is not crucial for building. Fixes bug #391965

	data/popup-ui.xml : get rid of Diagram menu here as well



Modified:
   trunk/ChangeLog
   trunk/data/popup-ui.xml
   trunk/lib/diagdkrenderer.c
   trunk/sheets/checktrans.py

Modified: trunk/data/popup-ui.xml
==============================================================================
--- trunk/data/popup-ui.xml	(original)
+++ trunk/data/popup-ui.xml	Mon May 26 18:49:26 2008
@@ -34,13 +34,9 @@
 			<menuitem name="EditCuttext" action="EditCuttext" />
 			<menuitem name="EditPastetext" action="EditPastetext" />
 			<separator name="EditSep4" />
-			<separator name="EditExtensionStart" />
-		</menu>
-		<menu name="Diagram" action="Diagram">
 			<menuitem name="DiagramProperties" action="DiagramProperties" />
 			<menuitem name="DiagramLayers" action="DiagramLayers" />
-			<separator name="DiagramSep1" />
-			<separator name="DIagramExtensionStart" />
+			<separator name="EditExtensionStart" />
 		</menu>
 		<menu name="View" action="View">
 			<menuitem name="ViewZoomin" action="ViewZoomin" />

Modified: trunk/lib/diagdkrenderer.c
==============================================================================
--- trunk/lib/diagdkrenderer.c	(original)
+++ trunk/lib/diagdkrenderer.c	Mon May 26 18:49:26 2008
@@ -698,14 +698,20 @@
 
     layout = dia_font_build_layout(text, text_line->font,
 				   dia_transform_length(renderer->transform, text_line->height)/20.0);
-#if defined PANGO_VERSION_ENCODE && (PANGO_VERSION >= PANGO_VERSION_ENCODE(1,16,0))
+#if defined(PANGO_VERSION_ENCODE)
+#  if (PANGO_VERSION >= PANGO_VERSION_ENCODE(1,16,0))
     /* I'd say the former Pango API was broken, i.e. leaky */
-    text_line_adjust_layout_line(text_line, pango_layout_get_line_readonly(layout, 0),
-				scale/20.0);
+#    define HAVE_pango_layout_get_line_readonly
+#   endif
+#endif
+    text_line_adjust_layout_line (text_line, 
+#if defined(HAVE_pango_layout_get_line_readonly)
+                                  pango_layout_get_line_readonly(layout, 0),
 #else
-    text_line_adjust_layout_line(text_line, pango_layout_get_line(layout, 0),
-				scale/20.0);
+                                  pango_layout_get_line(layout, 0),
 #endif
+				  scale/20.0);
+
     if (renderer->highlight_color != NULL) {
       draw_highlighted_string(renderer, layout, x, y, &gdkcolor);
     } else {

Modified: trunk/sheets/checktrans.py
==============================================================================
--- trunk/sheets/checktrans.py	(original)
+++ trunk/sheets/checktrans.py	Mon May 26 18:49:26 2008
@@ -20,10 +20,13 @@
 #
 
 
-
-from xml.sax import saxexts
-from xml.sax import saxlib
 import os,sys,string
+try :
+	from xml.sax import saxexts
+	from xml.sax import saxlib
+except ImportError :
+	print "Missing dependencies: no translation report"
+	sys.exit(0)
 
 class CounterHandler(saxlib.DocumentHandler):