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

[thomasj]

Author: thomasj

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

Modified Files:
	kipi-plugins-1.3.0-fix-unsafe.patch 
Log Message:
another try to fix it

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

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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kipi-plugins-1.3.0-fix-unsafe.patch	9 Jun 2010 15:34:14 -0000	1.2
+++ kipi-plugins-1.3.0-fix-unsafe.patch	10 Jun 2010 06:07:47 -0000	1.3
@@ -1,39 +1,20 @@
 --- ipodexport/IpodExportDialog.cpp	2010-06-08 00:02:11.000000000 +0200
-+++ ipodexport/IpodExportDialog.cpp.old	2010-06-09 16:24:06.000000000 +0200
-@@ -23,6 +23,13 @@
++++ ipodexport/IpodExportDialog.cpp.old	2010-06-10 08:03:53.000000000 +0200
+@@ -21,14 +21,17 @@
+  *
+  * ============================================================ */
  
- #include "IpodExportDialog.moc"
- 
-+// Libgdk includes.
-+
-+extern "C"
-+{
-+#include <gdk-pixbuf/gdk-pixbuf.h>
-+}
 +
- // Qt includes
+ #include "IpodExportDialog.moc"
  
- #include <QDir>
-@@ -60,13 +67,6 @@
- #include <ktoolinvocation.h>
- #include <kurl.h>
++#define signals glib_signals
+ // Libgdk includes.
  
--// Libgdk includes.
--
--extern "C"
--{
--#include <gdk-pixbuf/gdk-pixbuf.h>
--}
--
- // Local includes
+ extern "C"
+ {
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ }
++#undef signals
  
- #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"));
+ // Qt includes
  
-     m_about->addAuthor(ki18n("Seb Ruiz"), ki18n("Author and Maintainer"),
-                        "ruiz at kde.org");