Mailinglist Archive: opensuse-commit (1139 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kdebase3
checked in at Tue Jan 16 09:22:34 CET 2007.

--------
--- KDE/kdebase3/kdebase3.changes	2007-01-13 20:24:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes	2007-01-16 02:59:10.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Jan 16 02:58:56 CET 2007 - ltinkl@xxxxxxx
+
+- update patch to fix #215262
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.f26652/_old	2007-01-16 09:17:23.000000000 +0100
+++ /var/tmp/diff_new_pack.f26652/_new	2007-01-16 09:17:23.000000000 +0100
@@ -52,7 +52,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://www.kde.org/
 Version:        3.5.5
-Release:        99
+Release:        100
 %define	kde_version	3.5.5
 Source0:        kdebase-%{kde_version}.tar.bz2
 Source3:        startkde.suse.sh
@@ -387,7 +387,7 @@
 Summary:        Set and list fileshares
 Group:          System/Management
 Version:        2.0
-Release:        232
+Release:        233
 
 %description -n fileshareset
 This package contains the the fileshareset utility to allow users to
@@ -1531,6 +1531,8 @@
 %endif
 
 %changelog -n kdebase3
+* Tue Jan 16 2007 - ltinkl@xxxxxxx
+- update patch to fix #215262
 * Sat Jan 13 2007 - stbinner@xxxxxxx
 - context menu entry in lock/lockout applet to switch button order
 * Thu Jan 11 2007 - stbinner@xxxxxxx
















++++++ suspend-unmount.diff ++++++
--- /var/tmp/diff_new_pack.f26652/_old	2007-01-16 09:17:28.000000000 +0100
+++ /var/tmp/diff_new_pack.f26652/_new	2007-01-16 09:17:28.000000000 +0100
@@ -1,8 +1,60 @@
+Index: kioslave/media/libmediacommon/medium.cpp
+===================================================================
+--- kioslave/media/libmediacommon/medium.cpp	(revision 619490)
++++ kioslave/media/libmediacommon/medium.cpp	(working copy)
+@@ -42,6 +42,7 @@
+ 	loadUserLabel();
+ 
+ 	m_halmounted = false;
++    m_isHotplug = false;
+ }
+ 
+ Medium::Medium()
+@@ -59,8 +60,9 @@
+ 	m_properties+= QString::null; /* BASE_URL */
+ 	m_properties+= QString::null; /* MIME_TYPE */
+ 	m_properties+= QString::null; /* ICON_NAME */
+-	
++
+ 	m_halmounted = false;
++    m_isHotplug = false;
+ }
+ 
+ const Medium Medium::create(const QStringList &properties)
+Index: kioslave/media/libmediacommon/medium.h
+===================================================================
+--- kioslave/media/libmediacommon/medium.h	(revision 619490)
++++ kioslave/media/libmediacommon/medium.h	(working copy)
+@@ -82,18 +82,22 @@
+ 	void setHalMounted(bool flag) const { m_halmounted = flag; }
+ 	bool halMounted() const { return m_halmounted; }
+ 
++    void setIsHotplug( bool state ) { m_isHotplug = state; }
++    bool isHotplug() const { return m_isHotplug; }
++
+ private:
+ 	Medium();
+ 	void loadUserLabel();
+ 
+ 	QStringList m_properties;
+ 	mutable bool m_halmounted;
+-	
++    bool m_isHotplug;
++
+ friend class QValueListNode<const Medium>;
+ };
+ 
+ namespace MediaManagerUtils {
+-  static inline QMap<QString,QString> splitOptions(const QStringList & options) 
++  static inline QMap<QString,QString> splitOptions(const QStringList & options)
+     {
+       QMap<QString,QString> valids;
+ 
 Index: kioslave/media/mediamanager/mediamanager.cpp
 ===================================================================
---- kioslave/media/mediamanager/mediamanager.cpp	(revision 595653)
+--- kioslave/media/mediamanager/mediamanager.cpp	(revision 619490)
 +++ kioslave/media/mediamanager/mediamanager.cpp	(working copy)
-@@ -326,7 +326,54 @@
+@@ -330,7 +330,54 @@
      emit mediumChanged(name);
  }
  
@@ -17,7 +69,7 @@
 +
 +    for (; it!=end; ++it)
 +    {
-+        if ( (*it)->isMounted() )
++        if ( (*it)->isMounted() && (*it)->isHotplug() )
 +        {
 +            QString tmp = unmount( (*it)->id() );
 +            if ( !tmp.isEmpty() ) // umount failed
@@ -57,9 +109,22 @@
  extern "C" {
      KDE_EXPORT KDEDModule *create_mediamanager(const QCString &obj)
      {
+Index: kioslave/media/mediamanager/halbackend.cpp
+===================================================================
+--- kioslave/media/mediamanager/halbackend.cpp	(revision 619490)
++++ kioslave/media/mediamanager/halbackend.cpp	(working copy)
+@@ -445,6 +445,8 @@
+         libhal_volume_get_fstype(halVolume),			/* Filesystem type */
+         libhal_volume_is_mounted(halVolume) );			/* Mounted ? */
+ 
++    medium->setIsHotplug( libhal_drive_is_hotpluggable(halDrive) );
++
+     char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);
+     QString volume_name = QString::fromUtf8(name);
+     QString media_name = volume_name;
 Index: kioslave/media/mediamanager/mediamanager.h
 ===================================================================
---- kioslave/media/mediamanager/mediamanager.h	(revision 598657)
+--- kioslave/media/mediamanager/mediamanager.h	(revision 619490)
 +++ kioslave/media/mediamanager/mediamanager.h	(working copy)
 @@ -58,6 +58,20 @@
  	bool removableUnplug(const QString &devNode);
@@ -99,3 +164,16 @@
  };
  
  #endif
+Index: kioslave/media/mediamanager/halbackend.h
+===================================================================
+--- kioslave/media/mediamanager/halbackend.h	(revision 619490)
++++ kioslave/media/mediamanager/halbackend.h	(working copy)
+@@ -96,6 +96,8 @@
+ 	QString mount(const Medium *medium);
+ 	QString unmount(const QString &id);
+ 
++    static bool isHotplug( const QString & id );
++
+ private:
+ 	/**
+ 	* Append a device in the media list. This function will check if the device




++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx