~ubuntu-branches/ubuntu/quantal/kdevplatform/quantal-proposed

« back to all changes in this revision

Viewing changes to .pc/kubuntu_01_appmenu_fix.diff/sublime/mainwindow.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Bhargav Mangipudi
  • Date: 2010-12-16 19:31:23 UTC
  • mfrom: (0.3.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20101216193123-xe2keh5754zwsn1t
Tags: 1.1.80-0ubuntu1
* New upstream release
  - kdevplatform2-libs is now kdevplatform3-libs due to ABI changes
  - Update kdevplatform3-libs.install to include l10n files
  - Update kdevplatform-dev.install
* Removed localization packages

Show diffs side-by-side

added added

removed removed

Lines of Context:
120
120
    if (d->area)
121
121
        disconnect(d->area, 0, this, 0);
122
122
    
 
123
    bool wasEnabled = updatesEnabled();
 
124
    setUpdatesEnabled(false);
 
125
 
123
126
    bool differentArea = (area != d->area);
124
127
    /* All views will be removed from dock area now.  However, this does
125
128
       not mean those are removed from area, so prevent slotDockShown
145
148
    d->ignoreDockShown = false;
146
149
    
147
150
    loadSettings();
148
 
        
 
151
 
 
152
    setUpdatesEnabled(wasEnabled);
 
153
 
149
154
    connect(area, SIGNAL(viewAdded(Sublime::AreaIndex*, Sublime::View*)),
150
155
        this, SLOT(viewAdded(Sublime::AreaIndex*, Sublime::View*)));
151
156
    connect(area, SIGNAL(viewRemoved(Sublime::AreaIndex*,Sublime::View*)),