ekiga r7803 - in trunk/lib/engine: components/common-videooutput components/libnotify components/local-roster components/mlogo-videoinput components/null-audioinput components/null-audiooutput components/opal components/ptlib gui/gtk-frontend

[jpuydt svn gnome org]

Author: jpuydt
Date: Mon Mar 23 20:40:30 2009
New Revision: 7803
URL: http://svn.gnome.org/viewvc/ekiga?rev=7803&view=rev

Log:
Use the "get" method of gmref_ptr instead of doing "&*"

Modified:
   trunk/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
   trunk/lib/engine/components/libnotify/libnotify-main.cpp
   trunk/lib/engine/components/local-roster/local-roster-bridge.cpp
   trunk/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp
   trunk/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
   trunk/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
   trunk/lib/engine/components/opal/h323-endpoint.cpp
   trunk/lib/engine/components/opal/opal-call-manager.cpp
   trunk/lib/engine/components/opal/opal-call.cpp
   trunk/lib/engine/components/opal/opal-videoinput.cpp
   trunk/lib/engine/components/opal/opal-videooutput.cpp
   trunk/lib/engine/components/opal/sip-endpoint.cpp
   trunk/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
   trunk/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
   trunk/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
   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/call-history-view-gtk.cpp
   trunk/lib/engine/gui/gtk-frontend/chat-area.cpp
   trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp
   trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp

Modified: trunk/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
==============================================================================
--- trunk/lib/engine/components/common-videooutput/videooutput-manager-common.cpp	(original)
+++ trunk/lib/engine/components/common-videooutput/videooutput-manager-common.cpp	Mon Mar 23 20:40:30 2009
@@ -52,7 +52,7 @@
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // take a reference on smart in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
 }
 
 GMVideoOutputManager::~GMVideoOutputManager ()

Modified: trunk/lib/engine/components/libnotify/libnotify-main.cpp
==============================================================================
--- trunk/lib/engine/components/libnotify/libnotify-main.cpp	(original)
+++ trunk/lib/engine/components/libnotify/libnotify-main.cpp	Mon Mar 23 20:40:30 2009
@@ -166,7 +166,7 @@
 				   urgency, NULL);
 
   g_signal_connect (notif, "closed",
-		    G_CALLBACK (on_notif_closed), &*notification);
+		    G_CALLBACK (on_notif_closed), notification.get ());
   sigc::connection conn = notification->removed.connect (sigc::bind (sigc::mem_fun (this, &LibNotify::on_notification_removed), notification));
 
   live[notification] = std::pair<sigc::connection, NotifyNotification*> (conn, notif);

Modified: trunk/lib/engine/components/local-roster/local-roster-bridge.cpp
==============================================================================
--- trunk/lib/engine/components/local-roster/local-roster-bridge.cpp	(original)
+++ trunk/lib/engine/components/local-roster/local-roster-bridge.cpp	Mon Mar 23 20:40:30 2009
@@ -91,7 +91,7 @@
     if (!heap->has_presentity_with_uri (uri)) {
 
       builder.add_action ("add", _("Add to local roster"),
-			  sigc::bind (sigc::mem_fun (&*heap, &Local::Heap::new_presentity),
+			  sigc::bind (sigc::mem_fun (heap.get (), &Local::Heap::new_presentity),
 				      contact->get_name (), uri));
       populated = true;
     }

Modified: trunk/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp
==============================================================================
--- trunk/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp	(original)
+++ trunk/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp	Mon Mar 23 20:40:30 2009
@@ -46,7 +46,7 @@
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // keep a reference in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
   current_state.opened  = false;
 }
 

Modified: trunk/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
==============================================================================
--- trunk/lib/engine/components/null-audioinput/audioinput-manager-null.cpp	(original)
+++ trunk/lib/engine/components/null-audioinput/audioinput-manager-null.cpp	Mon Mar 23 20:40:30 2009
@@ -44,7 +44,7 @@
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // take a reference in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
   current_state.opened = false;
 }
 

Modified: trunk/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
==============================================================================
--- trunk/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp	(original)
+++ trunk/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp	Mon Mar 23 20:40:30 2009
@@ -43,7 +43,7 @@
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // take a reference in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
   current_state[Ekiga::primary].opened = false;
   current_state[Ekiga::secondary].opened = false;
 }

Modified: trunk/lib/engine/components/opal/h323-endpoint.cpp
==============================================================================
--- trunk/lib/engine/components/opal/h323-endpoint.cpp	(original)
+++ trunk/lib/engine/components/opal/h323-endpoint.cpp	Mon Mar 23 20:40:30 2009
@@ -96,7 +96,7 @@
   {
     gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
     smart->reference (); // take a reference in the main thread
-    runtime = &*smart;
+    runtime = smart.get ();
   }
 
   /* Initial requested bandwidth */

Modified: trunk/lib/engine/components/opal/opal-call-manager.cpp
==============================================================================
--- trunk/lib/engine/components/opal/opal-call-manager.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-call-manager.cpp	Mon Mar 23 20:40:30 2009
@@ -144,7 +144,7 @@
   {
     gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
     smart->reference (); // take a reference in the main thread
-    runtime = &*smart;
+    runtime = smart.get ();
   }
 
   // used to communicate with the StunDetector
@@ -642,7 +642,7 @@
   gmref_ptr<Opal::Call> call (new Opal::Call (*this, core));
   call_core->add_call (call, gmref_ptr<CallManager>(this));
 
-  return &*call;
+  return call.get ();
 }
 
 

Modified: trunk/lib/engine/components/opal/opal-call.cpp
==============================================================================
--- trunk/lib/engine/components/opal/opal-call.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-call.cpp	Mon Mar 23 20:40:30 2009
@@ -80,7 +80,7 @@
   {
     gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
     smart->reference (); // take a reference in the main thread
-    runtime = &*smart;
+    runtime = smart.get ();
   }
   re_a_bytes = tr_a_bytes = re_v_bytes = tr_v_bytes = 0.0;
   last_v_tick = last_a_tick = PTime ();

Modified: trunk/lib/engine/components/opal/opal-videoinput.cpp
==============================================================================
--- trunk/lib/engine/components/opal/opal-videoinput.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-videoinput.cpp	Mon Mar 23 20:40:30 2009
@@ -83,7 +83,7 @@
   {
     gmref_ptr<Ekiga::VideoInputCore> smart = core.get ("videoinput-core");
     smart->reference (); // take a reference in the main thread
-    videoinput_core = &*smart;
+    videoinput_core = smart.get ();
   }
   opened = false;
   is_active = false;

Modified: trunk/lib/engine/components/opal/opal-videooutput.cpp
==============================================================================
--- trunk/lib/engine/components/opal/opal-videooutput.cpp	(original)
+++ trunk/lib/engine/components/opal/opal-videooutput.cpp	Mon Mar 23 20:40:30 2009
@@ -90,7 +90,7 @@
  {
    gmref_ptr<Ekiga::VideoOutputCore> smart = core.get ("videooutput-core");
    smart->reference (); // take a reference in the main thread
-   videooutput_core = &*smart;
+   videooutput_core = smart.get ();
  }
 
   is_active = FALSE;

Modified: trunk/lib/engine/components/opal/sip-endpoint.cpp
==============================================================================
--- trunk/lib/engine/components/opal/sip-endpoint.cpp	(original)
+++ trunk/lib/engine/components/opal/sip-endpoint.cpp	Mon Mar 23 20:40:30 2009
@@ -134,12 +134,12 @@
   {
     gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
     smart->reference (); // take a reference in the main thread
-    runtime = &*smart;
+    runtime = smart.get ();
   }
   {
     gmref_ptr<Opal::Bank> smart = core.get ("opal-account-store");
     smart->reference (); // take a reference in the main thread
-    bank = &*smart;
+    bank = smart.get ();
   }
 
 

Modified: trunk/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
==============================================================================
--- trunk/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp	(original)
+++ trunk/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp	Mon Mar 23 20:40:30 2009
@@ -46,7 +46,7 @@
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // take a reference in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
   current_state.opened = false;
   input_device = NULL;
   expectedFrameSize = 0;

Modified: trunk/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
==============================================================================
--- trunk/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp	(original)
+++ trunk/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp	Mon Mar 23 20:40:30 2009
@@ -45,7 +45,7 @@
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // take a reference in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
   current_state[Ekiga::primary].opened = false;
   current_state[Ekiga::secondary].opened = false;
   output_device[Ekiga::primary] = NULL;

Modified: trunk/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
==============================================================================
--- trunk/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp	(original)
+++ trunk/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp	Mon Mar 23 20:40:30 2009
@@ -45,7 +45,7 @@
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // take a reference in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
   current_state.opened = false;
   input_device = NULL;
   expectedFrameSize = 0;

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	Mon Mar 23 20:40:30 2009
@@ -449,7 +449,7 @@
   gtk_tree_store_set (GTK_TREE_STORE (store), &iter,
                       COLUMN_PIXBUF, icon, 
                       COLUMN_NAME, book->get_name ().c_str (),
-                      COLUMN_BOOK_POINTER, &*book, 
+                      COLUMN_BOOK_POINTER, book.get (), 
                       COLUMN_VIEW, view,
                       -1);
 
@@ -533,7 +533,7 @@
                           COLUMN_BOOK_POINTER, &book_iter,
                           -1);
 
-      if (&*book == book_iter) {
+      if (book.get () == book_iter) {
 
         break;
       }

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	Mon Mar 23 20:40:30 2009
@@ -352,7 +352,7 @@
   store = GTK_LIST_STORE (model);
 
   gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter, COLUMN_CONTACT_POINTER, &*contact, -1);
+  gtk_list_store_set (store, &iter, COLUMN_CONTACT_POINTER, contact.get (), -1);
   book_view_gtk_update_contact (self, contact, &iter);
 }
 
@@ -417,7 +417,7 @@
       gtk_tree_model_get (model, iter,
                           COLUMN_CONTACT_POINTER, &iter_contact,
                           -1);
-      if (iter_contact == &*contact)
+      if (iter_contact == contact.get ())
         found = TRUE;
 
     } while (!found && gtk_tree_model_iter_next (model, iter));

Modified: trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp	Mon Mar 23 20:40:30 2009
@@ -118,7 +118,7 @@
 
   gtk_list_store_prepend (store, &iter);
   gtk_list_store_set (store, &iter,
-		      COLUMN_CONTACT, &*contact,
+		      COLUMN_CONTACT, contact.get (),
 		      COLUMN_PIXBUF, id,
 		      COLUMN_NAME, contact->get_name ().c_str (),
 		      COLUMN_INFO, info.str ().c_str (),

Modified: trunk/lib/engine/gui/gtk-frontend/chat-area.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/chat-area.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/chat-area.cpp	Mon Mar 23 20:40:30 2009
@@ -1009,7 +1009,7 @@
 chat_area_new (gmref_ptr<Ekiga::Chat> chat)
 {
   return (GtkWidget*)g_object_new (TYPE_CHAT_AREA,
-				   "chat", &*chat,
+				   "chat", chat.get (),
 				   NULL);
 }
 

Modified: trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/presentity-view.cpp	Mon Mar 23 20:40:30 2009
@@ -252,6 +252,6 @@
 presentity_view_new (gmref_ptr<Ekiga::Presentity> presentity)
 {
   return (GtkWidget*)g_object_new (TYPE_PRESENTITY_VIEW,
-				   "presentity", &*presentity,
+				   "presentity", presentity.get (),
 				   NULL);
 }

Modified: trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp	Mon Mar 23 20:40:30 2009
@@ -912,7 +912,7 @@
 
   gtk_tree_store_set (self->priv->store, &iter,
 		      COLUMN_TYPE, TYPE_HEAP,
-		      COLUMN_HEAP, &*heap,
+		      COLUMN_HEAP, heap.get (),
 		      COLUMN_NAME, heap->get_name ().c_str (),
 		      -1);
   gtk_tree_view_expand_all (self->priv->tree_view);
@@ -974,8 +974,8 @@
     gtk_tree_store_set (self->priv->store, &iter,
 			COLUMN_TYPE, TYPE_PRESENTITY,
 			COLUMN_OFFLINE, active,
-			COLUMN_HEAP, &*heap,
-			COLUMN_PRESENTITY, &*presentity,
+			COLUMN_HEAP, heap.get (),
+			COLUMN_PRESENTITY, presentity.get (),
 			COLUMN_NAME, presentity->get_name ().c_str (),
 			COLUMN_STATUS, presentity->get_status ().c_str (),
 			COLUMN_PRESENCE, presentity->get_presence ().c_str (),
@@ -991,8 +991,8 @@
     gtk_tree_store_set (self->priv->store, &iter,
 			COLUMN_TYPE, TYPE_PRESENTITY,
 			COLUMN_OFFLINE, active,
-			COLUMN_HEAP, &*heap,
-			COLUMN_PRESENTITY, &*presentity,
+			COLUMN_HEAP, heap.get (),
+			COLUMN_PRESENTITY, presentity.get (),
 			COLUMN_NAME, presentity->get_name ().c_str (),
 			COLUMN_STATUS, presentity->get_status ().c_str (),
 			COLUMN_PRESENCE, presentity->get_presence ().c_str (),
@@ -1111,7 +1111,7 @@
     do {
 
       gtk_tree_model_get (model, iter, COLUMN_HEAP, &iter_heap, -1);
-      if (iter_heap == &*heap)
+      if (iter_heap == heap.get ())
 	found = TRUE;
     } while (!found && gtk_tree_model_iter_next (model, iter));
   }
@@ -1151,7 +1151,7 @@
     gtk_tree_store_append (view->priv->store, iter, heap_iter);
     gtk_tree_store_set (view->priv->store, iter,
                         COLUMN_TYPE, TYPE_GROUP,
-			COLUMN_HEAP, &*heap,
+			COLUMN_HEAP, heap.get (),
                         COLUMN_NAME, name.c_str (),
                         -1);
   }
@@ -1175,7 +1175,7 @@
     do {
 
       gtk_tree_model_get (model, iter, COLUMN_PRESENTITY, &iter_presentity, -1);
-      if (iter_presentity == &*presentity)
+      if (iter_presentity == presentity.get ())
 	found = TRUE;
     } while (!found && gtk_tree_model_iter_next (model, iter));
   }