← Back to branch summary

~ubuntu-branches/debian/stretch/psi-plus/stretch

« back to all changes in this revision

Viewing changes to src/options/opt_application.cpp

  • Committer: Package Import Robot
  • Author(s): Boris Pek
  • Date: 2013-10-23 02:42:20 UTC
  • mfrom: (1.4.7)
  • Revision ID: package-import@ubuntu.com-20131023024220-bk2hyoenqkwfhpgw
Tags: 0.16.242-1
http://bugs.debian.org/724880
* New upstream release:
  fixed the problem of initialization of private conversation when both
  sides use libotr 4.0.x. (Closes: #724880)
* Update debian/watch: sources were moved.
* Delete psi-plus-content-downloader package and update all related files.
  This plugin is in psi-plus-plugins package now.
* Update debian/control:
  - remove all currently unneeded Replaces and Breaks fields
  - add build dependency on libidn11-dev
* Update debian/rules: simplify get-orig-source section.
* Update debian/copyright:
  - update Source field due to changes in sources location
  - remove copyright holders whose code was deleted from source tree
    (bundled libidn library was removed)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/options/opt_application.cpp
88
88
        return w;
89
89
}
90
90
 
91
 
void OptionsTabApplication::setHaveAutoUpdater(bool b) 
 
91
void OptionsTabApplication::setHaveAutoUpdater(bool b)
92
92
{
93
93
        haveAutoUpdater_ = b;
94
94
}
105
105
 
106
106
        // Auto-update
107
107
        PsiOptions::instance()->setOption("options.auto-update.check-on-startup", d->ck_autoUpdate->isChecked());
108
 
        
 
108
 
109
109
        // docklet
110
110
        PsiOptions::instance()->setOption("options.ui.systemtray.enable", d->ck_docklet->isChecked());
111
111
        PsiOptions::instance()->setOption("options.ui.systemtray.use-double-click", d->ck_dockDCstyle->isChecked());
144
144
        }
145
145
        else {
146
146
                set.remove(ApplicationInfo::name());
147
 
        } 
 
147
        }
148
148
#endif
149
149
#ifdef HAVE_X11
150
150
        QDir home = QDir::home();