fixed previous commit again

psi-plus · Aug 13, 2013 · bca00d2 · bca00d2
1 parent ef900ff
commit bca00d2
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/patches/8000-psi-extend-plugins-interface.diff b/patches/8000-psi-extend-plugins-interface.diff
@@ -1730,8 +1730,8 @@ index fd5ecb7..77a9ce3 100644
 
  	// IqFilteringHost
  	void addIqNamespaceFilter(const QString& ns, IqNamespaceFilter* filter);
-@@ -70,25 +97,122 @@ public:
-
+@@ -70,25 +99,123 @@ public:
+ 
  	// OptionAccessingHost
  	void setPluginOption(const QString& option, const QVariant& value);
 -	QVariant getPluginOption(const QString& option);
@@ -1826,7 +1826,7 @@ index fd5ecb7..77a9ce3 100644
 +	void createNewEvent(int account, const QString& jid, const QString& descr, QObject *receiver, const char* slot);
 +
 +	void playSound(const QString& fileName);
-
+ 
  private:
  	PluginManager* manager_;
 -	QObject* plugin_;
@@ -1836,25 +1836,26 @@ index fd5ecb7..77a9ce3 100644
  	QString shortName_;
  	QString version_;
 +	int priority_;
++	QIcon icon_;
  	QPluginLoader* loader_;
 +	Iconset* iconset_;
-
+ 
  	bool valid_;
  	bool connected_;
  	bool enabled_;
 +	bool hasInfo_;
 +	QString infoString_;
-
+ 
  	QMultiMap<QString, IqNamespaceFilter*> iqNsFilters_;
  	QMultiMap<QRegExp, IqNamespaceFilter*> iqNsxFilters_;
 +	QList< QVariantHash > buttons_;
 +	QList< QVariantHash > gcbuttons_;
 +
 +	QList< QVariantHash > accMenu_;
 +	QList< QVariantHash > contactMenu_;
-
+ 
  	bool loadPlugin(QObject* pluginObject);
-
+ 
 diff --git a/src/pluginmanager.cpp b/src/pluginmanager.cpp
 index 5d3fea6..7b2898f 100644
 --- a/src/pluginmanager.cpp