I have made the following changes intended for : CE:MW:Shared / nemo-qml-plugin-grilo
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7510 Thank You, msameer [This message was auto-generated] --- Request # 7510: Messages from BOSS: State: review at 2012-12-06T22:34:28 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:msameer:grilo / nemo-qml-plugin-grilo -> CE:MW:Shared / nemo-qml-plugin-grilo changes files: -------------- --- nemo-qml-plugin-grilo.changes +++ nemo-qml-plugin-grilo.changes @@ -0,0 +1,3 @@ +* Fri Dec 07 2012 Mohammed Hassan <[email protected]> - 0.0.20121207 +- Small fixes + old: ---- qtgrilo-0.0.20121202.tar.gz new: ---- qtgrilo-0.0.20121207.tar.gz spec files: ----------- --- nemo-qml-plugin-grilo.spec +++ nemo-qml-plugin-grilo.spec @@ -1,6 +1,6 @@ Name: nemo-qml-plugin-grilo Summary: Framework for discovering and browsing media -Version: 0.0.20121202 +Version: 0.0.20121207 Release: 1 Group: Development/Libraries License: LGPLv2.1 other changes: -------------- ++++++ qtgrilo-0.0.20121202.tar.gz -> qtgrilo-0.0.20121207.tar.gz --- declarative/grilobrowse.cpp +++ declarative/grilobrowse.cpp @@ -154,7 +154,7 @@ return NULL; } - GrlMedia *m = grl_media_unserialize(m_baseMedia.toUtf8().data()); + GrlMedia *m = grl_media_unserialize(m_baseMedia.toUtf8().constData()); if (m) { m_media = new GriloMedia(m); return m_media->media(); --- declarative/grilomedia.cpp +++ declarative/grilomedia.cpp @@ -38,7 +38,7 @@ QString GriloMedia::serialize() { QString result; - gchar *str = grl_media_serialize_extended(m_media, GRL_MEDIA_SERIALIZE_FULL, NULL); + gchar *str = grl_media_serialize_extended(m_media, GRL_MEDIA_SERIALIZE_FULL, NULL); if (str) { result = QString::fromUtf8(str); @@ -49,11 +49,11 @@ } QString GriloMedia::id() const { - return grl_media_get_id(m_media); + return QString::fromUtf8(grl_media_get_id(m_media)); } QString GriloMedia::title() const { - return grl_media_get_title(m_media); + return QString::fromUtf8(grl_media_get_title(m_media)); } QUrl GriloMedia::url() const { @@ -71,12 +71,12 @@ } QString GriloMedia::author() const { - return grl_media_get_author(m_media); + return QString::fromUtf8(grl_media_get_author(m_media)); } QString GriloMedia::album() const { if (GRL_IS_MEDIA_AUDIO(m_media)) { - return grl_media_audio_get_album(GRL_MEDIA_AUDIO(m_media)); + return QString::fromUtf8(grl_media_audio_get_album(GRL_MEDIA_AUDIO(m_media))); } return QString(); @@ -85,7 +85,7 @@ QString GriloMedia::artist() const { if (GRL_IS_MEDIA_AUDIO(m_media)) { - return grl_media_audio_get_artist(GRL_MEDIA_AUDIO(m_media)); + return QString::fromUtf8(grl_media_audio_get_artist(GRL_MEDIA_AUDIO(m_media))); } return QString(); --- declarative/grilomultisearch.cpp +++ declarative/grilomultisearch.cpp @@ -55,7 +55,7 @@ GList *keys = keysAsList(); GrlOperationOptions *options = operationOptions(NULL, Search); - m_opId = grl_multiple_search(sources, m_text.toUtf8().data(), + m_opId = grl_multiple_search(sources, m_text.toUtf8().constData(), keys, options, grilo_source_result_cb, this); g_list_free(sources); --- declarative/griloquery.cpp +++ declarative/griloquery.cpp @@ -55,7 +55,7 @@ GList *keys = keysAsList(); GrlOperationOptions *options = operationOptions(src, Search); - m_opId = grl_source_query(src, m_query.toUtf8().data(), + m_opId = grl_source_query(src, m_query.toUtf8().constData(), keys, options, grilo_source_result_cb, this); g_object_unref(options); --- declarative/griloregistry.cpp +++ declarative/griloregistry.cpp @@ -70,7 +70,8 @@ void GriloRegistry::loadConfigurationFile() { if (!m_configurationFile.isEmpty() && m_registry) { - grl_registry_add_config_from_file(m_registry, m_configurationFile.toLocal8Bit().data(), NULL); + grl_registry_add_config_from_file(m_registry, m_configurationFile.toLocal8Bit().constData(), + NULL); } } @@ -107,7 +108,7 @@ GrlSource *GriloRegistry::lookupSource(const QString& id) { if (m_registry) { - return grl_registry_lookup_source(m_registry, id.toAscii().data()); + return grl_registry_lookup_source(m_registry, id.toAscii().constData()); } return 0; --- declarative/grilosearch.cpp +++ declarative/grilosearch.cpp @@ -54,7 +54,7 @@ GList *keys = keysAsList(); GrlOperationOptions *options = operationOptions(src, Search); - m_opId = grl_source_search(src, m_text.toUtf8().data(), + m_opId = grl_source_search(src, m_text.toUtf8().constData(), keys, options, grilo_source_result_cb, this); g_object_unref(options);
