8c915df · unity8 · git.iko.soy

plugins/AccountsService/AccountsServiceDBusAdaptor.h−1

compare with xenial

unifiedsplit

@@ -39,7 +39,6 @@ public:

39 inline T getUserProperty(const QString &user, const QString &interface, const QString &property) {

40 QVariant variant = getUserProperty(user, interface, property);

41 if (variant.isValid() && variant.canConvert<QDBusArgument>()) {

42− qDebug() << "have variant:" << variant;

43 return qdbus_cast<T>(variant.value<QDBusArgument>());

42 return qdbus_cast<T>(variant.value<QDBusArgument>());

44 }

43 }

45 return T();

44 return T();

plugins/Greeter/Unity/Launcher/launchermodelas.cpp−2

@@ -32,7 +32,6 @@ LauncherModel::LauncherModel(QObject *parent):

32 LauncherModelInterface(parent),

33 m_accounts(new AccountsServiceDBusAdaptor(this))

34{

35− qDebug() << "Loading AS based launcher model";

36 connect(m_accounts, &AccountsServiceDBusAdaptor::propertiesChanged, this, &LauncherModel::propertiesChanged);

35 connect(m_accounts, &AccountsServiceDBusAdaptor::propertiesChanged, this, &LauncherModel::propertiesChanged);

37 refresh();

36 refresh();

38}

37}

@@ -214,7 +213,6 @@ void LauncherModel::refresh()

214 // Now walk through list and see if we need to add something

213 // Now walk through list and see if we need to add something

215 for (int asIndex = 0; asIndex < items.count(); ++asIndex) {

214 for (int asIndex = 0; asIndex < items.count(); ++asIndex) {

216 QVariant entry = items.at(asIndex);

215 QVariant entry = items.at(asIndex);

217− qDebug() << "have AS item" << entry.toMap().value("id").toString();

218 int itemIndex = -1;

216 int itemIndex = -1;

219 for (int i = 0; i < m_list.count(); ++i) {

217 for (int i = 0; i < m_list.count(); ++i) {

220 if (m_list.at(i)->appId() == entry.toMap().value("id").toString()) {

218 if (m_list.at(i)->appId() == entry.toMap().value("id").toString()) {

plugins/Unity/Launcher/asadapter.cpp−1

@@ -39,7 +39,6 @@ ASAdapter::~ASAdapter()

39

40void ASAdapter::syncItems(QList<LauncherItem *> m_list)

41{

42− qDebug() << "syncing items to AS" << m_list.count();

43 if (m_accounts && !m_user.isEmpty()) {

42 if (m_accounts && !m_user.isEmpty()) {

44 QList<QVariantMap> items;

43 QList<QVariantMap> items;

45

44

plugins/Unity/Launcher/launchermodel.cpp−2

@@ -38,7 +38,6 @@ LauncherModel::LauncherModel(QObject *parent):

38 m_asAdapter(new ASAdapter()),

39 m_appManager(0)

40{

41− qDebug() << "Loading dconf based launcher model";

42 connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);

41 connect(m_dbusIface, &DBusInterface::countChanged, this, &LauncherModel::countChanged);

43 connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);

42 connect(m_dbusIface, &DBusInterface::countVisibleChanged, this, &LauncherModel::countVisibleChanged);

44 connect(m_dbusIface, &DBusInterface::refreshCalled, this, &LauncherModel::refresh);

43 connect(m_dbusIface, &DBusInterface::refreshCalled, this, &LauncherModel::refresh);

@@ -364,7 +363,6 @@ void LauncherModel::countVisibleChanged(const QString &appId, int countVisible)

364

363

365void LauncherModel::refresh()

364void LauncherModel::refresh()

366{

365{

367− qDebug() << "refreshing";

368 // First walk through all the existing items and see if we need to remove something

366 // First walk through all the existing items and see if we need to remove something

369 QList<LauncherItem*> toBeRemoved;

367 QList<LauncherItem*> toBeRemoved;

370 Q_FOREACH (LauncherItem* item, m_list) {

368 Q_FOREACH (LauncherItem* item, m_list) {

tests/plugins/Unity/Launcher/AccountsServiceDBusAdaptor.cpp−2

@@ -29,13 +29,11 @@ QVariant AccountsServiceDBusAdaptor::getUserProperty(const QString &user, const

29{

30 Q_UNUSED(user)

31 Q_UNUSED(interface)

32− qDebug() << "returning properties" << m_properties.value(property);

33 return m_properties.value(property);

32 return m_properties.value(property);

34}

33}

35

34

36void AccountsServiceDBusAdaptor::setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value)

35void AccountsServiceDBusAdaptor::setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value)

37{

36{

38− qDebug() << "setting property" << property << value;

39 Q_UNUSED(user)

37 Q_UNUSED(user)

40 Q_UNUSED(interface)

38 Q_UNUSED(interface)

41 m_properties[property] = value;

39 m_properties[property] = value;