TelepathyIM / telepathy-morse

Telegram connection manager for the Telepathy framework
GNU General Public License v2.0
61 stars 10 forks source link

setSubscribtionState #34

Closed criztovyl closed 8 years ago

criztovyl commented 8 years ago
$ LANG=C make
[ 20%] Automatic moc for target telepathy-morse
[ 20%] Built target telepathy-morse_automoc
Scanning dependencies of target telepathy-morse
[ 20%] Building CXX object CMakeFiles/telepathy-morse.dir/connection.cpp.o
/home/christoph/build/telepathy-morse/connection.cpp: In member function 'void MorseConnection::whenContactListChanged()':
/home/christoph/build/telepathy-morse/connection.cpp:1138:59: error: no matching function for call to 'MorseConnection::setSubscriptionState(QVector<unsigned int>&, Tp::SubscriptionState)'
     setSubscriptionState(handles, Tp::SubscriptionStateYes);
                                                           ^
/home/christoph/build/telepathy-morse/connection.cpp:1044:6: note: candidate: void MorseConnection::setSubscriptionState(const QVector<MorseIdentifier>&, const QList<unsigned int>&, uint)
 void MorseConnection::setSubscriptionState(const QVector<MorseIdentifier> &identifiers, const QList<uint> &handles, uint state)
      ^~~~~~~~~~~~~~~
/home/christoph/build/telepathy-morse/connection.cpp:1044:6: note:   candidate expects 3 arguments, 2 provided
CMakeFiles/telepathy-morse.dir/build.make:86: recipe for target 'CMakeFiles/telepathy-morse.dir/connection.cpp.o' failed
make[2]: *** [CMakeFiles/telepathy-morse.dir/connection.cpp.o] Error 1
CMakeFiles/Makefile2:67: recipe for target 'CMakeFiles/telepathy-morse.dir/all' failed
make[1]: *** [CMakeFiles/telepathy-morse.dir/all] Error 2
Makefile:127: recipe for target 'all' failed
make: *** [all] Error 2

You removed the corresponding function w/ https://github.com/TelepathyQt/telepathy-morse/commit/72bc262ff77b34dfce8b9db25097499bea75a3dd (Previously it did nothing? But there's that call to updateContactsStatus with that identifiers passed to setSubscribtionState directly below, so that did the job? ^^)

Kaffeine commented 8 years ago

My fault, I missed a chunk of code (the same as you proposed to commit). The dev branch should work, though.

https://github.com/TelepathyQt/telepathy-morse/commit/749a275d4ec2aad49d8358e526c87b806c25f085

Kaffeine commented 8 years ago

The code change is correct, but the commit message is not. If you want to have this merged, then please change the message to something more descriptive and informative, like "Fixed setSubscriptionState() usage". Or I can push my fix in two minutes.

criztovyl commented 8 years ago

How about that? ^^

Kaffeine commented 8 years ago

Thank you! Merged.