← Back to branch summary

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

« back to all changes in this revision

Viewing changes to src/interface/context_control.cpp

  • Committer: Package Import Robot
  • Author(s): Adrien Cunin
  • Date: 2012-12-07 17:17:17 UTC
  • mfrom: (1.1.31)
  • Revision ID: package-import@ubuntu.com-20121207171717-nt6as62u4pa1uv11
Tags: 3.6.0.2-1ubuntu1
* Merge from Debian experimental. Remaining Ubuntu change:
   - Added debian/patches/11_use-decimal-si-by-default.patch in order to
     comply with UnitsPolicy

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/interface/context_control.cpp
52
52
        Freeze();
53
53
 
54
54
        CState* pState = 0;
55
 
        
 
55
 
56
56
        // See if we can reuse an existing context
57
57
        for (size_t i = 0; i < m_context_controls.size(); i++)
58
58
        {
59
59
                if (m_context_controls[i].tab_index != -1)
60
60
                        continue;
61
 
                
 
61
 
62
62
                if (m_context_controls[i].pState->IsRemoteConnected() ||
63
63
                        !m_context_controls[i].pState->IsRemoteIdle())
64
64
                        continue;
275
275
        {
276
276
                context_controls.tab_index = 0;
277
277
                context_controls.site_bookmarks = new CContextControl::_context_controls::_site_bookmarks;
278
 
                
 
278
 
279
279
                context_controls.site_bookmarks->path = COptions::Get()->GetOption(OPTION_LAST_CONNECTED_SITE);
280
280
                CSiteManager::GetBookmarks(context_controls.site_bookmarks->path,
281
281
                        context_controls.site_bookmarks->bookmarks);