rpms/kdebase/FC-5 kdebase-3.5.2-kioslave_media_dbus.patch,1.1,1.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Apr 28 16:25:25 UTC 2006 

Author: than

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

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



kdebase-3.5.2-kioslave_media_dbus.patch:
 Makefile.am                                 |    5 
 configure.in.in                             |    7 
 kcmodule/managermodule.cpp                  |    4 
 kcmodule/media.desktop                      |    2 
 kfile-plugin/kfile_media.desktop            |    5 
 kfile-plugin/kfilemediaplugin.cpp           |    9 
 libmediacommon/medium.cpp                   |    4 
 libmediacommon/medium.h                     |   21 
 mediaimpl.cpp                               |   15 
 mediamanager/halbackend.cpp                 |  620 +++++++++++++++++++++++++++-
 mediamanager/halbackend.h                   |   19 
 mediamanager/mediamanager.cpp               |   81 +++
 mediamanager/mediamanager.desktop           |    1 
 mediamanager/mediamanager.h                 |    8 
 medianotifier/medianotifier.cpp             |    9 
 medianotifier/medianotifier.desktop         |    8 
 mimetypes/audiocd.desktop                   |    4 
 mimetypes/blankcd.desktop                   |    2 
 mimetypes/blankdvd.desktop                  |    2 
 mimetypes/cdrom_mounted.desktop             |    4 
 mimetypes/cdrom_unmounted.desktop           |    2 
 mimetypes/cdwriter_mounted.desktop          |    2 
 mimetypes/cdwriter_unmounted.desktop        |    2 
 mimetypes/dvdvideo.desktop                  |    4 
 mimetypes/floppy5_mounted.desktop           |    2 
 mimetypes/floppy5_unmounted.desktop         |    2 
 mimetypes/floppy_mounted.desktop            |    2 
 mimetypes/floppy_unmounted.desktop          |    2 
 mimetypes/hdd_mounted.desktop               |    1 
 mimetypes/hdd_unmounted.desktop             |    1 
 mimetypes/nfs_mounted.desktop               |    1 
 mimetypes/nfs_unmounted.desktop             |    1 
 mimetypes/removable_mounted.desktop         |    5 
 mimetypes/removable_unmounted.desktop       |    5 
 mimetypes/smb_mounted.desktop               |    3 
 mimetypes/smb_unmounted.desktop             |    3 
 mimetypes/vcd.desktop                       |    1 
 mounthelper/Makefile.am                     |    2 
 mounthelper/kio_media_mounthelper.cpp       |   51 +-
 propsdlgplugin/Makefile.am                  |   12 
 propsdlgplugin/media_propsdlgplugin.desktop |    7 
 propsdlgplugin/propertiespage.cpp           |  217 +++++++++
 propsdlgplugin/propertiespage.h             |   46 ++
 propsdlgplugin/propertiespagegui.ui         |  390 +++++++++++++++++
 propsdlgplugin/propertiespagegui.ui.h       |   22 
 propsdlgplugin/propsdlgshareplugin.cpp      |  100 ++++
 propsdlgplugin/propsdlgshareplugin.h        |   44 +
 services/media_eject.desktop                |    2 
 services/media_safelyremove.desktop         |    1 
 49 files changed, 1656 insertions(+), 107 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 kdebase-3.5.2-kioslave_media_dbus.patch
Index: kdebase-3.5.2-kioslave_media_dbus.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase-3.5.2-kioslave_media_dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.2-kioslave_media_dbus.patch	30 Mar 2006 13:46:23 -0000	1.1
+++ kdebase-3.5.2-kioslave_media_dbus.patch	28 Apr 2006 16:25:22 -0000	1.2
@@ -1,138 +1,95 @@
-diff -Nur kdebase-3.5.2/kioslave/media.orig/configure.in.in kdebase-3.5.2/kioslave/media/configure.in.in
---- kdebase-3.5.2/kioslave/media.orig/configure.in.in	2005-10-10 17:04:01.000000000 +0200
-+++ kdebase-3.5.2/kioslave/media/configure.in.in	2006-01-25 23:50:00.000000000 +0100
-@@ -90,6 +90,13 @@
-   if test $dbus_inc != FOUND || test $dbus_lib != FOUND ; then 
-     KDE_PKG_CHECK_MODULES( DBUS, "dbus-1", [ DBUS_INCS=$DBUS_CFLAGS; dbus_inc=FOUND; dbus_lib=FOUND; ] , AC_MSG_RESULT( Nothing found on PKG_CONFIG_PATH ) )
-   fi
+--- kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.cpp.kio	2006-03-17 11:17:33.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.cpp	2006-04-28 18:22:09.000000000 +0200
+@@ -54,7 +54,10 @@
+ {
+ 	kdDebug() << "MediaNotifier::onMediumChange( " << name << ", "
+ 	          << allowNotification << ")" << endl;
+-	
 +
-+  dbus_bus_var=`pkg-config --variable=system_bus_default_address dbus-1 2>/dev/null`
-+  if test -z "$dbus_bus_var"; then
-+        dbus_bus_var="unix:path=/var/run/dbus/system_bus_socket"
-+  fi
-+  AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS, "$dbus_bus_var", [Define the unix domain path for dbus system bus])
++	if ( !allowNotification )
++	  return;
 +
-   if test $dbus_inc = FOUND && test $dbus_lib = FOUND ; then
-     AC_MSG_RESULT(headers $DBUS_INCS libraries $DBUS_LIBS)
-     dbus=FOUND
-diff -Nur kdebase-3.5.2/kioslave/media.orig/kcmodule/managermodule.cpp kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp
---- kdebase-3.5.2/kioslave/media.orig/kcmodule/managermodule.cpp	2005-11-20 20:14:21.000000000 +0100
-+++ kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp	2006-01-25 23:49:54.000000000 +0100
-@@ -39,15 +39,15 @@
- 	QString hal_text = view->kcfg_HalBackendEnabled->text();
- 	hal_text += " ("+i18n("No support for HAL on this system")+")";
- 	view->kcfg_HalBackendEnabled->setText( hal_text );
--	view->kcfg_HalBackendEnabled->setEnabled( false );
- #endif
-+	view->kcfg_HalBackendEnabled->setEnabled( false );
- 
- #ifndef COMPILE_LINUXCDPOLLING
- 	QString poll_text = view->kcfg_CdPollingEnabled->text();
- 	poll_text += " ("+i18n("No support for CD polling on this system")+")";
- 	view->kcfg_CdPollingEnabled->setText( poll_text );
--	view->kcfg_CdPollingEnabled->setEnabled( false );
- #endif
-+	view->kcfg_CdPollingEnabled->setEnabled( false );
- 
- 	load();
- }
-diff -Nur kdebase-3.5.2/kioslave/media.orig/kcmodule/media.desktop kdebase-3.5.2/kioslave/media/kcmodule/media.desktop
---- kdebase-3.5.2/kioslave/media.orig/kcmodule/media.desktop	2006-03-17 11:17:33.000000000 +0100
-+++ kdebase-3.5.2/kioslave/media/kcmodule/media.desktop	2006-01-25 23:49:54.000000000 +0100
-@@ -79,7 +79,6 @@
- Comment[fi]=Aseta tallennusmedia
- Comment[fr]=Configurer le média de stockage
- Comment[fy]=Opslachmedia ynstelle
--Comment[ga]=Cumraigh Meáin Stórála
- Comment[gl]=Configurar Medios de Armacenaxe
- Comment[hu]=A tárolóeszközök beállítása
- Comment[is]=Stillingar geymslumiðla
-@@ -123,7 +122,6 @@
- Keywords[fi]=varasto,media,usb,cdrom,laite
- Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique
- Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart
--Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas
- Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo
- Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz
- Keywords[is]=geymsla,miðill,usb,cdrom,tæki
-diff -Nur kdebase-3.5.2/kioslave/media.orig/kfile-plugin/kfile_media.desktop kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop
---- kdebase-3.5.2/kioslave/media.orig/kfile-plugin/kfile_media.desktop	2006-03-17 11:17:33.000000000 +0100
-+++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop	2006-01-25 23:49:52.000000000 +0100
-@@ -18,12 +18,11 @@
- Name[fi]=Tallenteiden tiedot
- Name[fr]=Informations sur le média
- Name[fy]=Mediumynformaasje
--Name[ga]=Eolas faoin Mheán
- Name[gl]=Informazón do Meio
- Name[he]=מידע אודות המדיה
- Name[hi]=माध्यम जानकारी
- Name[hu]=Adathordozó-jellemzők
--Name[is]=Upplýsingar um miðil
-+Name[is]=Upplýsingar um miðill
- Name[it]=Informazioni supporto
- Name[ja]=メディア情報
- Name[km]=ព័ត៌មាន​ឧបករណ៍
-@@ -58,4 +57,4 @@
- Name[zh_TW]=媒體資訊
- ServiceTypes=KFilePlugin
- X-KDE-Library=kfile_media
--MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera
-+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted
-diff -Nur kdebase-3.5.2/kioslave/media.orig/kfile-plugin/kfilemediaplugin.cpp kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp
---- kdebase-3.5.2/kioslave/media.orig/kfile-plugin/kfilemediaplugin.cpp	2005-11-08 23:36:07.000000000 +0100
-+++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp	2006-01-25 23:49:52.000000000 +0100
-@@ -64,12 +64,16 @@
- 	addMimeType( "media/floppy_unmounted" );
- 	addMimeType( "media/zip_unmounted" );
- 	addMimeType( "media/gphoto2camera" );
-+	addMimeType( "media/camera_mounted" );
-+	addMimeType( "media/camera_unmounted" );	
- }
- 
- bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
+ // Update user activity timestamp, otherwise the notification dialog will be shown
+ // in the background due to focus stealing prevention. Entering a new media can
+ // be seen as a kind of user activity after all. It'd be better to update the timestamp
+@@ -95,11 +98,11 @@
  {
--	const Medium medium = askMedium(info);
-+        const Medium medium = askMedium(info);
+ 	QString mimetype = medium.mimetype();
  
-+	kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl;
-+ 
- 	if (medium.id().isNull()) return false;
+-	bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" );
++	bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" );
+ 	bool is_mounted = mimetype.endsWith( "_mounted" );
  	
- 	QString mount_point = medium.mountPoint();
-@@ -161,7 +165,8 @@
- const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info)
- {
- 	DCOPRef mediamanager("kded", "mediamanager");
--	DCOPReply reply = mediamanager.call( "properties", info.url().fileName() );
-+	kdDebug() << "properties " << info.url() << endl;
-+	DCOPReply reply = mediamanager.call( "properties", info.url().url() );
- 
- 	if ( !reply.isValid() )
+ 	// We autorun only on CD/DVD or removable disks (USB, Firewire)
+-	if ( !( is_cdrom && is_mounted )
++	if ( !( is_cdrom || is_mounted )
+ 	  && mimetype!="media/removable_mounted" )
  	{
-diff -Nur kdebase-3.5.2/kioslave/media.orig/libmediacommon/medium.cpp kdebase-3.5.2/kioslave/media/libmediacommon/medium.cpp
---- kdebase-3.5.2/kioslave/media.orig/libmediacommon/medium.cpp	2005-10-10 17:04:00.000000000 +0200
-+++ kdebase-3.5.2/kioslave/media/libmediacommon/medium.cpp	2006-02-15 23:51:31.000000000 +0100
-@@ -40,6 +40,8 @@
- 	m_properties+= QString::null; /* ICON_NAME */
- 
- 	loadUserLabel();
-+
-+	m_halmounted = false;
- }
- 
- Medium::Medium()
-@@ -57,6 +59,8 @@
- 	m_properties+= QString::null; /* BASE_URL */
- 	m_properties+= QString::null; /* MIME_TYPE */
- 	m_properties+= QString::null; /* ICON_NAME */
-+	
-+	m_halmounted = false;
- }
- 
- const Medium Medium::create(const QStringList &properties)
-diff -Nur kdebase-3.5.2/kioslave/media.orig/libmediacommon/medium.h kdebase-3.5.2/kioslave/media/libmediacommon/medium.h
---- kdebase-3.5.2/kioslave/media.orig/libmediacommon/medium.h	2005-10-10 17:04:00.000000000 +0200
-+++ kdebase-3.5.2/kioslave/media/libmediacommon/medium.h	2006-02-15 23:51:31.000000000 +0100
+ 		return false;
+--- kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.desktop.kio	2006-03-17 11:17:33.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/medianotifier/medianotifier.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -16,23 +16,18 @@
+ Name[el]=Δαίμονας ειδοποίησης μέσων
+ Name[es]=Demonio de notificaciones de medios
+ Name[et]=Andmekandjate märguannete deemon
+-Name[eu]=Euskarrien jakinarazpen daemon-a
+ Name[fi]=Mediahuomautin
+ Name[fr]=Démon de notifications des média
+ Name[fy]=Medianotifikaasje-daemon
+ Name[hu]=Lemezfigyelő szolgáltatás
+ Name[is]=Miðils tilkynningarpúki
+ Name[it]=Demone notifiche dispositivi
+-Name[ja]=メディア通知デーモン
+-Name[km]=ដេមិន​របស់​ឧបករណ៍​ប្រាប់​ដំណឹង​មេឌៀ
+ Name[lt]=Media pranešimų tarnyba
+-Name[nb]=Medievarslingsnisse
+ Name[nds]=Medien-Narichtendämoon
+ Name[nl]=Medianotificatie-daemon
+ Name[pl]=Usługa powiadamiania o nośnikach
+ Name[pt]=Servidor de Notificação de Dispositivos
+ Name[pt_BR]=Servidor de Notificação de Dispositivos
+-Name[ru]=Демон уведомлений от подключаемых устройств
+ Name[sl]=Demon za obveščanje o nosilcih
+ Name[sr]=Демон за обавештења о медијумима
+ Name[sr at Latn]=Demon za obaveštenja o medijumima
+@@ -50,13 +45,12 @@
+ Comment[el]=Ένας ειδοποιητής εισαγωγής μέσου
+ Comment[es]=Un notificador de medios empotrable
+ Comment[et]=Andmekandja ühendamisest märkuandev deemon
+-Comment[eu]=Euskarri konektatze jakinarazlea
+ Comment[fi]=Liitetyn median huomautin
+ Comment[fr]=Notification de connexion de média
+ Comment[fy]=Meidieling fan oankeppele media
[...4415 lines suppressed...]
++++ kdebase-3.5.2/kioslave/media/mimetypes/hdd_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -21,7 +21,6 @@
+ Comment[fi]=Irrotettu kiintolevyosio
+ Comment[fr]=Partition de disque dur non montée
+ Comment[fy]=Ofkeppele Fêsteskiif folume
+-Comment[ga]=Imleabhar Diosca Crua Gan Fheistiú
+ Comment[gl]=Partizón do Disco Duro Non Montada
+ Comment[he]=מחיצת כונן קשיח מנותקת
+ Comment[hi]=अनमाउन्टेड हार्ड डिस्क वॉल्यूम
+--- kdebase-3.5.2/kioslave/media/mimetypes/floppy5_mounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/floppy5_mounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -52,7 +52,7 @@
+ Comment[pt]=Disquete de 5¼" montada
+ Comment[pt_BR]=Disquete  5¼" Montado
+ Comment[ro]=Dischetă 5¼" montată
+-Comment[ru]=Смонтированная дискета 5¼"
++Comment[ru]=Смонтированный дисковод 5¼"
+ Comment[rw]=Disikete 5¼" Yashyizwemo
+ Comment[se]=Čatnon 5¼-dibmaskearru
+ Comment[sk]=Pripojená disketa 5¼"
+--- kdebase-3.5.2/kioslave/media/mimetypes/audiocd.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/audiocd.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -19,7 +19,7 @@
+ Comment[he]=תקליטורי שמע
+ Comment[hi]=ऑडियो सीडी
+ Comment[hu]=Hang-CD
+-Comment[is]=Hljóðdiskur
++Comment[is]=Hljóð CD
+ Comment[it]=CD audio
+ Comment[ja]=オーディオ CD
+ Comment[km]=ស៊ីឌី​អូឌីយ៉ូ
+@@ -33,7 +33,7 @@
+ Comment[pt]=CD áudio
+ Comment[pt_BR]=CD de Áudio
+ Comment[ro]=CD Audio
+-Comment[ru]=Аудио CD
++Comment[ru]=Звуковой CD
+ Comment[rw]=CD y'Inyumvo
+ Comment[se]=Jietna-CD
+ Comment[sl]=Glasbeni CD
+--- kdebase-3.5.2/kioslave/media/mimetypes/cdwriter_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/cdwriter_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -53,7 +53,7 @@
+ Comment[pt]=Gravador de CDs desmontado
+ Comment[pt_BR]=Gravador de CD Desmontado
+ Comment[ro]=CD Writer nemontat
+-Comment[ru]=Отмонтированный CD (с возможностью записи)
++Comment[ru]=Отмонтированный CD Writer
+ Comment[rw]=Mwandika CD Yakuwemo
+ Comment[se]=Gálgajuvvon CD-čálli
+ Comment[sk]=Nepripojená napaľovacia mechanika CD
+--- kdebase-3.5.2/kioslave/media/mimetypes/nfs_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/nfs_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -21,7 +21,6 @@
+ Comment[fi]=Irrotettu NFS-jako
+ Comment[fr]=Ressource NFS non montée
+ Comment[fy]=Oankeppele NFS-boarne
+-Comment[ga]=Comhroinn NFS Gan Fheistiú
+ Comment[gl]=Compartizón NFS non Montada
+ Comment[he]=משאב NFS מנותק
+ Comment[hi]=अनमाउन्टेड एनएफ़एस साझा
+--- kdebase-3.5.2/kioslave/media/mimetypes/cdrom_unmounted.desktop.kio	2006-03-17 11:17:34.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/mimetypes/cdrom_unmounted.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -53,7 +53,7 @@
+ Comment[pt]=CD-ROM desmontado
+ Comment[pt_BR]=CD-ROM Desmontado
+ Comment[ro]=CD-ROM nemontat
+-Comment[ru]=Отмонтированный CD
++Comment[ru]=Отмонтированный CD-ROM
+ Comment[rw]=CD-ROM Yakuwemo
+ Comment[se]=Gálgajuvvon CD-ROM
+ Comment[sk]=Nepripojený CD-ROM
+--- kdebase-3.5.2/kioslave/media/mediaimpl.cpp.kio	2005-10-10 17:04:01.000000000 +0200
++++ kdebase-3.5.2/kioslave/media/mediaimpl.cpp	2006-04-28 18:22:09.000000000 +0200
+@@ -226,6 +226,8 @@
+ 
+ 		mp_mounting = &medium;
+ 		
++		
++		/*
+ 		KIO::Job* job = KIO::mount(false, 0,
+ 		                           medium.deviceNode(),
+ 		                           medium.mountPoint());
+@@ -234,6 +236,7 @@
+ 		         this, SLOT( slotMountResult( KIO::Job * ) ) );
+ 		connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ),
+ 		         this, SLOT( slotWarning( KIO::Job *, const QString & ) ) );
++		*/
+ 		kapp->dcopClient()
+ 		->connectDCOPSignal("kded", "mediamanager",
+ 		                    "mediumChanged(QString, bool)",
+@@ -241,7 +244,17 @@
+ 		                    "slotMediumChanged(QString)",
+ 		                    false);
+ 
+-		qApp->eventLoop()->enterLoop();
++		DCOPRef mediamanager("kded", "mediamanager");
++		DCOPReply reply = mediamanager.call( "mount", medium.id());
++		if (reply.isValid())
++		  reply.get(m_lastErrorMessage);
++		else
++		  m_lastErrorMessage = i18n("Internal Error");
++		if (!m_lastErrorMessage.isEmpty())
++		  m_lastErrorCode = KIO::ERR_SLAVE_DEFINED;
++		else {
++		  qApp->eventLoop()->enterLoop();
++		}
+ 
+ 		mp_mounting = 0L;
+ 		
+--- kdebase-3.5.2/kioslave/media/kcmodule/media.desktop.kio	2006-03-17 11:17:33.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/kcmodule/media.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -79,7 +79,6 @@
+ Comment[fi]=Aseta tallennusmedia
+ Comment[fr]=Configurer le média de stockage
+ Comment[fy]=Opslachmedia ynstelle
+-Comment[ga]=Cumraigh Meáin Stórála
+ Comment[gl]=Configurar Medios de Armacenaxe
+ Comment[hu]=A tárolóeszközök beállítása
+ Comment[is]=Stillingar geymslumiðla
+@@ -123,7 +122,6 @@
+ Keywords[fi]=varasto,media,usb,cdrom,laite
+ Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique
+ Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart
+-Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas
+ Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo
+ Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz
+ Keywords[is]=geymsla,miðill,usb,cdrom,tæki
+--- kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp.kio	2005-11-20 20:14:21.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/kcmodule/managermodule.cpp	2006-04-28 18:22:09.000000000 +0200
+@@ -39,15 +39,15 @@
+ 	QString hal_text = view->kcfg_HalBackendEnabled->text();
+ 	hal_text += " ("+i18n("No support for HAL on this system")+")";
+ 	view->kcfg_HalBackendEnabled->setText( hal_text );
+-	view->kcfg_HalBackendEnabled->setEnabled( false );
+ #endif
++	view->kcfg_HalBackendEnabled->setEnabled( false );
+ 
+ #ifndef COMPILE_LINUXCDPOLLING
+ 	QString poll_text = view->kcfg_CdPollingEnabled->text();
+ 	poll_text += " ("+i18n("No support for CD polling on this system")+")";
+ 	view->kcfg_CdPollingEnabled->setText( poll_text );
+-	view->kcfg_CdPollingEnabled->setEnabled( false );
+ #endif
++	view->kcfg_CdPollingEnabled->setEnabled( false );
+ 
+ 	load();
+ }
+--- kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp.kio	2005-11-08 23:36:07.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfilemediaplugin.cpp	2006-04-28 18:22:09.000000000 +0200
+@@ -64,12 +64,16 @@
+ 	addMimeType( "media/floppy_unmounted" );
+ 	addMimeType( "media/zip_unmounted" );
+ 	addMimeType( "media/gphoto2camera" );
++	addMimeType( "media/camera_mounted" );
++	addMimeType( "media/camera_unmounted" );	
+ }
+ 
+ bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)
+ {
+-	const Medium medium = askMedium(info);
++        const Medium medium = askMedium(info);
+ 
++	kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl;
++ 
+ 	if (medium.id().isNull()) return false;
+ 	
+ 	QString mount_point = medium.mountPoint();
+@@ -161,7 +165,8 @@
+ const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info)
+ {
+ 	DCOPRef mediamanager("kded", "mediamanager");
+-	DCOPReply reply = mediamanager.call( "properties", info.url().fileName() );
++	kdDebug() << "properties " << info.url() << endl;
++	DCOPReply reply = mediamanager.call( "properties", info.url().url() );
+ 
+ 	if ( !reply.isValid() )
+ 	{
+--- kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop.kio	2006-03-17 11:17:33.000000000 +0100
++++ kdebase-3.5.2/kioslave/media/kfile-plugin/kfile_media.desktop	2006-04-28 18:22:09.000000000 +0200
+@@ -18,12 +18,11 @@
+ Name[fi]=Tallenteiden tiedot
+ Name[fr]=Informations sur le média
+ Name[fy]=Mediumynformaasje
+-Name[ga]=Eolas faoin Mheán
+ Name[gl]=Informazón do Meio
+ Name[he]=מידע אודות המדיה
+ Name[hi]=माध्यम जानकारी
+ Name[hu]=Adathordozó-jellemzők
+-Name[is]=Upplýsingar um miðil
++Name[is]=Upplýsingar um miðill
+ Name[it]=Informazioni supporto
+ Name[ja]=メディア情報
+ Name[km]=ព័ត៌មាន​ឧបករណ៍
+@@ -58,4 +57,4 @@
+ Name[zh_TW]=媒體資訊
+ ServiceTypes=KFilePlugin
+ X-KDE-Library=kfile_media
+-MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera
++MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted

More information about the fedora-cvs-commits mailing list