← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/plugins/generic/screenshotplugin/screenshotplugin.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/plugins/generic/screenshotplugin/screenshotplugin.cpp
43
43
                public IconFactoryAccessor, public MenuAccessor, public ApplicationInfoAccessor
44
44
{
45
45
        Q_OBJECT
 
46
#ifdef HAVE_QT5
 
47
        Q_PLUGIN_METADATA(IID "com.psi-plus.ScreenshotPlugin")
 
48
#endif
46
49
        Q_INTERFACES(PsiPlugin OptionAccessor ShortcutAccessor PluginInfoProvider IconFactoryAccessor MenuAccessor ApplicationInfoAccessor)
47
50
 
48
51
public:
69
72
        virtual void restoreOptions();
70
73
 
71
74
        virtual QString pluginInfo();
 
75
        virtual QPixmap icon() const;
72
76
 
73
77
 
74
78
private slots:
88
92
        Controller* controller_;
89
93
};
90
94
 
 
95
#ifndef HAVE_QT5
91
96
Q_EXPORT_PLUGIN(ScreenshotPlugin);
 
97
#endif
92
98
 
93
99
ScreenshotPlugin::ScreenshotPlugin()
94
100
        : enabled_(false)
237
243
                     + tr("\n\nSettings for authorization on some hostings can be found here: http://code.google.com/p/qscreenshot/wiki/Authorization");
238
244
}
239
245
 
 
246
QPixmap ScreenshotPlugin::icon() const
 
247
{
 
248
        return QPixmap(":/screenshotplugin/screenshot.png");
 
249
}
 
250
 
240
251
#include "screenshotplugin.moc"