gnome-power-manager r2741 - in branches/gnome-2-22: . data/sounds src

[rhughes svn gnome org]

Author: rhughes
Date: Wed Mar 26 09:05:55 2008
New Revision: 2741
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=2741&view=rev

Log:
2008-03-16  Richard Hughes  <richard hughsie com>

* data/sounds/Makefile.am:
* src/gpm-button.c: (emit_button_pressed):
* src/gpm-sound.c: (gpm_sound_force):
* src/gpm-sound.h:
Remove the lid sounds (originally for debugging). Everbody hates them.


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/data/sounds/Makefile.am
   branches/gnome-2-22/src/gpm-button.c
   branches/gnome-2-22/src/gpm-sound.c
   branches/gnome-2-22/src/gpm-sound.h

Modified: branches/gnome-2-22/data/sounds/Makefile.am
==============================================================================
--- branches/gnome-2-22/data/sounds/Makefile.am	(original)
+++ branches/gnome-2-22/data/sounds/Makefile.am	Wed Mar 26 09:05:55 2008
@@ -4,8 +4,6 @@
 Datadir = $(pkgdatadir)
 
 Data_DATA =				\
-	gpm-lid-up.wav  		\
-	gpm-lid-down.wav		\
 	gpm-critical-power.wav		\
 	gpm-suspend-failure.wav		\
 	gpm-unplugged.wav

Modified: branches/gnome-2-22/src/gpm-button.c
==============================================================================
--- branches/gnome-2-22/src/gpm-button.c	(original)
+++ branches/gnome-2-22/src/gpm-button.c	Wed Mar 26 09:05:55 2008
@@ -315,7 +315,6 @@
 			return;
 		}
 		button->priv->lid_is_closed = TRUE;
-		gpm_sound_event (button->priv->sound, GPM_SOUND_LID_DOWN);
 	}
 	if (strcmp (atype, GPM_BUTTON_LID_OPEN) == 0) {
 		if (button->priv->lid_is_closed == FALSE) {
@@ -323,7 +322,6 @@
 			return;
 		}
 		button->priv->lid_is_closed = FALSE;
-		gpm_sound_event (button->priv->sound, GPM_SOUND_LID_UP);
 	}
 
 	/* the names changed in 0.5.8 */

Modified: branches/gnome-2-22/src/gpm-sound.c
==============================================================================
--- branches/gnome-2-22/src/gpm-sound.c	(original)
+++ branches/gnome-2-22/src/gpm-sound.c	Wed Mar 26 09:05:55 2008
@@ -104,10 +104,6 @@
 		filename = "gpm-critical-power.wav";
 	} else if (action == GPM_SOUND_SUSPEND_FAILURE) {
 		filename = "gpm-suspend-failure.wav";
-	} else if (action == GPM_SOUND_LID_UP) {
-		filename = "gpm-lid-up.wav";
-	} else if (action == GPM_SOUND_LID_DOWN) {
-		filename = "gpm-lid-down.wav";
 	} else {
 		g_error ("enum %i not known", action);
 	}

Modified: branches/gnome-2-22/src/gpm-sound.h
==============================================================================
--- branches/gnome-2-22/src/gpm-sound.h	(original)
+++ branches/gnome-2-22/src/gpm-sound.h	Wed Mar 26 09:05:55 2008
@@ -37,8 +37,6 @@
 	GPM_SOUND_AC_UNPLUGGED,
 	GPM_SOUND_POWER_LOW,
 	GPM_SOUND_SUSPEND_FAILURE,
-	GPM_SOUND_LID_UP,
-	GPM_SOUND_LID_DOWN,
 	GPM_SOUND_LAST
 } GpmSoundAction;