[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/knotify
From:       Aurélien Gâteau <agateau () kde ! org>
Date:       2009-07-16 12:56:06
Message-ID: 1247748966.873422.8464.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 997754 by gateau:

Use the correct format for image_data hint

 M  +1 -0      CMakeLists.txt  
 A             imageconverter.cpp   [License: GPL (v2+)]
 A             imageconverter.h   [License: GPL (v2+)]
 M  +5 -2      notifybypopup.cpp  


--- trunk/KDE/kdebase/runtime/knotify/CMakeLists.txt #997753:997754
@@ -12,6 +12,7 @@
 notifybytaskbar.cpp
 notifybyexecute.cpp
 notifybyktts.cpp
+imageconverter.cpp
 )
 
 qt4_add_dbus_interfaces(knotify_SRCS ${KDE4_DBUS_INTERFACES_DIR}/org.kde.KSpeech.xml)
--- trunk/KDE/kdebase/runtime/knotify/notifybypopup.cpp #997753:997754
@@ -20,6 +20,7 @@
 
 #include "notifybypopup.h"
 #include "knotifyconfig.h"
+#include "imageconverter.h"
 
 #include <kdebug.h>
 #include <kpassivepopup.h>
@@ -378,8 +379,10 @@
 
 	QVariantMap map;
 	// let's see if we've got an image, and store the image in the hints map
-	if (!config->image.isNull())
-		map["image_data"] = config->image.data();
+	if (!config->image.isNull()) {
+		QImage image = config->image.toImage();
+		map["image_data"] = ImageConverter::variantForImage(image);
+	}
 
 	args.append( map ); // hints
 	args.append( timeout ); // expire timout
[prev in list] [next in list] [prev in thread] [next in thread]