Reverting fix for Bug #1022543.

(bzr r12341)

1 files changed, 7 insertions, 9 deletions

diff --git a/src/document.cpp b/src/document.cpp
index 2fc6d3bc6..706710cfc 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -84,7 +84,6 @@ static gint sp_document_rerouting_handler(gpointer data);
 gboolean sp_document_resource_list_free(gpointer key, gpointer value, gpointer data);
 
 static gint doc_count = 0;
-static gint doc_mem_count = 0;
 
 static unsigned long next_serial = 0;
 
@@ -481,18 +480,17 @@ SPDocument *SPDocument::createNewDoc(gchar const *uri, unsigned int keepalive, b
             base = NULL;
             name = g_strdup(uri);
         }
-        if (make_new) {
-            name = g_strdup_printf(_("New document %d"), ++doc_count);
-        }
         g_free(s);
     } else {
-        if (make_new) {
-            name = g_strdup_printf(_("Memory document %d"), ++doc_mem_count);
-        }
-
         rdoc = sp_repr_document_new("svg:svg");
     }
 
+    if (make_new) {
+        base = NULL;
+        uri = NULL;
+        name = g_strdup_printf(_("New document %d"), ++doc_count);
+    }
+
     //# These should be set by now
     g_assert(name);
 
@@ -516,7 +514,7 @@ SPDocument *SPDocument::createNewDocFromMem(gchar const *buffer, gint length, un
             // If xml file is not svg, return NULL without warning
             // TODO fixme: destroy document
         } else {
-            Glib::ustring name = Glib::ustring::compose( _("Memory document %1"), ++doc_mem_count );
+            Glib::ustring name = Glib::ustring::compose( _("Memory document %1"), ++doc_count );
             doc = createDoc(rdoc, NULL, NULL, name.c_str(), keepalive);
         }
     }