[Telepathy-commits] [telepathy-salut/master] Squash unused variables when !ENABLE_DEBUG

Will Thompson will.thompson at collabora.co.uk
Sun Jan 11 09:51:49 PST 2009


---
 src/salut-muc-channel.c             |    6 +++++-
 src/salut-xmpp-connection-manager.c |    2 ++
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/salut-muc-channel.c b/src/salut-muc-channel.c
index 973df22..4c6723c 100644
--- a/src/salut-muc-channel.c
+++ b/src/salut-muc-channel.c
@@ -668,7 +668,9 @@ salut_muc_channel_add_member (GObject *iface,
                               GError **error)
 {
   SalutMucChannel *self = SALUT_MUC_CHANNEL(iface);
+#ifdef ENABLE_DEBUG
   SalutMucChannelPrivate *priv = SALUT_MUC_CHANNEL_GET_PRIVATE (self);
+#endif
   TpBaseConnection *base_connection = TP_BASE_CONNECTION (self->connection);
   TpIntSet *empty, *remote_pending;
 
@@ -959,12 +961,14 @@ gboolean
 salut_muc_channel_invited (SalutMucChannel *self, TpHandle inviter,
                           const gchar *stanza, GError **error)
 {
-  SalutMucChannelPrivate *priv = SALUT_MUC_CHANNEL_GET_PRIVATE (self);
   TpBaseConnection *base_connection = TP_BASE_CONNECTION (self->connection);
+#ifdef ENABLE_DEBUG
+  SalutMucChannelPrivate *priv = SALUT_MUC_CHANNEL_GET_PRIVATE (self);
   TpHandleRepoIface *contact_repo =
       tp_base_connection_get_handles (base_connection, TP_HANDLE_TYPE_CONTACT);
   TpHandleRepoIface *room_repo =
       tp_base_connection_get_handles (base_connection, TP_HANDLE_TYPE_ROOM);
+#endif
   gboolean ret = TRUE;
 
   /* Got invited to this muc channel */
diff --git a/src/salut-xmpp-connection-manager.c b/src/salut-xmpp-connection-manager.c
index 2d09f91..39eb94d 100644
--- a/src/salut-xmpp-connection-manager.c
+++ b/src/salut-xmpp-connection-manager.c
@@ -753,6 +753,7 @@ incoming_pending_connection_stream_opened_cb (GibberXmppConnection *conn,
     }
   else
     {
+#ifdef ENABLE_DEBUG
       GList *l;
 
       DEBUG ("Incoming connection from a machine with %d contacts. "
@@ -765,6 +766,7 @@ incoming_pending_connection_stream_opened_cb (GibberXmppConnection *conn,
 
           DEBUG ("--> %s\n", contact->name);
         }
+#endif
     }
 }
 
-- 
1.5.6.5



More information about the Telepathy-commits mailing list