[clementine] better gcc-4.6 patch

Orcan Ogetbil oget at fedoraproject.org
Thu Mar 31 11:30:06 UTC 2011


commit 6ae391a0b17c2a75941655b19cb9c5f8186cd219
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Thu Mar 31 07:29:35 2011 -0400

    better gcc-4.6 patch

 clementine-gcc46.patch |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
---
diff --git a/clementine-gcc46.patch b/clementine-gcc46.patch
index 97eb70b..2aeab74 100644
--- a/clementine-gcc46.patch
+++ b/clementine-gcc46.patch
@@ -1,3 +1,28 @@
+diff -rupN clementine-0.7.old/src/devices/giolister.cpp clementine-0.7/src/devices/giolister.cpp
+--- clementine-0.7.old/src/devices/giolister.cpp	2010-11-20 08:27:10.000000000 -0500
++++ clementine-0.7/src/devices/giolister.cpp	2011-03-31 00:53:08.000000000 -0400
+@@ -243,13 +243,10 @@ void GioLister::MountAdded(GMount* mount
+   {
+     QMutexLocker l(&mutex_);
+ 
+-    const DeviceInfo* old_info = NULL;
+-
+     // The volume might already exist - either mounted or unmounted.
+     foreach (const QString& id, devices_.keys()) {
+       if (devices_[id].volume == info.volume) {
+         old_id = id;
+-        old_info = &devices_[id];
+         break;
+       }
+     }
+@@ -260,7 +257,6 @@ void GioLister::MountAdded(GMount* mount
+       devices_.remove(old_id);
+       emit DeviceRemoved(old_id);
+ 
+-      old_info = NULL;
+       old_id = QString();
+     }
+     devices_[info.unique_id()] = info;
 diff -rupN clementine-0.7.old/src/scripting/uiinterface.h clementine-0.7/src/scripting/uiinterface.h
 --- clementine-0.7.old/src/scripting/uiinterface.h	2011-01-02 13:10:26.000000000 -0500
 +++ clementine-0.7/src/scripting/uiinterface.h	2011-03-31 00:29:26.000000000 -0400


More information about the scm-commits mailing list