Richard's patch for crash bug 402274

[inkscape.git] / src / document.cpp

diff --git a/src/document.cpp b/src/document.cpp
index 17057e1dc8327bbddf883d323b3e8d63526c3fd2..8503c7841e153a117d57f802ba133e898860d38c 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -572,25 +572,6 @@ gdouble sp_document_height(SPDocument *document)
     return root->height.computed;
 }
 
-void sp_document_set_landscape (SPDocument *document, gboolean landscape)
-{
-    SPRoot *root = SP_ROOT(document->root);
-
-    root->landscape = landscape;
-    SP_OBJECT (root)->updateRepr();
-}
-
-gboolean sp_document_landscape(SPDocument *document)
-{
-    g_return_val_if_fail(document != NULL, 0.0);
-    g_return_val_if_fail(document->priv != NULL, 0.0);
-    g_return_val_if_fail(document->root != NULL, 0.0);
-
-    SPRoot *root = SP_ROOT(document->root);
-
-    return root->landscape;
-}
-
 Geom::Point sp_document_dimensions(SPDocument *doc)
 {
     return Geom::Point(sp_document_width(doc), sp_document_height(doc));
@@ -919,16 +900,16 @@ SPDocument::_updateDocument()
  * Repeatedly works on getting the document updated, since sometimes
  * it takes more than one pass to get the document updated.  But it
  * usually should not take more than a few loops, and certainly never
- * more than 32 iterations.  So we bail out if we hit 32 iterations,
+ * more than 64 iterations.  So we bail out if we hit 64 iterations,
  * since this typically indicates we're stuck in an update loop.
  */
 gint
 sp_document_ensure_up_to_date(SPDocument *doc)
 {
-    int counter = 32;
+    int counter = 64;
     while (!doc->_updateDocument()) {
         if (counter == 0) {
-            g_warning("More than 32 iteration while updating document '%s'", doc->uri);
+            g_warning("More than 64 iteration while updating document '%s'", doc->uri? doc->uri:"<unknown URI, probably clipboard>");
             break;
         }
         counter--;