rpms/kdebase/FC-5 kdebase-3.5.2-dbus.patch,1.2,1.3

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv6245

Modified Files:
	kdebase-3.5.2-dbus.patch 
Log Message:
update kdebase-3.5.2-dbus.patch


kdebase-3.5.2-dbus.patch:
 kdebase-3.5.1/kioslave/media/configure.in.in             |   66 -
 kdebase-3.5.1/kioslave/media/mediamanager/connection.cpp |  168 ++++
 kdebase-3.5.1/kioslave/media/mediamanager/connection.h   |   86 ++
 kdebase-3.5.1/kioslave/media/mediamanager/integrator.cpp |  244 ++++++
 kdebase-3.5.1/kioslave/media/mediamanager/integrator.h   |   95 ++
 kdebase-3.5.1/kioslave/media/mediamanager/message.cpp    |  551 +++++++++++++++
 kdebase-3.5.1/kioslave/media/mediamanager/message.h      |  132 +++
 kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am    |   11 
 kdebase-3.5.2/kioslave/media/mediamanager/halbackend.h   |    2 
 9 files changed, 1286 insertions(+), 69 deletions(-)

Index: kdebase-3.5.2-dbus.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase-3.5.2-dbus.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdebase-3.5.2-dbus.patch	4 Apr 2006 09:54:44 -0000	1.2
+++ kdebase-3.5.2-dbus.patch	28 Apr 2006 16:57:14 -0000	1.3
@@ -1298,7 +1298,7 @@
 +}
 +
 +#endif
---- kdebase-3.5.1/kioslave/media/configure.in.in.tn	2006-01-26 15:45:06.000000000 +0100
+--- kdebase-3.5.1/kioslave/media/configure.in.in.dbus	2006-01-26 15:45:06.000000000 +0100
 +++ kdebase-3.5.1/kioslave/media/configure.in.in	2006-01-26 15:53:54.000000000 +0100
 @@ -106,70 +106,6 @@
  
@@ -1416,3 +1416,14 @@
  
  kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
  kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version
+--- kdebase-3.5.2/kioslave/media/mediamanager/halbackend.h.tn	2006-04-28 18:53:18.000000000 +0200
++++ kdebase-3.5.2/kioslave/media/mediamanager/halbackend.h	2006-04-28 18:53:35.000000000 +0200
+@@ -40,7 +40,7 @@
+ /* We acknowledge the the dbus API is unstable */
+ #define DBUS_API_SUBJECT_TO_CHANGE
+ /* DBus-Qt bindings */
+-#include <dbus/connection.h>
++#include <connection.h>
+ /* HAL libraries */
+ #include <libhal.h>
+ #include <libhal-storage.h>