ekiga r7810 - in trunk/lib/engine: addressbook gui/gtk-frontend

[jpuydt svn gnome org]

Author: jpuydt
Date: Tue Mar 24 21:08:00 2009
New Revision: 7810
URL: http://svn.gnome.org/viewvc/ekiga?rev=7810&view=rev

Log:
Syntactic sugar : Ekiga::BookPtr instead of gmref_ptr<Ekiga::Book>

Modified:
   trunk/lib/engine/addressbook/book.h
   trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp
   trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
   trunk/lib/engine/gui/gtk-frontend/book-view-gtk.h

Modified: trunk/lib/engine/addressbook/book.h
==============================================================================
--- trunk/lib/engine/addressbook/book.h	(original)
+++ trunk/lib/engine/addressbook/book.h	Tue Mar 24 21:08:00 2009
@@ -135,6 +135,8 @@
      */
     ChainOfResponsibility<FormRequest*> questions;
   };
+
+  typedef gmref_ptr<Book> BookPtr;
 };
 
 #endif

Modified: trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/addressbook-window.cpp	Tue Mar 24 21:08:00 2009
@@ -104,7 +104,7 @@
  * BEHAVIOR     : 
  * PRE          : The given GtkWidget pointer must be an SearchBook GObject.
  */
-static bool visit_books (gmref_ptr<Ekiga::Book> book,
+static bool visit_books (Ekiga::BookPtr book,
 			 gmref_ptr<Ekiga::Source> source,
 			 gpointer data);
 
@@ -115,7 +115,7 @@
  * PRE          : The given GtkWidget pointer must be an SearchBook GObject.
  */
 static void on_book_added (gmref_ptr<Ekiga::Source> source,
-			   gmref_ptr<Ekiga::Book> book,
+			   Ekiga::BookPtr book,
                            gpointer data);
 
 
@@ -125,7 +125,7 @@
  * PRE          : The given GtkWidget pointer must be an SearchBook GObject.
  */
 static void on_book_removed (gmref_ptr<Ekiga::Source> source,
-			     gmref_ptr<Ekiga::Book> book,
+			     Ekiga::BookPtr book,
                              gpointer data);
 
 
@@ -135,7 +135,7 @@
  * PRE          : The given GtkWidget pointer must be an SearchBook GObject.
  */
 static void on_book_updated (gmref_ptr<Ekiga::Source> source,
-			     gmref_ptr<Ekiga::Book> book,
+			     Ekiga::BookPtr book,
                              gpointer data);
 
 /* DESCRIPTION  : Called when the ContactCore has a form request
@@ -187,7 +187,7 @@
  * PRE          : /
  */
 static void addressbook_window_add_book (AddressBookWindow * self,
-                                         gmref_ptr<Ekiga::Book> book);
+                                         Ekiga::BookPtr book);
 
 
 /* DESCRIPTION  : /
@@ -196,7 +196,7 @@
  * PRE          : /
  */
 static void addressbook_window_update_book (AddressBookWindow *self,
-                                            gmref_ptr<Ekiga::Book> book);
+                                            Ekiga::BookPtr book);
 
 
 /* DESCRIPTION  : /
@@ -204,7 +204,7 @@
  * PRE          : /
  */
 static void addressbook_window_remove_book (AddressBookWindow *self,
-                                            gmref_ptr<Ekiga::Book> book);
+                                            Ekiga::BookPtr book);
 
 
 /* DESCRIPTION  : /
@@ -215,7 +215,7 @@
  * PRE          : /
  */
 static gboolean find_iter_for_book (AddressBookWindow *addressbook_window,
-                                    gmref_ptr<Ekiga::Book> book,
+                                    Ekiga::BookPtr book,
                                     GtkTreeIter *iter);
 
 
@@ -259,7 +259,7 @@
 }
 
 
-static bool visit_books (gmref_ptr<Ekiga::Book> book,
+static bool visit_books (Ekiga::BookPtr book,
 			 gmref_ptr<Ekiga::Source> source,
 			 gpointer data)
 {
@@ -271,7 +271,7 @@
 
 static void
 on_book_added (gmref_ptr<Ekiga::Source> /*source*/,
-	       gmref_ptr<Ekiga::Book> book,
+	       Ekiga::BookPtr book,
                gpointer data)
 {
   addressbook_window_add_book (ADDRESSBOOK_WINDOW (data), book);
@@ -280,7 +280,7 @@
 
 static void
 on_book_removed (gmref_ptr<Ekiga::Source> /*source*/,
-		 gmref_ptr<Ekiga::Book> book,
+		 Ekiga::BookPtr book,
                  gpointer data)
 {
   addressbook_window_remove_book (ADDRESSBOOK_WINDOW (data), book);
@@ -289,7 +289,7 @@
 
 static void
 on_book_updated (gmref_ptr<Ekiga::Source> /*source*/,
-		 gmref_ptr<Ekiga::Book> book,
+		 Ekiga::BookPtr book,
                  gpointer data)
 {
   addressbook_window_update_book (ADDRESSBOOK_WINDOW (data), book);
@@ -422,7 +422,7 @@
 /* Implementation of the private functions */
 static void
 addressbook_window_add_book (AddressBookWindow *self,
-                             gmref_ptr<Ekiga::Book> book)
+                             Ekiga::BookPtr book)
 {
   GtkTreeIter iter;
   GtkTreeModel *store = NULL;
@@ -465,7 +465,7 @@
 
 static void
 addressbook_window_update_book (AddressBookWindow *self,
-                                gmref_ptr<Ekiga::Book> book)
+                                Ekiga::BookPtr book)
 {
   GtkTreeIter iter;
   GtkTreeModel *store = NULL;
@@ -480,7 +480,7 @@
 
 static void
 addressbook_window_remove_book (AddressBookWindow *self,
-                                gmref_ptr<Ekiga::Book> book)
+                                Ekiga::BookPtr book)
 {
   GtkTreeIter iter;
   gint page = -1;
@@ -517,7 +517,7 @@
 
 static gboolean
 find_iter_for_book (AddressBookWindow *self,
-                    gmref_ptr<Ekiga::Book> book,
+                    Ekiga::BookPtr book,
                     GtkTreeIter *iter)
 {
   Ekiga::Book *book_iter = NULL;

Modified: trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/book-view-gtk.cpp	Tue Mar 24 21:08:00 2009
@@ -51,7 +51,7 @@
  */
 struct _BookViewGtkPrivate
 {
-  _BookViewGtkPrivate (gmref_ptr<Ekiga::Book> book_) : book (book_) { }
+  _BookViewGtkPrivate (Ekiga::BookPtr book_) : book (book_) { }
 
   GtkTreeView *tree_view;
   GtkWidget *vbox;
@@ -59,7 +59,7 @@
   GtkWidget *statusbar;
   GtkWidget *scrolled_window;
 
-  gmref_ptr<Ekiga::Book> book;
+  Ekiga::BookPtr book;
   std::list<sigc::connection> connections;
 };
 
@@ -523,7 +523,7 @@
 
 /* public methods implementation */
 GtkWidget *
-book_view_gtk_new (gmref_ptr<Ekiga::Book> book)
+book_view_gtk_new (Ekiga::BookPtr book)
 {
   BookViewGtk *result = NULL;
 

Modified: trunk/lib/engine/gui/gtk-frontend/book-view-gtk.h
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/book-view-gtk.h	(original)
+++ trunk/lib/engine/gui/gtk-frontend/book-view-gtk.h	Tue Mar 24 21:08:00 2009
@@ -47,7 +47,7 @@
 
 /* public api */
 
-GtkWidget *book_view_gtk_new (gmref_ptr<Ekiga::Book> book);
+GtkWidget *book_view_gtk_new (Ekiga::BookPtr book);
 
 void book_view_gtk_populate_menu (BookViewGtk *, GtkWidget *);