rpms/esperanza/devel esperanza.git-1b81dc2e1e9bfe1dc307abc79ea6604f57414b5b.patch, NONE, 1.1 esperanza.git-7458f6b378b13fbdcce32a6c3a23aae6dcd38c24.patch, NONE, 1.1 esperanza.spec, 1.5, 1.6

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/esperanza/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25237

Modified Files:
	esperanza.spec 
Added Files:
	esperanza.git-1b81dc2e1e9bfe1dc307abc79ea6604f57414b5b.patch 
	esperanza.git-7458f6b378b13fbdcce32a6c3a23aae6dcd38c24.patch 
Log Message:
sync with git

esperanza.git-1b81dc2e1e9bfe1dc307abc79ea6604f57414b5b.patch:
 xclient.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE esperanza.git-1b81dc2e1e9bfe1dc307abc79ea6604f57414b5b.patch ---
From: Thomas Frauendorfer <Thomas.Frauendorfer at googlemail.com>
Date: Sat, 17 Oct 2009 17:36:55 +0000 (+0200)
Subject: OTHER: api update
X-Git-Url: http://git.xmms.se/?p=esperanza.git;a=commitdiff_plain;h=1b81dc2e1e9bfe1dc307abc79ea6604f57414b5b

OTHER: api update
---

diff --git a/src/lib/xclient.h b/src/lib/xclient.h
index 0337314..9a3519d 100644
--- a/src/lib/xclient.h
+++ b/src/lib/xclient.h
@@ -80,7 +80,7 @@ class XClient : public QObject {
         };
         
         static QDir esperanza_dir ();
-		void setDisconnectCallback (const Xmms::DisconnectCallback::slot_type &slot) { m_client->setDisconnectCallback (slot); }
+		void setDisconnectCallback (const Xmms::DisconnectCallback::value_type &slot) { m_client->setDisconnectCallback (slot); }
 		const Xmms::Collection* collection () { if (m_client && m_client->isConnected ()) return &m_client->collection; else return NULL; }
 		const Xmms::Playlist* playlist () { if (m_client && m_client->isConnected ()) return &m_client->playlist; else return NULL; }
 		const Xmms::Playback* playback () { if (m_client && m_client->isConnected ()) return &m_client->playback; else return NULL; }

esperanza.git-7458f6b378b13fbdcce32a6c3a23aae6dcd38c24.patch:
 dialogs/medialibdialog/medialibdialog.cpp |    3 ++-
 lib/collectioninfomodel.cpp               |   13 ++++++++++---
 lib/collectionmodel.cpp                   |    7 +++++++
 lib/xclient.cpp                           |    2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

--- NEW FILE esperanza.git-7458f6b378b13fbdcce32a6c3a23aae6dcd38c24.patch ---
From: Thomas Frauendorfer <Thomas.Frauendorfer at googlemail.com>
Date: Thu, 16 Jul 2009 06:32:37 +0000 (+0200)
Subject: OTHER: Ugly workaround for a crash in collection dialog
X-Git-Url: http://git.xmms.se/?p=esperanza.git;a=commitdiff_plain;h=7458f6b378b13fbdcce32a6c3a23aae6dcd38c24

OTHER: Ugly workaround for a crash in collection dialog
---

diff --git a/src/dialogs/medialibdialog/medialibdialog.cpp b/src/dialogs/medialibdialog/medialibdialog.cpp
index 01f4843..cac47b7 100644
--- a/src/dialogs/medialibdialog/medialibdialog.cpp
+++ b/src/dialogs/medialibdialog/medialibdialog.cpp
@@ -200,7 +200,8 @@ MedialibDialog::compl_reply (const Xmms::List <Xmms::Dict> &list)
 		/* This seems to happen if a album is "" */
 		if (it->contains (m_currentsel)) {
 			QString qs = XClient::stdToQ (it->get<std::string> (m_currentsel));
-			compl_list.append (qs);
+			if (! qs.isEmpty())
+				compl_list.append (qs);
 		}
 	}
 
diff --git a/src/lib/collectioninfomodel.cpp b/src/lib/collectioninfomodel.cpp
index e334000..3a6b1c6 100644
--- a/src/lib/collectioninfomodel.cpp
+++ b/src/lib/collectioninfomodel.cpp
@@ -15,12 +15,12 @@
  */
 
 #include "collectioninfomodel.h"
+#include <QDebug>
 
 CollectionInfoModel::CollectionInfoModel (QObject *parent, XClient *client, const bool &all_field)
 {
     m_client = client;
     m_all_field = all_field;
-    
 }
 
 std::list<std::string>
@@ -30,7 +30,7 @@ CollectionInfoModel::str_list_to_std (const QList<QString> &list)
     for (int i = 0; i < list.size (); i ++) {
         ret.push_back (XClient::qToStd (list.value (i)));
     }
-    
+
     return ret;
 }
 
@@ -67,7 +67,14 @@ CollectionInfoModel::set_data (const QList < QHash < QString, QVariant > > &data
 	beginRemoveRows (QModelIndex (), 0, rowCount ());
     clear ();
 	endRemoveRows ();
-	
+
+	if (data.size() == 0)
+	{
+		// FIXME: This should not happen, but it does
+		qDebug() << "FIXME:" << __FILE__ << " line: " << __LINE__;
+		return;
+	}
+
     /* take the headers and add the columns */
     QStringList s = data[0].keys ();
     setColumnCount (s.size ());
diff --git a/src/lib/collectionmodel.cpp b/src/lib/collectionmodel.cpp
index c119e6f..9878f41 100644
--- a/src/lib/collectionmodel.cpp
+++ b/src/lib/collectionmodel.cpp
@@ -16,6 +16,7 @@
 
 #include "collectionmodel.h"
 
+#include <QDebug>
 #include <QAbstractItemModel>
 
 CollectionModel::CollectionModel (QObject *parent, XClient *client) : QAbstractItemModel (parent)
@@ -87,6 +88,12 @@ CollectionModel::id_list_get (Xmms::List<int> const &list)
 		i ++;
 	}
 
+	if (i == 0) {
+		// FIXME: This should not happen, but it does
+		qDebug() << "FIXME: "<< __FILE__ << " line: " << __LINE__;
+		return true;
+	}
+
 	beginInsertRows (QModelIndex (), 0, i);
 	for (Xmms::List<int>::const_iterator it = list.begin();
 	     it != it_end; ++it) {
diff --git a/src/lib/xclient.cpp b/src/lib/xclient.cpp
index 772198e..7da8259 100644
--- a/src/lib/xclient.cpp
+++ b/src/lib/xclient.cpp
@@ -145,7 +145,7 @@ XClient::dictToQHash (const std::string &key,
 	} else {
 		QString val;
 		val = QString::fromUtf8 (boost::get< std::string > (value).c_str ());
-        hash.insert (stdToQ (key), QVariant (val));
+		hash.insert (stdToQ (key), QVariant (val));
 	}
 }
 


Index: esperanza.spec
===================================================================
RCS file: /cvs/pkgs/rpms/esperanza/devel/esperanza.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- esperanza.spec	10 Feb 2010 17:44:01 -0000	1.5
+++ esperanza.spec	20 Apr 2010 13:48:53 -0000	1.6
@@ -1,7 +1,7 @@
 Name:		esperanza
 Summary: 	A graphical audio player
 Version:	0.4.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 Source0:	http://exodus.xmms.se/~tru/esperanza/0.4/%{name}-%{version}.tar.gz
@@ -11,6 +11,8 @@ Source2:	%{name}.png
 Patch0:		esperanza-0.4.0-gitfixes20081204.patch
 Patch1:		esperanza-0.4.0-gitfixes20090811.patch
 Patch2:		esperanza-0.4.0-DSO.patch
+Patch3:		esperanza.git-7458f6b378b13fbdcce32a6c3a23aae6dcd38c24.patch
+Patch4:		esperanza.git-1b81dc2e1e9bfe1dc307abc79ea6604f57414b5b.patch
 URL:		http://wiki.xmms2.xmms.se/wiki/Client:Esperanza
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	xmms2-devel >= 0.6, qt-devel
@@ -25,6 +27,8 @@ It has a sleek, uncomplicated UI, and su
 %patch0 -p1 -b .gitfixes
 %patch1 -p1 -b .moregit
 %patch2 -p1 -b .DSO
+%patch3 -p1 -b .crash-dialog
+%patch4 -p1 -b .API
 # Don't need exec perms here
 chmod -x src/dialogs/xmms2dpreferences/xmms2dprefmodel*
 
@@ -60,6 +64,9 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Tue Apr 20 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.0-7
+- sync up with latest git version
+
 * Wed Feb 10 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.4.0-6
 - fix undefined DSO