← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/plugins/generic/otrplugin/src/psiotrplugin.h

  • 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/plugins/generic/otrplugin/src/psiotrplugin.h
77
77
                     public IconFactoryAccessor,
78
78
                     public OtrCallback
79
79
{
80
 
Q_OBJECT
81
 
Q_INTERFACES(PsiPlugin
82
 
             PluginInfoProvider
83
 
             EventFilter
84
 
             OptionAccessor
85
 
             StanzaSender
86
 
             ApplicationInfoAccessor
87
 
             PsiAccountController
88
 
             StanzaFilter
89
 
             ToolbarIconAccessor
90
 
             AccountInfoAccessor
91
 
             ContactInfoAccessor
92
 
             IconFactoryAccessor)
 
80
    Q_OBJECT
 
81
#ifdef HAVE_QT5
 
82
    Q_PLUGIN_METADATA(IID "com.psi-plus.PsiOtrPlugin")
 
83
#endif
 
84
    Q_INTERFACES(PsiPlugin
 
85
                 PluginInfoProvider
 
86
                 EventFilter
 
87
                 OptionAccessor
 
88
                 StanzaSender
 
89
                 ApplicationInfoAccessor
 
90
                 PsiAccountController
 
91
                 StanzaFilter
 
92
                 ToolbarIconAccessor
 
93
                 AccountInfoAccessor
 
94
                 ContactInfoAccessor
 
95
                 IconFactoryAccessor)
93
96
 
94
97
public:
95
98
    PsiOtrPlugin();
104
107
    virtual bool disable();
105
108
    virtual void applyOptions();
106
109
    virtual void restoreOptions();
 
110
    virtual QPixmap icon() const;
107
111
 
108
112
    // PluginInfoProvider
109
113
    virtual QString pluginInfo();