[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=609d5d7

The following commit has been merged in the master branch:
commit 609d5d71644c2ad2c4c3c20fdf105286c6c4c0d4
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Apr 11 14:41:13 2013 +0100

    Fix JoinChatRoomDialog filtering
    
    Join chat room dialog filters by whether it support conference rooms
    this should just be normal textChatRooms. This fixes IRC not appearing
    in the list
    
    REVIEWED-BY: Martin Klapetek
    BUG: 317896
    FIXED-IN: 0.6.1
---
 KTp/Widgets/join-chat-room-dialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/Widgets/join-chat-room-dialog.cpp b/KTp/Widgets/join-chat-room-dialog.cpp
index 42b94eb..4c2e9bf 100644
--- a/KTp/Widgets/join-chat-room-dialog.cpp
+++ b/KTp/Widgets/join-chat-room-dialog.cpp
@@ -84,7 +84,7 @@ KTp::JoinChatRoomDialog::JoinChatRoomDialog(Tp::AccountManagerPtr accountManager
     isOnlineFilter->addProperty(QLatin1String("online"), true);
 
     Tp::AccountCapabilityFilterPtr capabilityFilter = Tp::AccountCapabilityFilter::create(
-                Tp::RequestableChannelClassSpecList() << Tp::RequestableChannelClassSpec::conferenceTextChatroom());
+                Tp::RequestableChannelClassSpecList() << Tp::RequestableChannelClassSpec::textChatroom());
 
     Tp::AccountFilterPtr filter = Tp::AndFilter<Tp::Account>::create((QList<Tp::AccountFilterConstPtr>() <<
                                              isOnlineFilter <<

-- 
ktp-common-internals packaging