rpms/kipi-plugins/devel kipi-plugins-1.3.0-fix-unsafe.patch,1.1,1.2

[thomasj]

Author: thomasj

Update of /cvs/pkgs/rpms/kipi-plugins/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14793

Modified Files:
	kipi-plugins-1.3.0-fix-unsafe.patch 
Log Message:
changed the patch content

kipi-plugins-1.3.0-fix-unsafe.patch:
 IpodExportDialog.cpp |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Index: kipi-plugins-1.3.0-fix-unsafe.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kipi-plugins/devel/kipi-plugins-1.3.0-fix-unsafe.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kipi-plugins-1.3.0-fix-unsafe.patch	9 Jun 2010 14:29:34 -0000	1.1
+++ kipi-plugins-1.3.0-fix-unsafe.patch	9 Jun 2010 15:34:14 -0000	1.2
@@ -1,14 +1,39 @@
 --- ipodexport/IpodExportDialog.cpp	2010-06-08 00:02:11.000000000 +0200
 +++ ipodexport/IpodExportDialog.cpp.old	2010-06-09 16:24:06.000000000 +0200
-@@ -21,6 +21,11 @@
-  *
-  * ============================================================ */
+@@ -23,6 +23,13 @@
  
+ #include "IpodExportDialog.moc"
+ 
++// Libgdk includes.
 +
-+#define protected protected_
-+#include <gio/gdbusintrospection.h>
-+#undef protected
++extern "C"
++{
++#include <gdk-pixbuf/gdk-pixbuf.h>
++}
 +
- #include "IpodExportDialog.moc"
+ // Qt includes
+ 
+ #include <QDir>
+@@ -60,13 +67,6 @@
+ #include <ktoolinvocation.h>
+ #include <kurl.h>
+ 
+-// Libgdk includes.
+-
+-extern "C"
+-{
+-#include <gdk-pixbuf/gdk-pixbuf.h>
+-}
+-
+ // Local includes
+ 
+ #include "IpodHeader.h"
+@@ -113,7 +113,7 @@
+                                            KAboutData::License_GPL,
+                                            ki18n("A tool to export image to an iPod device"),
+                                            ki18n("(c) 2006-2008, Seb Ruiz\n"
+-                                                 "(c) 2008-2009, Gilles Caulier"));
++                                                 "(c) 2008-2010, Gilles Caulier"));
  
- // Libgdk includes.
+     m_about->addAuthor(ki18n("Seb Ruiz"), ki18n("Author and Maintainer"),
+                        "ruiz at kde.org");