[ekiga] The call history view doesn't need much boost::signals::connection management!



commit f66a3ce272cbc99942246ed3421646367bd8ca33
Author: Julien Puydt <jpuydt free fr>
Date:   Sat Feb 9 21:58:49 2013 +0100

    The call history view doesn't need much boost::signals::connection management!

 .../gui/gtk-frontend/call-history-view-gtk.cpp     |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
index 1857e39..38104c5 100644
--- a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
@@ -56,7 +56,7 @@ struct _CallHistoryViewGtkPrivate
   boost::shared_ptr<History::Book> book;
   GtkListStore* store;
   GtkTreeView* tree;
-  std::vector<boost::signals::connection> connections;
+  boost::signals::scoped_connection connection;
 };
 
 /* this is what we put in the view */
@@ -229,12 +229,6 @@ call_history_view_gtk_dispose (GObject* obj)
 
   view = CALL_HISTORY_VIEW_GTK (obj);
 
-  for (std::vector<boost::signals::connection>::iterator iter
-	 = view->priv->connections.begin ();
-       iter != view->priv->connections.end ();
-       iter++)
-    iter->disconnect ();
-
   if (view->priv->store) {
 
     g_object_unref (view->priv->store);
@@ -314,8 +308,6 @@ call_history_view_gtk_new (boost::shared_ptr<History::Book> book)
   GtkCellRenderer *renderer = NULL;
   GtkTreeSelection *selection = NULL;
 
-  boost::signals::connection conn;
-
   g_return_val_if_fail (book, (GtkWidget*)NULL);
 
   self = (CallHistoryViewGtk*)g_object_new (CALL_HISTORY_VIEW_GTK_TYPE, NULL);
@@ -363,8 +355,7 @@ call_history_view_gtk_new (boost::shared_ptr<History::Book> book)
 		    G_CALLBACK (on_clicked), &(*book));
 
   /* connect to the signal */
-  conn = book->updated.connect (boost::bind (&on_book_updated, self));
-  self->priv->connections.push_back (conn);
+  self->priv->connection = book->updated.connect (boost::bind (&on_book_updated, self));
 
   /* initial populate */
   on_book_updated(self);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]