Attachment #1358 for bug #1499

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1499
Collapse All | Expand All

Lines 46-51 Link Here

(-)./tdeioslave/media/libmediacommon/medium.cpp.ori (+2 lines)
46	loadUserLabel();	46	loadUserLabel();
47		47
48	m_halmounted = false;	48	m_halmounted = false;
		49	m_isHotplug = false;
49	}	50	}
50		51
51	Medium::Medium()	52	Medium::Medium()
Lines 69-74 Link Here
69	m_properties+= "false"; /* HIDDEN */	70	m_properties+= "false"; /* HIDDEN */
70		71
71	m_halmounted = false;	72	m_halmounted = false;
		73	m_isHotplug = false;
72	}	74	}
73		75
74	const Medium Medium::create(const TQStringList &properties)	76	const Medium Medium::create(const TQStringList &properties)

Lines 92-97 Link Here

(-)./tdeioslave/media/libmediacommon/medium.h.ORI (+5 lines)
92	void setHalMounted(bool flag) const { m_halmounted = flag; }	92	void setHalMounted(bool flag) const { m_halmounted = flag; }
93	bool halMounted() const { return m_halmounted; }	93	bool halMounted() const { return m_halmounted; }
94		94
		95	void setIsHotplug( bool state ) { m_isHotplug = state; }
		96	bool isHotplug() const { return m_isHotplug; }
		97
95	//private:	98	//private:
96	Medium();	99	Medium();
97		100
Lines 100-105 Link Here
100		103
101	TQStringList m_properties;	104	TQStringList m_properties;
102	mutable bool m_halmounted;	105	mutable bool m_halmounted;
		106
		107	bool m_isHotplug;
103		108
104	friend class TQValueListNode<const Medium>;	109	friend class TQValueListNode<const Medium>;
105	};	110	};




    emit mediumChanged(name);
}

TQString MediaManager::unmountAllSuspend()
{
    TQPtrList<Medium> list = m_mediaList.list();

    TQPtrList<Medium>::const_iterator it = list.begin();
    TQPtrList<Medium>::const_iterator end = list.end();

    TQString result;

    for (; it!=end; ++it)
    {
        if ( (*it)->isMounted() && (*it)->isHotplug() )
        {
            TQString tmp = unmount( (*it)->id() );
            if ( !tmp.isEmpty() ) { // umount failed
                result = tmp;
            } else {
                m_suspendResumeMountList.append( (*it)->id() );
            }
        }
    }

    // return last error
    return result;
}

TQString MediaManager::remountAllResume()
{
    TQString result;

    for (TQStringList::const_iterator it = m_suspendResumeMountList.begin();
         it != m_suspendResumeMountList.end();
         ++it)
    {
        const Medium *m = m_mediaList.findById(*it);

        if ( m && m->needMounting() )
        {
            TQString tmp = mount( *it );
            if ( !tmp.isEmpty() ) { // mount failed
                result = tmp;
            }
        }
    }

    m_suspendResumeMountList.clear();

    // return last error
    return result;
}


extern "C" {
    KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)




	bool removableUnplug(const TQString &devNode);
	bool removableCamera(const TQString &devNode);

       /**
         * Unmount manually all partitions when going to suspend
         *
         * @return last error if any
         */
        TQString unmountAllSuspend();

        /**
         * Remount previously unmounted partitions in unmountAllSuspend()
         *
         * @return last error if any
         */
        TQString remountAllResume();

k_dcop_signals:
	void mediumAdded(const TQString &name, bool allowNotification);
	void mediumRemoved(const TQString &name, bool allowNotification);

	TDEBackend *m_tdebackend;
	MediaDirNotify m_dirNotify;
	FstabBackend *m_fstabbackend;
	TQStringList m_suspendResumeMountList;
};

#endif

Lines 541-546 Link Here

(-)./tdeioslave/media/mediamanager/halbackend.cpp.ori (+1 lines)
541	libhal_volume_is_mounted(halVolume) ); /* Mounted ? */	541	libhal_volume_is_mounted(halVolume) ); /* Mounted ? */
542	}	542	}
543		543
		544	medium->setIsHotplug( libhal_drive_is_hotpluggable(halDrive) );
544		545
545	char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);	546	char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy);
546	TQString volume_name = TQString::fromUtf8(name);	547	TQString volume_name = TQString::fromUtf8(name);

Lines 89-94 Link Here

(-)./tdeioslave/media/mediamanager/halbackend.h.ORI (+2 lines)
89	TQString decrypt(const TQString &id, const TQString &password);	89	TQString decrypt(const TQString &id, const TQString &password);
90	TQString undecrypt(const TQString &id);	90	TQString undecrypt(const TQString &id);
91		91
		92	static bool isHotplug( const TQString & id );
		93
92	private:	94	private:
93	/**	95	/**
94	* Append a device in the media list. This function will check if the device	96	* Append a device in the media list. This function will check if the device

Return to bug 1499

Lines 354-359 Link Here

(-)./tdeioslave/media/mediamanager/mediamanager.cpp.ori (+51 lines)
354	emit mediumChanged(name);	354	emit mediumChanged(name);
355	}	355	}
356		356
		357	TQString MediaManager::unmountAllSuspend()
		358	{
		359	TQPtrList<Medium> list = m_mediaList.list();
		360
		361	TQPtrList<Medium>::const_iterator it = list.begin();
		362	TQPtrList<Medium>::const_iterator end = list.end();
		363
		364	TQString result;
		365
		366	for (; it!=end; ++it)
		367	{
		368	if ( (it)->isMounted() && (it)->isHotplug() )
		369	{
		370	TQString tmp = unmount( (*it)->id() );
		371	if ( !tmp.isEmpty() ) { // umount failed
		372	result = tmp;
		373	} else {
		374	m_suspendResumeMountList.append( (*it)->id() );
		375	}
		376	}
		377	}
		378
		379	// return last error
		380	return result;
		381	}
		382
		383	TQString MediaManager::remountAllResume()
		384	{
		385	TQString result;
		386
		387	for (TQStringList::const_iterator it = m_suspendResumeMountList.begin();
		388	it != m_suspendResumeMountList.end();
		389	++it)
		390	{
		391	const Medium m = m_mediaList.findById(it);
		392
		393	if ( m && m->needMounting() )
		394	{
		395	TQString tmp = mount( *it );
		396	if ( !tmp.isEmpty() ) { // mount failed
		397	result = tmp;
		398	}
		399	}
		400	}
		401
		402	m_suspendResumeMountList.clear();
		403
		404	// return last error
		405	return result;
		406	}
		407
357		408
358	extern "C" {	409	extern "C" {
359	KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)	410	KDE_EXPORT KDEDModule *create_mediamanager(const TQCString &obj)

Lines 60-65 Link Here

(-)./tdeioslave/media/mediamanager/mediamanager.h.ORI (+15 lines)
60	bool removableUnplug(const TQString &devNode);	60	bool removableUnplug(const TQString &devNode);
61	bool removableCamera(const TQString &devNode);	61	bool removableCamera(const TQString &devNode);
62		62
		63	/**
		64	* Unmount manually all partitions when going to suspend
		65	*
		66	* @return last error if any
		67	*/
		68	TQString unmountAllSuspend();
		69
		70	/**
		71	* Remount previously unmounted partitions in unmountAllSuspend()
		72	*
		73	* @return last error if any
		74	*/
		75	TQString remountAllResume();
		76
63	k_dcop_signals:	77	k_dcop_signals:
64	void mediumAdded(const TQString &name, bool allowNotification);	78	void mediumAdded(const TQString &name, bool allowNotification);
65	void mediumRemoved(const TQString &name, bool allowNotification);	79	void mediumRemoved(const TQString &name, bool allowNotification);
Lines 89-94 Link Here
89	TDEBackend *m_tdebackend;	103	TDEBackend *m_tdebackend;
90	MediaDirNotify m_dirNotify;	104	MediaDirNotify m_dirNotify;
91	FstabBackend *m_fstabbackend;	105	FstabBackend *m_fstabbackend;
		106	TQStringList m_suspendResumeMountList;
92	};	107	};
93		108
94	#endif	109	#endif