← Back to branch summary

~ubuntu-branches/debian/experimental/inkscape/experimental

« back to all changes in this revision

Viewing changes to src/application/editor.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Thomas Viehmann
  • Date: 2008-09-09 23:29:02 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20080909232902-c50iujhk1w79u8e7
Tags: 0.46-2.1
http://bugs.debian.org/487623
* Non-maintainer upload.
* Add upstream patch fixing a crash in the open dialog
  in the zh_CN.utf8 locale. Closes: #487623.
  Thanks to Luca Bruno for the patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/application/editor.cpp
55
55
    return _instance;
56
56
}
57
57
 
58
 
Editor::Editor (gint argc, char **argv)
 
58
Editor::Editor (gint /*argc*/, char **argv)
59
59
:   _documents (0),
60
60
    _desktops (0),
61
61
    _argv0 (argv[0]),
109
109
void
110
110
Editor::addDocument (SPDocument *doc)
111
111
{
112
 
    g_assert (!g_slist_find (_instance->_documents, doc));
113
 
    _instance->_documents = g_slist_append (_instance->_documents, doc);
 
112
    if ( _instance->_document_set.find(doc) == _instance->_document_set.end() ) {
 
113
        _instance->_documents = g_slist_append (_instance->_documents, doc);
 
114
    }
 
115
    _instance->_document_set.insert(doc);
114
116
}
115
117
 
116
118
void
117
119
Editor::removeDocument (SPDocument *doc)
118
120
{
119
 
    g_assert (g_slist_find (_instance->_documents, doc));
120
 
    _instance->_documents = g_slist_remove (_instance->_documents, doc);
 
121
    _instance->_document_set.erase(doc);
 
122
    if ( _instance->_document_set.find(doc) == _instance->_document_set.end() ) {
 
123
        _instance->_documents = g_slist_remove (_instance->_documents, doc);
 
124
    }
121
125
}
122
126
 
123
127
SPDesktop*