diff -Nru qml-friends-0.1.0bzr13.04.02/debian/changelog qml-friends-0.1.0bzr13.04.11.1/debian/changelog --- qml-friends-0.1.0bzr13.04.02/debian/changelog 2013-04-11 18:48:21.000000000 +0000 +++ qml-friends-0.1.0bzr13.04.11.1/debian/changelog 2013-04-11 18:48:21.000000000 +0000 @@ -1,8 +1,19 @@ -qml-friends (0.1.0bzr13.04.02-0quantal2) quantal; urgency=low +qml-friends (0.1.0bzr13.04.11.1-0quantal1) quantal; urgency=low - * build for quantal + * Add back g_type_init call, it is deprecated in raring but still needed + for quantal + * debian/control + - added python3-mock to build depends, it is needed on quantal + + -- Ken VanDine Thu, 11 Apr 2013 14:31:22 -0400 + +qml-friends (0.1.0bzr13.04.11-0ubuntu1) raring; urgency=low + + * Don't skip creating filtered model if the model is empty. This ensures + the StreamModel will get updated when the shared model gets populated. + This fixes the empty feed on the first run of friends-app - -- Ken VanDine Tue, 02 Apr 2013 14:26:49 -0400 + -- Ken VanDine Thu, 11 Apr 2013 11:27:57 -0400 qml-friends (0.1.0bzr13.04.02-0ubuntu1) raring; urgency=low diff -Nru qml-friends-0.1.0bzr13.04.02/debian/control qml-friends-0.1.0bzr13.04.11.1/debian/control --- qml-friends-0.1.0bzr13.04.02/debian/control 2013-04-11 18:48:21.000000000 +0000 +++ qml-friends-0.1.0bzr13.04.11.1/debian/control 2013-04-11 18:48:21.000000000 +0000 @@ -2,7 +2,12 @@ Priority: extra Maintainer: Ubuntu Desktop Team Build-Depends: debhelper (>= 9), + friends-dispatcher (>= 0.1.3), + friends-twitter (>= 0.1.3), + friends-facebook (>= 0.1.3), + friends-flickr (>= 0.1.3), pkg-config, + python3-mock, libglib2.0-dev, libdbus-glib-1-dev, libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf], @@ -13,10 +18,6 @@ qtdeclarative5-dev, qtdeclarative5-test-plugin, libdee-qt5-dev, - friends-dispatcher (>= 0.1.3), - friends-twitter (>= 0.1.3), - friends-facebook (>= 0.1.3), - friends-flickr (>= 0.1.3), libfriends-dev (>= 0.1.1bzr13.02.07-0ubuntu1), dbus-test-runner, xvfb, diff -Nru qml-friends-0.1.0bzr13.04.02/debian/rules qml-friends-0.1.0bzr13.04.11.1/debian/rules --- qml-friends-0.1.0bzr13.04.02/debian/rules 2013-04-11 18:48:21.000000000 +0000 +++ qml-friends-0.1.0bzr13.04.11.1/debian/rules 2013-04-11 18:48:21.000000000 +0000 @@ -8,7 +8,5 @@ override_dh_install: dh_install --fail-missing -override_dh_auto_test: - %: dh $@ diff -Nru qml-friends-0.1.0bzr13.04.02/modules/Friends/plugin/plugin.cpp qml-friends-0.1.0bzr13.04.11.1/modules/Friends/plugin/plugin.cpp --- qml-friends-0.1.0bzr13.04.02/modules/Friends/plugin/plugin.cpp 2013-04-02 18:18:48.000000000 +0000 +++ qml-friends-0.1.0bzr13.04.11.1/modules/Friends/plugin/plugin.cpp 2013-04-11 18:28:56.000000000 +0000 @@ -29,6 +29,8 @@ qDebug() << Q_FUNC_INFO << uri; + g_type_init (); + qmlRegisterType(uri, 0, 1, "FriendsUtils"); qmlRegisterType(uri, 0, 1, "FriendsDispatcher"); qmlRegisterType(uri, 0, 1, "StreamModel"); diff -Nru qml-friends-0.1.0bzr13.04.02/modules/Friends/plugin/streammodel.cpp qml-friends-0.1.0bzr13.04.11.1/modules/Friends/plugin/streammodel.cpp --- qml-friends-0.1.0bzr13.04.02/modules/Friends/plugin/streammodel.cpp 2013-04-02 18:18:48.000000000 +0000 +++ qml-friends-0.1.0bzr13.04.11.1/modules/Friends/plugin/streammodel.cpp 2013-04-11 15:29:08.000000000 +0000 @@ -27,7 +27,6 @@ DeeListModel(model), q_ptr(model) { - qDebug() << Q_FUNC_INFO; QString modelName = "com.canonical.Friends.Streams"; /* read environment variables */ QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); @@ -47,8 +46,9 @@ void StreamModelPrivate::onModelReady(GObject* parent __attribute__ ((unused)), GParamSpec *pspec, StreamModelPrivate *d) { - qDebug() << Q_FUNC_INFO; DeeModel *model = (DeeModel*)parent; + if (!dee_shared_model_is_synchronized ((DeeSharedModel*)model)) + return; DeeFilter _sort_filter; dee_filter_new_collator_desc (8, &_sort_filter); d->m_sortedModel = dee_filter_model_new (model, &_sort_filter); @@ -58,9 +58,6 @@ void StreamModelPrivate::updateResults(StreamModelPrivate *d) { - /* Only updateResults if the model is populated */ - if (dee_model_get_n_rows (d->m_sortedModel) < 1) return; - if (d->streamId != NULL) { DeeFilter _key_filter;