components/desktop/ekiga/patches/gcc47.patch

   1 diff -ur ekiga-3.2.7-bcp/lib/engine/account/bank-impl.h ekiga-3.2.7/lib/engine/account/bank-impl.h
   2 --- ekiga-3.2.7-bcp/lib/engine/account/bank-impl.h      2010-05-31 01:58:01.000000000 +0400
   3 +++ ekiga-3.2.7/lib/engine/account/bank-impl.h  2014-02-18 13:38:00.688884554 +0400
   4 @@ -212,7 +212,7 @@
   5  void
   6  Ekiga::BankImpl<AccountType>::add_account (gmref_ptr<AccountType> account)
   7  {
   8 -  add_object (account);
   9 +  this->add_object (account);
  10
  11    account->questions.add_handler (questions.make_slot ());
  12    account->registration_event.connect (sigc::bind (sigc::mem_fun (this, &Ekiga::BankImpl<AccountType>::on_registration_event), account));
  13 @@ -223,7 +223,7 @@
  14  void
  15  Ekiga::BankImpl<AccountType>::remove_account (gmref_ptr<AccountType> account)
  16  {
  17 -  remove_object (account);
  18 +  this->remove_object (account);
  19  }
  20
  21
  22 diff -ur ekiga-3.2.7-bcp/lib/engine/addressbook/book-impl.h ekiga-3.2.7/lib/engine/addressbook/book-impl.h
  23 --- ekiga-3.2.7-bcp/lib/engine/addressbook/book-impl.h  2010-05-31 01:58:01.000000000 +0400
  24 +++ ekiga-3.2.7/lib/engine/addressbook/book-impl.h      2014-02-18 13:37:12.645199024 +0400
  25 @@ -204,7 +204,7 @@
  26  Ekiga::BookImpl<ContactType>::add_contact (gmref_ptr<ContactType> contact)
  27  {
  28    contact->questions.add_handler (questions.make_slot ());
  29 -  add_object (contact);
  30 +  this->add_object (contact);
  31  }
  32
  33
  34 @@ -212,7 +212,7 @@
  35  void
  36  Ekiga::BookImpl<ContactType>::remove_contact (gmref_ptr<ContactType> contact)
  37  {
  38 -  remove_object (contact);
  39 +  this->remove_object (contact);
  40  }
  41
  42  #endif
  43 diff -ur ekiga-3.2.7-bcp/lib/engine/addressbook/source-impl.h ekiga-3.2.7/lib/engine/addressbook/source-impl.h
  44 --- ekiga-3.2.7-bcp/lib/engine/addressbook/source-impl.h        2010-05-31 01:58:01.000000000 +0400
  45 +++ ekiga-3.2.7/lib/engine/addressbook/source-impl.h    2014-02-18 13:37:34.531530475 +0400
  46 @@ -206,7 +206,7 @@
  47  void
  48  Ekiga::SourceImpl<BookType>::add_book (gmref_ptr<BookType> book)
  49  {
  50 -  add_object (book);
  51 +  this->add_object (book);
  52
  53    add_connection (book, book->contact_added.connect (sigc::bind<0> (contact_added.make_slot (), book)));
  54
  55 @@ -222,7 +222,7 @@
  56  void
  57  Ekiga::SourceImpl<BookType>::remove_book (gmref_ptr<BookType> book)
  58  {
  59 -  remove_object (book);
  60 +  this->remove_object (book);
  61  }
  62
  63  template<typename BookType>
  64 diff -ur ekiga-3.2.7-bcp/lib/engine/presence/cluster-impl.h ekiga-3.2.7/lib/engine/presence/cluster-impl.h
  65 --- ekiga-3.2.7-bcp/lib/engine/presence/cluster-impl.h  2010-05-31 01:58:01.000000000 +0400
  66 +++ ekiga-3.2.7/lib/engine/presence/cluster-impl.h      2014-02-18 13:35:26.230275518 +0400
  67 @@ -147,14 +147,14 @@
  68
  69    add_connection (heap, heap->questions.add_handler (questions.make_slot ()));
  70
  71 -  add_object (heap);
  72 +  this->add_object (heap);
  73  }
  74
  75  template<typename HeapType>
  76  void
  77  Ekiga::ClusterImpl<HeapType>::remove_heap (gmref_ptr<HeapType> heap)
  78  {
  79 -  remove_object (heap);
  80 +  this->remove_object (heap);
  81  }
  82
  83  template<typename HeapType>
  84 diff -ur ekiga-3.2.7-bcp/lib/engine/presence/heap-impl.h ekiga-3.2.7/lib/engine/presence/heap-impl.h
  85 --- ekiga-3.2.7-bcp/lib/engine/presence/heap-impl.h     2010-05-31 01:58:01.000000000 +0400
  86 +++ ekiga-3.2.7/lib/engine/presence/heap-impl.h 2014-02-18 13:34:16.650065722 +0400
  87 @@ -160,14 +160,14 @@
  88  {
  89    presentity->questions.add_handler (questions.make_slot ());
  90
  91 -  add_object (presentity);
  92 +  this->add_object (presentity);
  93  }
  94
  95  template<typename PresentityType>
  96  void
  97  Ekiga::HeapImpl<PresentityType>::remove_presentity (gmref_ptr<PresentityType> presentity)
  98  {
  99 -  remove_object (presentity);
 100 +  this->remove_object (presentity);
 101  }
 102
 103  #endif