ekiga-gcc47.patch

   1 diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h
   2 index e16848e..b0a8775 100644
   3 --- a/lib/engine/account/bank-impl.h
   4 +++ b/lib/engine/account/bank-impl.h
   5 @@ -203,7 +203,7 @@ template<typename AccountType>
   6  void
   7  Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account)
   8  {
   9 -  add_object (account);
  10 +  this->add_object (account);
  11
  12    account->questions.connect (boost::ref (questions));
  13  }
  14 @@ -213,7 +213,7 @@ template<typename AccountType>
  15  void
  16  Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account)
  17  {
  18 -  remove_object (account);
  19 +  this->remove_object (account);
  20  }
  21
  22  #endif
  23 diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h
  24 index 711d8d9..4fea7d5 100644
  25 --- a/lib/engine/addressbook/book-impl.h
  26 +++ b/lib/engine/addressbook/book-impl.h
  27 @@ -204,7 +204,7 @@ void
  28  Ekiga::BookImpl<ContactType>::add_contact (gmref_ptr<ContactType> contact)
  29  {
  30    contact->questions.add_handler (questions.make_slot ());
  31 -  add_object (contact);
  32 +  this->add_object (contact);
  33  }
  34
  35
  36 @@ -212,7 +212,7 @@ template<typename ContactType>
  37  void
  38  Ekiga::BookImpl<ContactType>::remove_contact (gmref_ptr<ContactType> contact)
  39  {
  40 -  remove_object (contact);
  41 +  this->remove_object (contact);
  42  }
  43
  44  #endif
  45 diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h
  46 index a30cd03..630236f 100644
  47 --- a/lib/engine/addressbook/source-impl.h
  48 +++ b/lib/engine/addressbook/source-impl.h
  49 @@ -206,7 +206,7 @@ template<typename BookType>
  50  void
  51  Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book)
  52  {
  53 -  add_object (book);
  54 +  this->add_object (book);
  55
  56    add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1)));
  57
  58 diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h
  59 index 245a7c6..92074a8 100644
  60 --- a/lib/engine/presence/cluster-impl.h
  61 +++ b/lib/engine/presence/cluster-impl.h
  62 @@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap)
  63
  64    add_connection (heap, heap->questions.connect (boost::ref (questions)));
  65
  66 -  add_object (heap);
  67 +  this->add_object (heap);
  68  }
  69
  70  template<typename HeapType>
  71 diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h
  72 index d63c491..15fe86f 100644
  73 --- a/lib/engine/presence/heap-impl.h
  74 +++ b/lib/engine/presence/heap-impl.h
  75 @@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp
  76  {
  77    presentity->questions.add_handler (questions.make_slot ());
  78
  79 -  add_object (presentity);
  80 +  this->add_object (presentity);
  81  }
  82
  83  template<typename PresentityType>
  84  void
  85  Ekiga::HeapImpl<PresentityType>::remove_presentity (gmref_ptr<PresentityType> presentity)
  86  {
  87 -  remove_object (presentity);
  88 +  this->remove_object (presentity);
  89  }
  90
  91  #endif