diff -durN mate-media-2.32.0.orig//mate-volume-control/src/gvc-applet.c mate-media-2.32.0/mate-volume-control/src/gvc-applet.c
--- mate-media-2.32.0.orig//mate-volume-control/src/gvc-applet.c	2010-09-28 18:46:15.000000000 +0400
+++ mate-media-2.32.0/mate-volume-control/src/gvc-applet.c	2010-11-04 04:37:52.000000000 +0300
@@ -143,7 +143,9 @@
                                                          stream);
                 maybe_show_status_icons(applet);
         } else {
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Unable to get default source, or no source available");
+#endif
         }
 }
 
@@ -174,7 +176,9 @@
 on_control_connecting (GvcMixerControl *control,
                        GvcApplet       *applet)
 {
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Connecting..");
+#endif
 }
 
 static void
diff -durN mate-media-2.32.0.orig//mate-volume-control/src/gvc-balance-bar.c mate-media-2.32.0/mate-volume-control/src/gvc-balance-bar.c
--- mate-media-2.32.0.orig//mate-volume-control/src/gvc-balance-bar.c	2010-09-28 18:46:15.000000000 +0400
+++ mate-media-2.32.0/mate-volume-control/src/gvc-balance-bar.c	2010-11-04 04:37:52.000000000 +0300
@@ -208,9 +208,9 @@
 {
         const gdouble *volumes;
         gdouble val;
-
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Volume changed (for %s bar)", btype_to_string (bar->priv->btype));
-
+#endif
         volumes = gvc_channel_map_get_volume (map);
         switch (bar->priv->btype) {
         case BALANCE_TYPE_RL:
diff -durN mate-media-2.32.0.orig//mate-volume-control/src/gvc-log.c mate-media-2.32.0/mate-volume-control/src/gvc-log.c
--- mate-media-2.32.0.orig//mate-volume-control/src/gvc-log.c	2009-08-13 15:31:18.000000000 +0400
+++ mate-media-2.32.0/mate-volume-control/src/gvc-log.c	2010-11-04 04:37:52.000000000 +0300
@@ -55,7 +55,9 @@
 {
         if (debug) {
                 log_levels |= G_LOG_LEVEL_DEBUG;
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Enabling debugging");
+#endif
         } else {
                 log_levels &= ~G_LOG_LEVEL_DEBUG;
         }
diff -durN mate-media-2.32.0.orig//mate-volume-control/src/gvc-mixer-card.c mate-media-2.32.0/mate-volume-control/src/gvc-mixer-card.c
--- mate-media-2.32.0.orig//mate-volume-control/src/gvc-mixer-card.c	2010-09-28 18:46:15.000000000 +0400
+++ mate-media-2.32.0/mate-volume-control/src/gvc-mixer-card.c	2010-11-04 04:54:54.000000000 +0300
@@ -203,10 +203,12 @@
         if (success > 0) {
                 gvc_mixer_card_set_profile (card, card->priv->target_profile);
         } else {
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Failed to switch profile on '%s' from '%s' to '%s'",
                          card->priv->name,
                          card->priv->profile,
                          card->priv->target_profile);
+#endif
         }
         g_free (card->priv->target_profile);
         card->priv->target_profile = NULL;
diff -durN mate-media-2.32.0.orig//mate-volume-control/src/gvc-mixer-control.c mate-media-2.32.0/mate-volume-control/src/gvc-mixer-control.c
--- mate-media-2.32.0.orig//mate-volume-control/src/gvc-mixer-control.c	2010-09-28 18:46:15.000000000 +0400
+++ mate-media-2.32.0/mate-volume-control/src/gvc-mixer-control.c	2010-11-04 04:37:52.000000000 +0300
@@ -150,9 +150,9 @@
                            pa_strerror (pa_context_errno (control->priv->pa_context)));
                 return;
         }
-
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Changed default device for %s to %s", info->name, info->device);
-
+#endif
         pa_operation_unref (o);
 }
 
@@ -639,7 +639,8 @@
         char            map_buff[PA_CHANNEL_MAP_SNPRINT_MAX];
 
         pa_channel_map_snprint (map_buff, PA_CHANNEL_MAP_SNPRINT_MAX, &info->channel_map);
-#if 1
+
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Updating sink: index=%u name='%s' description='%s' map='%s'",
                  info->index,
                  info->name,
@@ -677,7 +678,9 @@
                 is_new = TRUE;
         } else if (gvc_mixer_stream_is_running (stream)) {
                 /* Ignore events if volume changes are outstanding */
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Ignoring event, volume changes are outstanding");
+#endif
                 return;
         }
 
@@ -721,7 +724,7 @@
         gboolean        is_new;
         pa_volume_t     max_volume;
 
-#if 1
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Updating source: index=%u name='%s' description='%s'",
                  info->index,
                  info->name,
@@ -765,7 +768,9 @@
                 is_new = TRUE;
         } else if (gvc_mixer_stream_is_running (stream)) {
                 /* Ignore events if volume changes are outstanding */
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Ignoring event, volume changes are outstanding");
+#endif
                 return;
         }
 
@@ -883,7 +888,7 @@
         pa_volume_t     max_volume;
         const char     *name;
 
-#if 0
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Updating sink input: index=%u name='%s' client=%u sink=%u",
                  info->index,
                  info->name,
@@ -905,7 +910,9 @@
                 is_new = TRUE;
         } else if (gvc_mixer_stream_is_running (stream)) {
                 /* Ignore events if volume changes are outstanding */
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Ignoring event, volume changes are outstanding");
+#endif
                 return;
         }
 
@@ -939,7 +946,7 @@
         gboolean        is_new;
         const char     *name;
 
-#if 1
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Updating source output: index=%u name='%s' client=%u source=%u",
                  info->index,
                  info->name,
@@ -981,7 +988,7 @@
 update_client (GvcMixerControl      *control,
                const pa_client_info *info)
 {
-#if 1
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Updating client: index=%u name='%s'",
                  info->index,
                  info->name);
@@ -1044,24 +1051,28 @@
         guint i;
         const char *key;
         void *state;
-
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Udpating card %s (index: %u driver: %s):",
                  info->name, info->index, info->driver);
-
+#endif
         for (i = 0; i < info->n_profiles; i++) {
                 struct pa_card_profile_info pi = info->profiles[i];
                 gboolean is_default;
 
                 is_default = (g_strcmp0 (pi.name, info->active_profile->name) == 0);
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("\tProfile '%s': %d sources %d sinks%s",
                          pi.name, pi.n_sources, pi.n_sinks,
                          is_default ? " (Current)" : "");
+#endif
         }
         state = NULL;
         key = pa_proplist_iterate (info->proplist, &state);
         while (key != NULL) {
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("\tProperty: '%s' = '%s'",
                         key, pa_proplist_gets (info->proplist, key));
+#endif
                 key = pa_proplist_iterate (info->proplist, &state);
         }
 #endif
@@ -1272,7 +1283,9 @@
 static void
 remove_event_role_stream (GvcMixerControl *control)
 {
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Removing event role");
+#endif
 }
 
 static void
@@ -1287,7 +1300,7 @@
                 return;
         }
 
-#if 0
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Updating event role: name='%s' device='%s'",
                  info->name,
                  info->device);
@@ -1336,8 +1349,10 @@
         GvcMixerControl *control = GVC_MIXER_CONTROL (userdata);
 
         if (eol < 0) {
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Failed to initialized stream_restore extension: %s",
                          pa_strerror (pa_context_errno (context)));
+#endif
                 remove_event_role_stream (control);
                 return;
         }
@@ -1566,7 +1581,7 @@
 {
         GvcMixerStream *stream;
 
-#if 0
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Removing sink: index=%u", index);
 #endif
 
@@ -1587,7 +1602,7 @@
 {
         GvcMixerStream *stream;
 
-#if 0
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Removing source: index=%u", index);
 #endif
 
@@ -1608,7 +1623,7 @@
 {
         GvcMixerStream *stream;
 
-#if 0
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Removing sink input: index=%u", index);
 #endif
         stream = g_hash_table_lookup (control->priv->sink_inputs,
@@ -1628,7 +1643,7 @@
 {
         GvcMixerStream *stream;
 
-#if 0
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Removing source output: index=%u", index);
 #endif
 
@@ -1763,8 +1778,10 @@
                 }
 
         } else {
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Failed to initialized stream_restore extension: %s",
                          pa_strerror (pa_context_errno (control->priv->pa_context)));
+#endif
         }
 }
 
diff -durN mate-media-2.32.0.orig//mate-volume-control/src/gvc-mixer-dialog.c mate-media-2.32.0/mate-volume-control/src/gvc-mixer-dialog.c
--- mate-media-2.32.0.orig//mate-volume-control/src/gvc-mixer-dialog.c	2010-09-28 18:46:15.000000000 +0400
+++ mate-media-2.32.0/mate-volume-control/src/gvc-mixer-dialog.c	2010-11-04 04:37:52.000000000 +0300
@@ -133,7 +133,9 @@
         model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->priv->input_treeview));
         ret = gtk_tree_model_get_iter_first (model, &iter);
         if (ret == FALSE) {
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("No default input selected or available");
+#endif
                 return;
         }
         do {
@@ -225,7 +227,9 @@
         const GvcChannelMap *map;
         const GList         *ports;
 
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Updating output settings");
+#endif
         if (dialog->priv->output_balance_bar != NULL) {
                 gtk_container_remove (GTK_CONTAINER (dialog->priv->output_settings_box),
                                       dialog->priv->output_balance_bar);
@@ -371,7 +375,9 @@
 {
         GvcMixerStream *stream;
 
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("GvcMixerDialog: default sink changed: %u", id);
+#endif
 
         if (id == PA_INVALID_INDEX)
                 stream = NULL;
@@ -428,7 +434,9 @@
         dialog = userdata;
 
         if (pa_stream_is_suspended (s)) {
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Stream suspended");
+#endif
                 update_input_meter (dialog,
                                     pa_stream_get_device_index (s),
                                     PA_INVALID_INDEX,
@@ -493,8 +501,10 @@
                 return;
         }
 
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Create monitor for %u",
                  gvc_mixer_stream_get_index (stream));
+#endif
 
         context = gvc_mixer_control_get_pa_context (dialog->priv->mixer_control);
 
@@ -554,7 +564,9 @@
         stream = g_object_get_data (G_OBJECT (dialog->priv->input_level_bar), "stream");
         g_assert (stream != NULL);
 
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Stopping monitor for %u", pa_stream_get_index (s));
+#endif
 
         context = gvc_mixer_control_get_pa_context (dialog->priv->mixer_control);
 
@@ -575,7 +587,9 @@
         const GList *ports;
         GvcMixerStream *stream;
 
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Updating input settings");
+#endif
 
         stop_monitor_stream_for_source (dialog);
 
@@ -587,7 +601,9 @@
 
         stream = gvc_mixer_control_get_default_source (dialog->priv->mixer_control);
         if (stream == NULL) {
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Default source stream not found");
+#endif
                 return;
         }
 
@@ -627,7 +643,9 @@
         GvcMixerStream *stream;
         GtkAdjustment *adj;
 
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("GvcMixerDialog: default source changed: %u", id);
+#endif
 
         if (id == PA_INVALID_INDEX)
                 stream = NULL;
@@ -743,7 +761,9 @@
 
                 bar = g_object_get_data (G_OBJECT (adjustment), "gvc-mixer-dialog-bar");
                 g_object_get (bar, "name", &name, NULL);
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Setting stream volume %lf (rounded: %lf) for bar '%s'", volume, rounded, name);
+#endif
                 g_free (name);
 
                 /* FIXME would need to do that in the balance bar really... */
@@ -964,8 +984,10 @@
                 char *name;
 
                 g_object_get (bar, "name", &name, NULL);
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Disconnecting old stream '%s' from bar '%s'",
                          gvc_mixer_stream_get_name (old_stream), name);
+#endif
                 g_free (name);
 
                 g_signal_handlers_disconnect_by_func (old_stream, on_stream_is_muted_notify, dialog);
@@ -1050,7 +1072,9 @@
                 is_default = TRUE;
         } else if (stream == gvc_mixer_control_get_event_sink_input (dialog->priv->mixer_control)) {
                 bar = dialog->priv->effects_bar;
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Adding effects stream");
+#endif
         } else if (! GVC_IS_MIXER_SOURCE (stream)
                    && !GVC_IS_MIXER_SINK (stream)
                    && !gvc_mixer_stream_is_virtual (stream)
@@ -1136,7 +1160,9 @@
 
         bar = g_hash_table_lookup (dialog->priv->bars, GUINT_TO_POINTER (id));
         if (bar != NULL) {
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("GvcMixerDialog: Stream %u already added", id);
+#endif
                 return;
         }
 
@@ -1190,7 +1216,9 @@
             || bar == dialog->priv->effects_bar) {
                 char *name;
                 g_object_get (bar, "name", &name, NULL);
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Removing stream for bar '%s'", name);
+#endif
                 g_free (name);
                 bar_set_stream (dialog, bar, NULL);
         } else if (bar != NULL) {
@@ -1354,7 +1382,9 @@
         if (toggled) {
                 GvcMixerStream *stream;
 
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Default input selected: %u", id);
+#endif
                 stream = gvc_mixer_control_lookup_stream_id (dialog->priv->mixer_control, id);
                 if (stream == NULL) {
                         g_warning ("Unable to find stream for id: %u", id);
@@ -1391,7 +1421,9 @@
         if (toggled) {
                 GvcMixerStream *stream;
 
+#ifdef MATE_ENABLE_DEBUG
                 g_debug ("Default output selected: %u", id);
+#endif
                 stream = gvc_mixer_control_lookup_stream_id (dialog->priv->mixer_control, id);
                 if (stream == NULL) {
                         g_warning ("Unable to find stream for id: %u", id);
@@ -1493,8 +1525,10 @@
                 return;
         }
 
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Profile changed to %s for card %s", profile,
                  gvc_mixer_card_get_name (card));
+#endif
 
         gvc_mixer_card_change_profile (card, profile);
 }
@@ -1516,8 +1550,10 @@
         }
         profile = gvc_mixer_card_get_profile (card);
 
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("XXX Start speaker testing for profile '%s', card %s XXX",
                  profile->profile, gvc_mixer_card_get_name (card));
+#endif
 
         title = g_strdup_printf (_("Speaker Testing for %s"), gvc_mixer_card_get_name (card));
         d = gtk_dialog_new_with_buttons (title,
@@ -1551,7 +1587,9 @@
         GvcMixerCard        *card;
         GvcMixerCardProfile *current_profile;
 
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Card selection changed");
+#endif
 
         if (dialog->priv->hw_profile_combo != NULL) {
                 gtk_container_remove (GTK_CONTAINER (dialog->priv->hw_settings_box),
diff -durN mate-media-2.32.0.orig//mate-volume-control/src/gvc-speaker-test.c mate-media-2.32.0/mate-volume-control/src/gvc-speaker-test.c
--- mate-media-2.32.0.orig//mate-volume-control/src/gvc-speaker-test.c	2010-09-28 18:46:15.000000000 +0400
+++ mate-media-2.32.0/mate-volume-control/src/gvc-speaker-test.c	2010-11-04 04:37:52.000000000 +0300
@@ -389,15 +389,19 @@
 
         g_assert (stream);
 
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Found stream '%s' for card '%s'",
                  gvc_mixer_stream_get_name (stream),
                  gvc_mixer_card_get_name (card));
+#endif
 
         *output_name = g_strdup (gvc_mixer_stream_get_name (stream));
         map = gvc_mixer_stream_get_channel_map (stream);
 
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("Got channel map '%s' for port '%s'",
                  gvc_channel_map_get_mapping (map), *output_name);
+#endif
 
         return map;
 }
@@ -412,7 +416,9 @@
         g_return_if_fail (speaker_test->priv->control != NULL);
         g_return_if_fail (speaker_test->priv->card != NULL);
 
+#ifdef MATE_ENABLE_DEBUG
         g_debug ("XXX update_channel_map called XXX");
+#endif
 
         map = get_channel_map_for_card (speaker_test->priv->control,
                                         speaker_test->priv->card,