← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/options/opt_events.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_events.cpp
55
55
                " not already in your list of contacts."));
56
56
        d->cb_animation->setWhatsThis(
57
57
                tr("What kind of animation should psi use for incoming event icons on the main window?"));
58
 
        
 
58
 
59
59
        d->cb_animation->setItemData ( 0, "no");
60
60
        d->cb_animation->setItemData ( 1, "blink");
61
61
        d->cb_animation->setItemData ( 2, "animate");
70
70
        d->ck_notifyAuth->setWhatsThis(
71
71
                tr("Makes Psi notify you when your authorization request was approved."));
72
72
 
73
 
        
 
73
 
74
74
        d->cb_bounce->setItemData(0, "never");
75
75
        d->cb_bounce->setItemData(1, "once");
76
76
        d->cb_bounce->setItemData(2, "forever");
77
 
        
 
77
 
78
78
#ifndef Q_OS_MAC
79
79
        d->cb_bounce->hide();
80
80
        d->lb_bounce->hide();