← Back to branch summary

~ubuntu-branches/debian/sid/filezilla/sid

« back to all changes in this revision

Viewing changes to src/interface/recentserverlist.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Adam Cécile (Le_Vert)
  • Date: 2008-07-05 21:00:24 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20080705210024-mvzp21zlyheschi6
Tags: 3.0.11.1-1
* wxWidgets 2.8 just entered unstable ! Upload to unstable.
* New upstream release.
* Bump Standards-Version to 3.8.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/interface/recentserverlist.cpp
13
13
        if (lockMutex)
14
14
                mutex.Lock();
15
15
 
16
 
        if (!m_XmlFile.Loaded())
 
16
        if (!m_XmlFile.HasFileName() || m_XmlFile.Modified())
17
17
                m_XmlFile.Load(_T("recentservers"));
18
 
        else if (!m_XmlFile.Reload(false))
 
18
        else
19
19
                return m_mostRecentServers;
20
20
 
21
21
        TiXmlElement* pElement = m_XmlFile.GetElement();
108
108
        m_mostRecentServers.clear();
109
109
 
110
110
        CInterProcessMutex mutex(MUTEX_MOSTRECENTSERVERS);
111
 
        if (!m_XmlFile.Loaded())
112
 
                m_XmlFile.Load(_T("recentservers"));
113
 
 
114
 
        TiXmlElement* pDocument = m_XmlFile.GetElement();
115
 
        if (!pDocument)
116
 
                return;
117
 
        
118
 
        TiXmlElement* pElement = pDocument->FirstChildElement("RecentServers");
119
 
        if (!pElement)
120
 
                pElement = pDocument->InsertEndChild(TiXmlElement("RecentServers"))->ToElement();
121
 
 
122
 
        pElement->Clear();
 
111
        if (!m_XmlFile.HasFileName())
 
112
                m_XmlFile.SetFileName(_T("recentservers"));
 
113
 
 
114
        m_XmlFile.CreateEmpty();
123
115
 
124
116
        wxString error;
125
117
        m_XmlFile.Save(&error);