[gnome-settings-daemon/gnome-3-6] sound: Remove use of never-defined HAVE_PULSE
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon/gnome-3-6] sound: Remove use of never-defined HAVE_PULSE
- Date: Mon, 5 Nov 2012 12:42:13 +0000 (UTC)
commit e06ebac217fbfaddab2630acfc43c3e1ebd48d1a
Author: Bastien Nocera <hadess hadess net>
Date: Mon Nov 5 13:25:01 2012 +0100
sound: Remove use of never-defined HAVE_PULSE
HAVE_PULSE was never defined so the sound plugin was
completely unused. This would cause theme changes to not be
noticed.
Spotted by Lionel Landwerlin <llandwerlin gmail com>
https://bugzilla.gnome.org/show_bug.cgi?id=674871
plugins/sound/gsd-sound-manager.c | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
---
diff --git a/plugins/sound/gsd-sound-manager.c b/plugins/sound/gsd-sound-manager.c
index b68e2e6..e41d4db 100644
--- a/plugins/sound/gsd-sound-manager.c
+++ b/plugins/sound/gsd-sound-manager.c
@@ -34,10 +34,7 @@
#include <glib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-
-#ifdef HAVE_PULSE
#include <pulse/pulseaudio.h>
-#endif
#include "gsd-sound-manager.h"
#include "gnome-settings-profile.h"
@@ -59,8 +56,6 @@ G_DEFINE_TYPE (GsdSoundManager, gsd_sound_manager, G_TYPE_OBJECT)
static gpointer manager_object = NULL;
-#ifdef HAVE_PULSE
-
static void
sample_info_cb (pa_context *c, const pa_sample_info *i, int eol, void *userdata)
{
@@ -256,23 +251,16 @@ register_directory_callback (GsdSoundManager *manager,
return succ;
}
-#endif
-
gboolean
gsd_sound_manager_start (GsdSoundManager *manager,
GError **error)
{
-
-#ifdef HAVE_PULSE
char *p, **ps, **k;
const char *env, *dd;
-#endif
g_debug ("Starting sound manager");
gnome_settings_profile_start (NULL);
-#ifdef HAVE_PULSE
-
/* We listen for change of the selected theme ... */
register_config_callback (manager);
@@ -301,7 +289,6 @@ gsd_sound_manager_start (GsdSoundManager *manager,
register_directory_callback (manager, *k, NULL);
g_strfreev (ps);
-#endif
gnome_settings_profile_end (NULL);
@@ -313,7 +300,6 @@ gsd_sound_manager_stop (GsdSoundManager *manager)
{
g_debug ("Stopping sound manager");
-#ifdef HAVE_PULSE
if (manager->priv->settings != NULL) {
g_object_unref (manager->priv->settings);
manager->priv->settings = NULL;
@@ -329,7 +315,6 @@ gsd_sound_manager_stop (GsdSoundManager *manager)
g_object_unref (manager->priv->monitors->data);
manager->priv->monitors = g_list_delete_link (manager->priv->monitors, manager->priv->monitors);
}
-#endif
}
static GObject *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]