GNOME.org
 

[ekiga] Got rid of quite a few compilation warnings

commit 0fb0f30920a506264edd1930e5b75dbaaa4b31ad
Author: Julien Puydt <jpuydt newton localdomain>
Date:   Sun Sep 25 21:39:41 2011 +0200

    Got rid of quite a few compilation warnings
    
    They were harmless... but noise can hide harmful ones if not kept in check!

 .../null-audioinput/audioinput-manager-null.cpp    |   30 ++++++++++++----
 .../null-audiooutput/audiooutput-manager-null.cpp  |   36 +++++++++++++++-----
 lib/gui/gmmenuaddon.c                              |    3 ++
 lib/gui/gmstatusbar.c                              |    5 ++-
 plugins/loudmouth/loudmouth-dialect.cpp            |   18 +++++-----
 5 files changed, 66 insertions(+), 26 deletions(-)
---
diff --git a/lib/engine/components/null-audioinput/audioinput-manager-null.cpp b/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
index 4ef2662..b98abca 100644
--- a/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
+++ b/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
@@ -38,6 +38,11 @@
 #define DEVICE_SOURCE "Ekiga"
 #define DEVICE_NAME   "SILENT"
 
+#if DEBUG
+#define DEBUG_ARG(a) a
+#else
+#define DEBUG_ARG(a)
+#endif
 
 GMAudioInputManager_null::GMAudioInputManager_null (Ekiga::ServiceCore & _core)
 :    core (_core)
@@ -49,7 +54,8 @@ GMAudioInputManager_null::~GMAudioInputManager_null ()
 {
 }
 
-void GMAudioInputManager_null::get_devices(std::vector <Ekiga::AudioInputDevice> & devices)
+void
+GMAudioInputManager_null::get_devices(std::vector <Ekiga::AudioInputDevice> & DEBUG_ARG(devices))
 {
 #if DEBUG
   Ekiga::AudioInputDevice device;
@@ -60,7 +66,8 @@ void GMAudioInputManager_null::get_devices(std::vector <Ekiga::AudioInputDevice>
 #endif
 }
 
-bool GMAudioInputManager_null::set_device (const Ekiga::AudioInputDevice & device)
+bool
+GMAudioInputManager_null::set_device (const Ekiga::AudioInputDevice & device)
 {
   if ( ( device.type   == DEVICE_TYPE ) &&
        ( device.source == DEVICE_SOURCE) &&
@@ -73,7 +80,10 @@ bool GMAudioInputManager_null::set_device (const Ekiga::AudioInputDevice & devic
   return false;
 }
 
-bool GMAudioInputManager_null::open (unsigned channels, unsigned samplerate, unsigned bits_per_sample)
+bool
+GMAudioInputManager_null::open (unsigned channels,
+				unsigned samplerate,
+				unsigned bits_per_sample)
 {
   PTRACE(4, "GMAudioInputManager_null\tOpening Device " << current_state.device);
   PTRACE(4, "GMAudioInputManager_null\tOpening Device with " << channels << "-" << samplerate << "/" << bits_per_sample);
@@ -93,15 +103,18 @@ bool GMAudioInputManager_null::open (unsigned channels, unsigned samplerate, uns
   return true;
 }
 
-void GMAudioInputManager_null::close()
+void
+GMAudioInputManager_null::close()
 {
   current_state.opened = false;
   Ekiga::Runtime::run_in_main (boost::bind (&GMAudioInputManager_null::device_closed_in_main, this, current_state.device));
 }
 
 
-bool GMAudioInputManager_null::get_frame_data (char *data, 
-                                                unsigned size, unsigned & bytes_read)
+bool
+GMAudioInputManager_null::get_frame_data (char *data, 
+					  unsigned size,
+					  unsigned & bytes_read)
 {
   if (!current_state.opened) {
     PTRACE(1, "GMAudioInputManager_null\tTrying to get frame from closed device");
@@ -117,7 +130,10 @@ bool GMAudioInputManager_null::get_frame_data (char *data,
   return true;
 }
 
-bool GMAudioInputManager_null::has_device(const std::string & /*source*/, const std::string & /*device_name*/, Ekiga::AudioInputDevice & /*device*/)
+bool
+GMAudioInputManager_null::has_device(const std::string & /*source*/,
+				     const std::string & /*device_name*/,
+				     Ekiga::AudioInputDevice & /*device*/)
 {
   return false;
 }
diff --git a/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp b/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
index 3bf3a31..a2bb537 100644
--- a/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
+++ b/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
@@ -38,6 +38,12 @@
 #define DEVICE_SOURCE "Ekiga"
 #define DEVICE_NAME   "SILENT"
 
+#if DEBUG
+#define DEBUG_ARG(a) a
+#else
+#define DEBUG_ARG(a)
+#endif
+
 GMAudioOutputManager_null::GMAudioOutputManager_null (Ekiga::ServiceCore & _core)
 : core (_core)
 {
@@ -49,7 +55,8 @@ GMAudioOutputManager_null::~GMAudioOutputManager_null ()
 {
 }
 
-void GMAudioOutputManager_null::get_devices(std::vector <Ekiga::AudioOutputDevice> & devices)
+void
+GMAudioOutputManager_null::get_devices(std::vector <Ekiga::AudioOutputDevice> & DEBUG_ARG(devices))
 {
 #if DEBUG
   Ekiga::AudioOutputDevice device;
@@ -61,7 +68,9 @@ void GMAudioOutputManager_null::get_devices(std::vector <Ekiga::AudioOutputDevic
 }
 
 
-bool GMAudioOutputManager_null::set_device (Ekiga::AudioOutputPS ps, const Ekiga::AudioOutputDevice & device)
+bool
+GMAudioOutputManager_null::set_device (Ekiga::AudioOutputPS ps,
+				       const Ekiga::AudioOutputDevice & device)
 {
   if ( ( device.type   == DEVICE_TYPE ) &&
        ( device.source == DEVICE_SOURCE) &&
@@ -74,7 +83,11 @@ bool GMAudioOutputManager_null::set_device (Ekiga::AudioOutputPS ps, const Ekiga
   return false;
 }
 
-bool GMAudioOutputManager_null::open (Ekiga::AudioOutputPS ps, unsigned channels, unsigned samplerate, unsigned bits_per_sample)
+bool
+GMAudioOutputManager_null::open (Ekiga::AudioOutputPS ps,
+				 unsigned channels,
+				 unsigned samplerate,
+				 unsigned bits_per_sample)
 {
   current_state[ps].channels        = channels;
   current_state[ps].samplerate      = samplerate;
@@ -94,17 +107,19 @@ bool GMAudioOutputManager_null::open (Ekiga::AudioOutputPS ps, unsigned channels
   return true;
 }
 
-void GMAudioOutputManager_null::close(Ekiga::AudioOutputPS ps)
+void
+GMAudioOutputManager_null::close(Ekiga::AudioOutputPS ps)
 {
   current_state[ps].opened = false;
   Ekiga::Runtime::run_in_main (boost::bind (&GMAudioOutputManager_null::device_closed_in_main, this, ps, current_state[ps].device));
 }
 
 
-bool GMAudioOutputManager_null::set_frame_data (Ekiga::AudioOutputPS ps, 
-                     const char */*data*/, 
-                     unsigned size,
-		     unsigned & bytes_written)
+bool
+GMAudioOutputManager_null::set_frame_data (Ekiga::AudioOutputPS ps, 
+					   const char */*data*/, 
+					   unsigned size,
+					   unsigned & bytes_written)
 {
   if (!current_state[ps].opened) {
     PTRACE(1, "GMAudioOutputManager_null\tTrying to get frame from closed device[" << ps << "]");
@@ -117,7 +132,10 @@ bool GMAudioOutputManager_null::set_frame_data (Ekiga::AudioOutputPS ps,
   return true;
 }
 
-bool GMAudioOutputManager_null::has_device(const std::string & /*sink*/, const std::string & /*device_name*/, Ekiga::AudioOutputDevice & /*device*/)
+bool
+GMAudioOutputManager_null::has_device(const std::string & /*sink*/,
+				      const std::string & /*device_name*/,
+				      Ekiga::AudioOutputDevice & /*device*/)
 {
   return false;
 }
diff --git a/lib/gui/gmmenuaddon.c b/lib/gui/gmmenuaddon.c
index 23e3349..39c96b0 100644
--- a/lib/gui/gmmenuaddon.c
+++ b/lib/gui/gmmenuaddon.c
@@ -123,8 +123,11 @@ menu_item_selected (GtkWidget *w,
   GtkWidget *statusbar = NULL;
 
   gint id = 0;
+#if GTK_CHECK_VERSION (2, 21, 2)
+#else
   int len = 0;
   int i = 0;
+#endif
 
   statusbar = (GtkWidget *) g_object_get_data (G_OBJECT (w), "statusbar");
 
diff --git a/lib/gui/gmstatusbar.c b/lib/gui/gmstatusbar.c
index b1991c8..4203343 100644
--- a/lib/gui/gmstatusbar.c
+++ b/lib/gui/gmstatusbar.c
@@ -97,11 +97,14 @@ gm_sb_push_message (GmStatusbar *sb,
 		    const char *msg,
 		    va_list args)
 {
+  static guint timer_source;
   gint id = 0;
   gint msg_id = 0;
+#if GTK_CHECK_VERSION (2, 21, 2)
+#else
   int len = 0;
   int i = 0;
-  static guint timer_source;
+#endif
 
   g_return_if_fail (sb != NULL);
 
diff --git a/plugins/loudmouth/loudmouth-dialect.cpp b/plugins/loudmouth/loudmouth-dialect.cpp
index 17c5d26..92fdd79 100644
--- a/plugins/loudmouth/loudmouth-dialect.cpp
+++ b/plugins/loudmouth/loudmouth-dialect.cpp
@@ -154,35 +154,35 @@ LM::Dialect::on_open_group_chat_submitted (bool submitted,
 }
 
 void
-LM::Dialect::handle_up (LmConnection* connection,
-			const std::string name)
+LM::Dialect::handle_up (LmConnection* /*connection*/,
+			const std::string /*name*/)
 {
   /* nothing to do afaict */
 }
 
 void
-LM::Dialect::handle_down (LmConnection* connection)
+LM::Dialect::handle_down (LmConnection* /*connection*/)
 {
   // FIXME: here we should find all dead c(h)ats
 }
 
 LmHandlerResult
-LM::Dialect::handle_iq (LmConnection* connection,
-			LmMessage* message)
+LM::Dialect::handle_iq (LmConnection* /*connection*/,
+			LmMessage* /*message*/)
 {
   return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; // FIXME: implement properly
 }
 
 LmHandlerResult
-LM::Dialect::handle_message (LmConnection* connection,
-			     LmMessage* message)
+LM::Dialect::handle_message (LmConnection* /*connection*/,
+			     LmMessage* /*message*/)
 {
   return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; // FIXME: implement properly
 }
 
 LmHandlerResult
-LM::Dialect::handle_presence (LmConnection* connection,
-			      LmMessage* message)
+LM::Dialect::handle_presence (LmConnection* /*connection*/,
+			      LmMessage* /*message*/)
 {
   return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; // FIXME: implement properly
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]