From 8269d572d084d6db200f2c02a439c7d95a235643 Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Sat, 4 Aug 2012 19:59:39 +0200
Subject: tubes: remove unused parameter

Change-Id: I22cd7cc866696dd7def7d7cb20d00da68d408137
---
 tubes/inc/tubes/conference.hxx | 6 +-----
 tubes/inc/tubes/manager.hxx    | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'tubes/inc')

diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index 150e77ffe2fd..1a8627b48fb6 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -35,7 +35,6 @@
 #include <tubes/warnings_guard_boost_signals2.hpp>
 
 class Collaboration;
-class TeleManager;
 class TeleConferenceImpl;
 typedef struct _TpAccount TpAccount;
 typedef struct _TpContact TpContact;
@@ -47,8 +46,7 @@ class TeleConference
 {
 public:
 
-    TeleConference( TeleManager* pManager,
-                    TpAccount* pAccount,
+    TeleConference( TpAccount* pAccount,
                     TpDBusTubeChannel* pChannel,
                     const OString sUuid = OString(),
                     bool bMaster = false );
@@ -82,7 +80,6 @@ public:
     void                    setChannel( TpAccount* pAccount, TpDBusTubeChannel* pChannel );
     bool                    offerTube();
     bool                    acceptTube();
-    TeleManager*            getManager() const  { return mpManager; }
 
     // Only for callbacks.
     bool                    setTube( GDBusConnection* pTube );
@@ -103,7 +100,6 @@ private:
     bool                    spinUntilTubeEstablished();
 
     Collaboration*          mpCollaboration;
-    TeleManager*            mpManager;
     TpAccount*              mpAccount;
     TpDBusTubeChannel*      mpChannel;
     OString                 msUuid;
diff --git a/tubes/inc/tubes/manager.hxx b/tubes/inc/tubes/manager.hxx
index 7c895e4dac22..ab5e39a0ae51 100644
--- a/tubes/inc/tubes/manager.hxx
+++ b/tubes/inc/tubes/manager.hxx
@@ -144,7 +144,7 @@ public:
 
     // Only for callbacks.
     static void             addConference( TeleConference* pConference );
-    void                    setChannelReadyHandlerInvoked( bool b );
+    static void             setChannelReadyHandlerInvoked( bool b );
     bool                    isChannelReadyHandlerInvoked() const;
     void                    setAccountManagerReadyHandlerInvoked( bool b );
     bool                    isAccountManagerReadyHandlerInvoked() const;
-- 
cgit