GNOME.org
 

[ekiga] Trivial changes for better sed-ability

commit 7d9fe3d99628a5a8890d85680d0a253e2eb4ee6c
Author: Julien Puydt <jpuydt gnome org>
Date:   Sun Jun 21 21:26:23 2009 +0200

    Trivial changes for better sed-ability

 .../gmconf-personal-details-main.cpp               |    3 +-
 lib/engine/components/gstreamer/gst-main.cpp       |    9 +--
 lib/engine/components/loudmouth/loudmouth-main.cpp |   10 ++--
 .../mlogo-videoinput/videoinput-main-mlogo.cpp     |    3 +-
 lib/engine/components/resource-list/rl-heap.cpp    |    4 +-
 .../components/resource-list/rl-presentity.cpp     |    6 +-
 .../x-videooutput/videooutput-main-x.cpp           |    3 +-
 lib/engine/gui/gtk-frontend/presentity-view.cpp    |    2 +-
 lib/engine/protocol/call-manager.cpp               |    2 +-
 src/dbus-helper/dbus.cpp                           |    3 +-
 src/gui/assistant.cpp                              |   18 ++---
 src/gui/main.cpp                                   |   73 +++++++-------------
 src/gui/preferences.cpp                            |   21 ++----
 13 files changed, 57 insertions(+), 100 deletions(-)
---
diff --git a/lib/engine/components/gmconf-personal-details/gmconf-personal-details-main.cpp b/lib/engine/components/gmconf-personal-details/gmconf-personal-details-main.cpp
index ab3ad86..6dcbc18 100644
--- a/lib/engine/components/gmconf-personal-details/gmconf-personal-details-main.cpp
+++ b/lib/engine/components/gmconf-personal-details/gmconf-personal-details-main.cpp
@@ -45,8 +45,7 @@ gmconf_personal_details_init (Ekiga::ServiceCore &core,
                               char ** /*argv*/[])
 {
   bool result = false;
-  gmref_ptr<Ekiga::PersonalDetails> personal_details
-    = core.get ("personal-details");
+  gmref_ptr<Ekiga::PersonalDetails> personal_details = core.get ("personal-details");
 
   if ( !personal_details) {
 
diff --git a/lib/engine/components/gstreamer/gst-main.cpp b/lib/engine/components/gstreamer/gst-main.cpp
index aee7faf..1739bb4 100644
--- a/lib/engine/components/gstreamer/gst-main.cpp
+++ b/lib/engine/components/gstreamer/gst-main.cpp
@@ -71,12 +71,9 @@ struct GSTSpark: public Ekiga::Spark
 			    int* argc,
 			    char** argv[])
   {
-    gmref_ptr<Ekiga::AudioInputCore> audioinput_core
-      = core.get ("audioinput-core");
-    gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-      = core.get ("audiooutput-core");
-    gmref_ptr<Ekiga::VideoInputCore> videoinput_core
-      = core.get ("videoinput-core");
+    gmref_ptr<Ekiga::AudioInputCore> audioinput_core = core.get ("audioinput-core");
+    gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = core.get ("audiooutput-core");
+    gmref_ptr<Ekiga::VideoInputCore> videoinput_core = core.get ("videoinput-core");
     Ekiga::ServicePtr service = core.get ("gstreamer");
 
     if (audioinput_core && audiooutput_core && videoinput_core && !service) {
diff --git a/lib/engine/components/loudmouth/loudmouth-main.cpp b/lib/engine/components/loudmouth/loudmouth-main.cpp
index 78c340e..d95ff45 100644
--- a/lib/engine/components/loudmouth/loudmouth-main.cpp
+++ b/lib/engine/components/loudmouth/loudmouth-main.cpp
@@ -54,11 +54,11 @@ struct LOUDMOUTHSpark: public Ekiga::Spark
 			    int* /*argc*/,
 			    char** /*argv*/[])
   {
-    Ekiga::ServicePtr service(core.get ("loudmouth-bank"));
-    gmref_ptr<Ekiga::PresenceCore> presence (core.get ("presence-core"));
-    gmref_ptr<Ekiga::AccountCore> account (core.get ("account-core"));
-    gmref_ptr<Ekiga::ChatCore> chat (core.get ("chat-core"));
-    gmref_ptr<Ekiga::PersonalDetails> details (core.get ("personal-details"));
+    Ekiga::ServicePtr service = core.get ("loudmouth-bank");
+    gmref_ptr<Ekiga::PresenceCore> presence = core.get ("presence-core");
+    gmref_ptr<Ekiga::AccountCore> account = core.get ("account-core");
+    gmref_ptr<Ekiga::ChatCore> chat = core.get ("chat-core");
+    gmref_ptr<Ekiga::PersonalDetails> details = core.get ("personal-details");
 
     if ( !service && presence && account && chat && details) {
 
diff --git a/lib/engine/components/mlogo-videoinput/videoinput-main-mlogo.cpp b/lib/engine/components/mlogo-videoinput/videoinput-main-mlogo.cpp
index 41d40de..4a07bed 100644
--- a/lib/engine/components/mlogo-videoinput/videoinput-main-mlogo.cpp
+++ b/lib/engine/components/mlogo-videoinput/videoinput-main-mlogo.cpp
@@ -46,8 +46,7 @@ videoinput_mlogo_init (Ekiga::ServiceCore &core,
 	    char **/*argv*/[])
 {
   bool result = false;
-  gmref_ptr<Ekiga::VideoInputCore> videoinput_core
-    = core.get ("videoinput-core");
+  gmref_ptr<Ekiga::VideoInputCore> videoinput_core = core.get ("videoinput-core");
 
   if (videoinput_core) {
 
diff --git a/lib/engine/components/resource-list/rl-heap.cpp b/lib/engine/components/resource-list/rl-heap.cpp
index 1f1e80b..7a07ca8 100644
--- a/lib/engine/components/resource-list/rl-heap.cpp
+++ b/lib/engine/components/resource-list/rl-heap.cpp
@@ -220,7 +220,7 @@ RL::Heap::get_node () const
 void
 RL::Heap::refresh ()
 {
-  gmref_ptr<XCAP::Core> xcap(services.get ("xcap-core"));
+  gmref_ptr<XCAP::Core> xcap = services.get ("xcap-core");
   std::string root_str;
   std::string username_str;
   std::string password_str;
@@ -599,7 +599,7 @@ RL::Heap::on_new_entry_form_submitted (bool submitted,
     path = path->build_child ("resource-lists");
     path = path->build_child ("list");
     path = path->build_child_with_attribute ("entry", "uri", entry_uri);
-    gmref_ptr<XCAP::Core> xcap(services.get ("xcap-core"));
+    gmref_ptr<XCAP::Core> xcap = services.get ("xcap-core");
     xcap->write (path, "application/xcap-el+xml",
 		 (const char*)xmlBufferContent (buffer),
 		 sigc::mem_fun (this, &RL::Heap::new_entry_result));
diff --git a/lib/engine/components/resource-list/rl-presentity.cpp b/lib/engine/components/resource-list/rl-presentity.cpp
index 2cd1f7e..2c22cd3 100644
--- a/lib/engine/components/resource-list/rl-presentity.cpp
+++ b/lib/engine/components/resource-list/rl-presentity.cpp
@@ -295,7 +295,7 @@ RL::Presentity::save (bool reload)
 
   if (result >= 0) {
 
-    gmref_ptr<XCAP::Core> xcap(services.get ("xcap-core"));
+    gmref_ptr<XCAP::Core> xcap = services.get ("xcap-core");
     xcap->write (path, "application/xcap-el+xml",
 		 (const char*)xmlBufferContent (buffer),
 		 sigc::bind (sigc::mem_fun (this, &RL::Presentity::save_result),
@@ -311,11 +311,11 @@ RL::Presentity::remove ()
 {
   xmlUnlinkNode (node);
   xmlFreeNode (node);
-  gmref_ptr<Ekiga::PresenceCore> presence_core(services.get ("presence-core"));
+  gmref_ptr<Ekiga::PresenceCore> presence_core = services.get ("presence-core");
 
   presence_core->unfetch_presence (uri);
 
-  gmref_ptr<XCAP::Core> xcap(services.get ("xcap-core"));
+  gmref_ptr<XCAP::Core> xcap = services.get ("xcap-core");
   xcap->erase (path,
 	       sigc::mem_fun (this, &RL::Presentity::erase_result));
 }
diff --git a/lib/engine/components/x-videooutput/videooutput-main-x.cpp b/lib/engine/components/x-videooutput/videooutput-main-x.cpp
index 7ff991f..b25ab22 100644
--- a/lib/engine/components/x-videooutput/videooutput-main-x.cpp
+++ b/lib/engine/components/x-videooutput/videooutput-main-x.cpp
@@ -45,8 +45,7 @@ videooutput_x_init (Ekiga::ServiceCore &core,
 	    char **/*argv*/[])
 {
   bool result = false;
-  gmref_ptr<Ekiga::VideoOutputCore> videooutput_core
-    = core.get ("videooutput-core");
+  gmref_ptr<Ekiga::VideoOutputCore> videooutput_core = core.get ("videooutput-core");
 
   if (videooutput_core) {
 
diff --git a/lib/engine/gui/gtk-frontend/presentity-view.cpp b/lib/engine/gui/gtk-frontend/presentity-view.cpp
index 4a8a681..ab9229c 100644
--- a/lib/engine/gui/gtk-frontend/presentity-view.cpp
+++ b/lib/engine/gui/gtk-frontend/presentity-view.cpp
@@ -119,7 +119,7 @@ presentity_view_unset_presentity (PresentityView* self)
 {
   if (self->priv->presentity) {
 
-    self->priv->presentity = Ekiga::PresentityPtr(0);
+    self->priv->presentity.reset ();
     self->priv->updated_conn.disconnect ();
     self->priv->removed_conn.disconnect ();
   }
diff --git a/lib/engine/protocol/call-manager.cpp b/lib/engine/protocol/call-manager.cpp
index f124ddd..c6368cd 100644
--- a/lib/engine/protocol/call-manager.cpp
+++ b/lib/engine/protocol/call-manager.cpp
@@ -58,7 +58,7 @@ gmref_ptr<CallProtocolManager> CallManager::get_protocol_manager (const std::str
     if ((*iter)->get_protocol_name () == protocol)
       return (*iter);
 
-  return gmref_ptr<CallProtocolManager>(0);
+  return gmref_ptr<CallProtocolManager>();
 }
 
 
diff --git a/src/dbus-helper/dbus.cpp b/src/dbus-helper/dbus.cpp
index eb6cacc..79fd3ea 100644
--- a/src/dbus-helper/dbus.cpp
+++ b/src/dbus-helper/dbus.cpp
@@ -136,8 +136,7 @@ ekiga_dbus_component_call (EkigaDBusComponent *self,
                            const gchar *uri,
                            G_GNUC_UNUSED GError **error)
 {
-  gmref_ptr<Ekiga::CallCore> call_core
-    = self->priv->core->get ("call-core");
+  gmref_ptr<Ekiga::CallCore> call_core = self->priv->core->get ("call-core");
   call_core->dial (uri);
 
   return TRUE;
diff --git a/src/gui/assistant.cpp b/src/gui/assistant.cpp
index 883c10d..8a7431b 100644
--- a/src/gui/assistant.cpp
+++ b/src/gui/assistant.cpp
@@ -1217,8 +1217,7 @@ void
 get_audiooutput_devices_list (Ekiga::ServiceCore *core,
                               std::vector<std::string> & device_list)
 {
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = core->get ("audiooutput-core");
   std::vector <Ekiga::AudioOutputDevice> devices;
 
   device_list.clear();
@@ -1241,8 +1240,7 @@ void
 get_audioinput_devices_list (Ekiga::ServiceCore *core,
                              std::vector<std::string> & device_list)
 {
-  gmref_ptr<Ekiga::AudioInputCore> audioinput_core
-    = core->get ("audioinput-core");
+  gmref_ptr<Ekiga::AudioInputCore> audioinput_core = core->get ("audioinput-core");
   std::vector <Ekiga::AudioInputDevice> devices;
 
   device_list.clear();
@@ -1265,8 +1263,7 @@ void
 get_videoinput_devices_list (Ekiga::ServiceCore *core,
                                         std::vector<std::string> & device_list)
 {
-  gmref_ptr<Ekiga::VideoInputCore> videoinput_core
-    = core->get ("videoinput-core");
+  gmref_ptr<Ekiga::VideoInputCore> videoinput_core = core->get ("videoinput-core");
   std::vector<Ekiga::VideoInputDevice> devices;
 
   device_list.clear();
@@ -1630,12 +1627,9 @@ ekiga_assistant_new (Ekiga::ServiceCore *core)
                     G_CALLBACK (ekiga_assistant_key_press_cb), NULL);
 
   sigc::connection conn;
-  gmref_ptr<Ekiga::VideoInputCore> videoinput_core
-    = core->get ("videoinput-core");
-  gmref_ptr<Ekiga::AudioInputCore> audioinput_core
-    = core->get ("audioinput-core");
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::VideoInputCore> videoinput_core = core->get ("videoinput-core");
+  gmref_ptr<Ekiga::AudioInputCore> audioinput_core = core->get ("audioinput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = core->get ("audiooutput-core");
 
   conn = videoinput_core->device_added.connect (sigc::bind (sigc::ptr_fun (on_videoinput_device_added_cb), assistant));
   assistant->priv->connections.push_back (conn);
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 4465362..8f8c2d3 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -539,8 +539,7 @@ static void on_setup_call_cb (gmref_ptr<Ekiga::CallManager>  /*manager*/,
                               gpointer self)
 {
   EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (self);
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = mw->priv->core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = mw->priv->core->get ("audiooutput-core");
 
   if (!call->is_outgoing ()) {
     ekiga_main_window_update_calling_state (mw, Called);
@@ -566,8 +565,7 @@ static void on_ringing_call_cb (gmref_ptr<Ekiga::CallManager>  /*manager*/,
                                 gpointer self)
 {
   EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (self);
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = mw->priv->core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = mw->priv->core->get ("audiooutput-core");
 
   if (call->is_outgoing ()) {
     audiooutput_core->start_play_event("ring_tone_sound", 3000, 256);
@@ -585,8 +583,7 @@ static gboolean on_stats_refresh_cb (gpointer self)
   if (mw->priv->calling_state == Connected && mw->priv->current_call) {
 
     Ekiga::VideoOutputStats videooutput_stats;
-    gmref_ptr<Ekiga::VideoOutputCore> videooutput_core
-      = mw->priv->core->get ("videooutput-core");
+    gmref_ptr<Ekiga::VideoOutputCore> videooutput_core = mw->priv->core->get ("videooutput-core");
     videooutput_core->get_videooutput_stats(videooutput_stats);
   
     msg = g_strdup_printf (_("A:%.1f/%.1f   V:%.1f/%.1f   FPS:%d/%d"), 
@@ -618,10 +615,8 @@ static gboolean on_signal_level_refresh_cb (gpointer self)
 {
   EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (self);
 
-  gmref_ptr<Ekiga::AudioInputCore> audioinput_core
-    = mw->priv->core->get ("audioinput-core");
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = mw->priv->core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioInputCore> audioinput_core = mw->priv->core->get ("audioinput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = mw->priv->core->get ("audiooutput-core");
 
   gm_level_meter_set_level (GM_LEVEL_METER (mw->priv->output_signal), audiooutput_core->get_average_level());
   gm_level_meter_set_level (GM_LEVEL_METER (mw->priv->input_signal), audioinput_core->get_average_level());
@@ -656,8 +651,7 @@ static void on_established_call_cb (gmref_ptr<Ekiga::CallManager>  /*manager*/,
   mw->priv->timeout_id = g_timeout_add (1000, on_stats_refresh_cb, self);
 #endif
 
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = mw->priv->core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = mw->priv->core->get ("audiooutput-core");
 
   audiooutput_core->stop_play_event("incoming_call_sound");
   audiooutput_core->stop_play_event("ring_tone_sound");
@@ -687,12 +681,11 @@ static void on_cleared_call_cb (gmref_ptr<Ekiga::CallManager>  /*manager*/,
   ekiga_main_window_update_logo_have_window (mw);
 
   if (mw->priv->current_call && mw->priv->current_call->get_id () == call->get_id ()) {
-    mw->priv->current_call = gmref_ptr<Ekiga::Call>(0);
+    mw->priv->current_call = gmref_ptr<Ekiga::Call>();
     g_source_remove (mw->priv->timeout_id);
     mw->priv->timeout_id = -1;
   }
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = mw->priv->core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = mw->priv->core->get ("audiooutput-core");
 
   audiooutput_core->stop_play_event("incoming_call_sound");
   audiooutput_core->stop_play_event("ring_tone_sound");
@@ -707,8 +700,7 @@ static void on_cleared_incoming_call_cb (std::string /*reason*/,
 {
   EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (GnomeMeeting::Process ()->GetMainWindow ());
 
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = mw->priv->core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = mw->priv->core->get ("audiooutput-core");
   audiooutput_core->stop_play_event("incoming_call_sound");
   audiooutput_core->stop_play_event("ring_tone_sound");
 
@@ -757,8 +749,7 @@ static void on_missed_call_cb (gmref_ptr<Ekiga::CallManager>  /*manager*/,
                                gpointer self)
 {
   EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (self);
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = mw->priv->core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = mw->priv->core->get ("audiooutput-core");
 
   audiooutput_core->stop_play_event ("incoming_call_sound");
   audiooutput_core->stop_play_event ("ring_tone_sound");
@@ -1839,8 +1830,7 @@ on_chat_unread_alert (G_GNUC_UNUSED GtkWidget* widget,
     return;
 
   Ekiga::ServiceCore *core = GnomeMeeting::Process ()->GetServiceCore ();
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = core->get ("audiooutput-core");
 
   std::string file_name_string = gm_conf_get_string (SOUND_EVENTS_KEY "new_message_sound");
 
@@ -1974,10 +1964,8 @@ audio_volume_changed_cb (GtkAdjustment * /*adjustment*/,
 {
   EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (data);
 
-  gmref_ptr<Ekiga::AudioInputCore> audioinput_core
-    = mw->priv->core->get ("audioinput-core");
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = mw->priv->core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioInputCore> audioinput_core = mw->priv->core->get ("audioinput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = mw->priv->core->get ("audiooutput-core");
 
   audiooutput_core->set_volume (Ekiga::primary, (unsigned) GTK_ADJUSTMENT (mw->priv->adj_output_volume)->value);
   audioinput_core->set_volume ((unsigned) GTK_ADJUSTMENT (mw->priv->adj_input_volume)->value);
@@ -1989,10 +1977,8 @@ audio_volume_window_shown_cb (GtkWidget * /*widget*/,
 {
   EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (data);
 
-  gmref_ptr<Ekiga::AudioInputCore> audioinput_core
-    = mw->priv->core->get ("audioinput-core");
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = mw->priv->core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioInputCore> audioinput_core = mw->priv->core->get ("audioinput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = mw->priv->core->get ("audiooutput-core");
 
   audioinput_core->set_average_collection (true);
   audiooutput_core->set_average_collection (true);
@@ -2006,10 +1992,8 @@ audio_volume_window_hidden_cb (GtkWidget * /*widget*/,
 {
   EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (data);
 
-  gmref_ptr<Ekiga::AudioInputCore> audioinput_core
-    = mw->priv->core->get ("audioinput-core");
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = mw->priv->core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioInputCore> audioinput_core = mw->priv->core->get ("audioinput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = mw->priv->core->get ("audiooutput-core");
 
   g_source_remove (mw->priv->levelmeter_timeout_id);
   audioinput_core->set_average_collection (false);
@@ -2022,8 +2006,7 @@ video_settings_changed_cb (GtkAdjustment * /*adjustment*/,
 { 
   EkigaMainWindow *mw = EKIGA_MAIN_WINDOW (data);
 
-  gmref_ptr<Ekiga::VideoInputCore> videoinput_core
-    = mw->priv->core->get ("videoinput-core");
+  gmref_ptr<Ekiga::VideoInputCore> videoinput_core = mw->priv->core->get ("videoinput-core");
 
   videoinput_core->set_whiteness ((unsigned) GTK_ADJUSTMENT (mw->priv->adj_whiteness)->value);
   videoinput_core->set_brightness ((unsigned) GTK_ADJUSTMENT (mw->priv->adj_brightness)->value);
@@ -2783,8 +2766,7 @@ closed_cb (NotifyNotification* /*notify*/,
 
   mw = EKIGA_MAIN_WINDOW (main_window);
 
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = mw->priv->core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = mw->priv->core->get ("audiooutput-core");
   if (audiooutput_core) 
     audiooutput_core->stop_play_event ("incoming_call_sound");
 }
@@ -3113,8 +3095,7 @@ ekiga_main_window_init_menu (EkigaMainWindow *mw)
   g_return_if_fail (mw != NULL);
 
   services = GnomeMeeting::Process ()->GetServiceCore ();
-  gmref_ptr<Ekiga::Trigger> local_cluster_trigger
-    = services->get ("local-cluster");
+  gmref_ptr<Ekiga::Trigger> local_cluster_trigger = services->get ("local-cluster");
   gmref_ptr<GtkFrontend> gtk_frontend = services->get ("gtk-frontend");
   addressbook_window = GTK_WIDGET (gtk_frontend->get_addressbook_window ()); 
   accounts_window = GnomeMeeting::Process ()->GetAccountsWindow ();
@@ -3751,7 +3732,7 @@ ekiga_main_window_init (EkigaMainWindow *mw)
 
   mw->priv->presentity = NULL;
   mw->priv->transfer_call_popup = NULL;
-  mw->priv->current_call = gmref_ptr<Ekiga::Call>(0);
+  mw->priv->current_call = gmref_ptr<Ekiga::Call>();
   mw->priv->timeout_id = -1;
   mw->priv->levelmeter_timeout_id = -1;
   mw->priv->audio_transmission_active = false;
@@ -3955,8 +3936,7 @@ ekiga_main_window_connect_engine_signals (EkigaMainWindow *mw)
   g_return_if_fail (EKIGA_IS_MAIN_WINDOW (mw));
 
   /* New Display Engine signals */
-  gmref_ptr<Ekiga::VideoOutputCore> videooutput_core
-    = mw->priv->core->get ("videooutput-core");
+  gmref_ptr<Ekiga::VideoOutputCore> videooutput_core = mw->priv->core->get ("videooutput-core");
 
   conn = videooutput_core->device_opened.connect (sigc::bind (sigc::ptr_fun (on_videooutput_device_opened_cb), (gpointer) mw));
   mw->priv->connections.push_back (conn);
@@ -3974,8 +3954,7 @@ ekiga_main_window_connect_engine_signals (EkigaMainWindow *mw)
   mw->priv->connections.push_back (conn);
 
   /* New VideoInput Engine signals */
-  gmref_ptr<Ekiga::VideoInputCore> videoinput_core
-    = mw->priv->core->get ("videoinput-core");
+  gmref_ptr<Ekiga::VideoInputCore> videoinput_core = mw->priv->core->get ("videoinput-core");
 
   conn = videoinput_core->device_opened.connect (sigc::bind (sigc::ptr_fun (on_videoinput_device_opened_cb), (gpointer) mw));
   mw->priv->connections.push_back (conn);
@@ -3993,8 +3972,7 @@ ekiga_main_window_connect_engine_signals (EkigaMainWindow *mw)
   mw->priv->connections.push_back (conn);
 
   /* New AudioInput Engine signals */
-  gmref_ptr<Ekiga::AudioInputCore> audioinput_core
-    = mw->priv->core->get ("audioinput-core");
+  gmref_ptr<Ekiga::AudioInputCore> audioinput_core = mw->priv->core->get ("audioinput-core");
 
   conn = audioinput_core->device_opened.connect (sigc::bind (sigc::ptr_fun (on_audioinput_device_opened_cb), (gpointer) mw));
   mw->priv->connections.push_back (conn);
@@ -4012,8 +3990,7 @@ ekiga_main_window_connect_engine_signals (EkigaMainWindow *mw)
   mw->priv->connections.push_back (conn);
 
   /* New AudioOutput Engine signals */
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = mw->priv->core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = mw->priv->core->get ("audiooutput-core");
 
   conn = audiooutput_core->device_opened.connect (sigc::bind (sigc::ptr_fun (on_audiooutput_device_opened_cb), (gpointer) mw));
   mw->priv->connections.push_back (conn);
diff --git a/src/gui/preferences.cpp b/src/gui/preferences.cpp
index e17e438..c61dcd3 100644
--- a/src/gui/preferences.cpp
+++ b/src/gui/preferences.cpp
@@ -788,8 +788,7 @@ void
 gm_prefs_window_get_videoinput_devices_list (Ekiga::ServiceCore *core,
                                         std::vector<std::string> & device_list)
 {
-  gmref_ptr<Ekiga::VideoInputCore> videoinput_core
-    = core->get ("videoinput-core");
+  gmref_ptr<Ekiga::VideoInputCore> videoinput_core = core->get ("videoinput-core");
   std::vector <Ekiga::VideoInputDevice> devices;
 
   device_list.clear();
@@ -811,8 +810,7 @@ void
 gm_prefs_window_get_audiooutput_devices_list (Ekiga::ServiceCore *core,
                                         std::vector<std::string> & device_list)
 {
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = core->get ("audiooutput-core");
   std::vector <Ekiga::AudioOutputDevice> devices;
 
   std::string device_string;
@@ -837,8 +835,7 @@ void
 gm_prefs_window_get_audioinput_devices_list (Ekiga::ServiceCore *core,
                                         std::vector<std::string> & device_list)
 {
-  gmref_ptr<Ekiga::AudioInputCore> audioinput_core
-    = core->get ("audioinput-core");
+  gmref_ptr<Ekiga::AudioInputCore> audioinput_core = core->get ("audioinput-core");
   std::vector <Ekiga::AudioInputDevice> devices;
 
   device_list.clear();
@@ -1209,8 +1206,7 @@ audioev_filename_browse_play_cb (GtkWidget* /* playbutton */,
 
   //FIXME
   Ekiga::ServiceCore *core = GnomeMeeting::Process ()->GetServiceCore (); 
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = core->get ("audiooutput-core");
 
   gchar* file_name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (data));
   std::string file_name_string = file_name;
@@ -1410,12 +1406,9 @@ gm_prefs_window_new (Ekiga::ServiceCore *core)
 		    G_CALLBACK (delete_window_cb), NULL);
 
   sigc::connection conn;
-  gmref_ptr<Ekiga::VideoInputCore> videoinput_core
-    = core->get ("videoinput-core");
-  gmref_ptr<Ekiga::AudioInputCore> audioinput_core
-    = core->get ("audioinput-core");
-  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core
-    = core->get ("audiooutput-core");
+  gmref_ptr<Ekiga::VideoInputCore> videoinput_core = core->get ("videoinput-core");
+  gmref_ptr<Ekiga::AudioInputCore> audioinput_core = core->get ("audioinput-core");
+  gmref_ptr<Ekiga::AudioOutputCore> audiooutput_core = core->get ("audiooutput-core");
 
   conn = videoinput_core->device_added.connect (sigc::bind (sigc::ptr_fun (on_videoinput_device_added_cb), window));
   pw->connections.push_back (conn);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]