r34792 - /desktop/unstable/ekiga/debian/patches/gcc47.patch

[kilian at users.alioth.debian.org]

Author: kilian
Date: Sat May 12 11:35:37 2012
New Revision: 34792

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34792
Log:
Refresh gcc47.patch against 3.2.7 source

Modified:
    desktop/unstable/ekiga/debian/patches/gcc47.patch

Modified: desktop/unstable/ekiga/debian/patches/gcc47.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/ekiga/debian/patches/gcc47.patch?rev=34792&op=diff
==============================================================================
--- desktop/unstable/ekiga/debian/patches/gcc47.patch [utf-8] (original)
+++ desktop/unstable/ekiga/debian/patches/gcc47.patch [utf-8] Sat May 12 11:35:37 2012
@@ -12,36 +12,32 @@
 Subject: Fix compile error with gcc 4.7
 
 ---
-diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h
-index e16848e..b0a8775 100644
 --- a/lib/engine/account/bank-impl.h
 +++ b/lib/engine/account/bank-impl.h
-@@ -203,7 +203,7 @@ template<typename AccountType>
+@@ -212,7 +212,7 @@ template<typename AccountType>
  void
- Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account)
+ Ekiga::BankImpl<AccountType>::add_account (gmref_ptr<AccountType> account)
  {
 -  add_object (account);
 +  this->add_object (account);
  
-   account->questions.connect (boost::ref (questions));
- }
-@@ -213,7 +213,7 @@ template<typename AccountType>
+   account->questions.add_handler (questions.make_slot ());
+   account->registration_event.connect (sigc::bind (sigc::mem_fun (this, &Ekiga::BankImpl<AccountType>::on_registration_event), account));
+@@ -223,7 +223,7 @@ template<typename AccountType>
  void
- Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account)
+ Ekiga::BankImpl<AccountType>::remove_account (gmref_ptr<AccountType> account)
  {
 -  remove_object (account);
 +  this->remove_object (account);
  }
  
- #endif
-diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h
-index 711d8d9..4fea7d5 100644
+ 
 --- a/lib/engine/addressbook/book-impl.h
 +++ b/lib/engine/addressbook/book-impl.h
 @@ -204,7 +204,7 @@ void
- Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact)
+ Ekiga::BookImpl<ContactType>::add_contact (gmref_ptr<ContactType> contact)
  {
-   contact->questions.connect (boost::ref (questions));
+   contact->questions.add_handler (questions.make_slot ());
 -  add_object (contact);
 +  this->add_object (contact);
  }
@@ -49,46 +45,40 @@
  
 @@ -212,7 +212,7 @@ template<typename ContactType>
  void
- Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact)
+ Ekiga::BookImpl<ContactType>::remove_contact (gmref_ptr<ContactType> contact)
  {
 -  remove_object (contact);
 +  this->remove_object (contact);
  }
  
  #endif
-diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h
-index a30cd03..630236f 100644
 --- a/lib/engine/addressbook/source-impl.h
 +++ b/lib/engine/addressbook/source-impl.h
 @@ -206,7 +206,7 @@ template<typename BookType>
  void
- Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book)
+ Ekiga::SourceImpl<BookType>::add_book (gmref_ptr<BookType> book)
  {
 -  add_object (book);
 +  this->add_object (book);
  
-   add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1)));
+   add_connection (book, book->contact_added.connect (sigc::bind<0> (contact_added.make_slot (), book)));
  
-diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h
-index 245a7c6..92074a8 100644
 --- a/lib/engine/presence/cluster-impl.h
 +++ b/lib/engine/presence/cluster-impl.h
-@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap)
+@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (
  
-   add_connection (heap, heap->questions.connect (boost::ref (questions)));
+   add_connection (heap, heap->questions.add_handler (questions.make_slot ()));
  
 -  add_object (heap);
 +  this->add_object (heap);
  }
  
  template<typename HeapType>
-diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h
-index d63c491..15fe86f 100644
 --- a/lib/engine/presence/heap-impl.h
 +++ b/lib/engine/presence/heap-impl.h
-@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp
+@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_pre
  {
-   presentity->questions.connect (boost::ref (questions));
+   presentity->questions.add_handler (questions.make_slot ());
  
 -  add_object (presentity);
 +  this->add_object (presentity);
@@ -96,12 +86,10 @@
  
  template<typename PresentityType>
  void
- Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity)
+ Ekiga::HeapImpl<PresentityType>::remove_presentity (gmref_ptr<PresentityType> presentity)
  {
 -  remove_object (presentity);
 +  this->remove_object (presentity);
  }
  
  #endif
---
-cgit v0.9.0.2