gnome-power-manager r3022 - in trunk: . src

[rhughes svn gnome org]

Author: rhughes
Date: Mon Oct 20 14:18:02 2008
New Revision: 3022
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3022&view=rev

Log:
2008-10-20  Richard Hughes  <richard hughsie com>

* src/gpm-button.c: (emit_button_pressed):
* src/gpm-button.h:
Remove some depricated code that can never be run.


Modified:
   trunk/ChangeLog
   trunk/src/gpm-button.c
   trunk/src/gpm-button.h

Modified: trunk/src/gpm-button.c
==============================================================================
--- trunk/src/gpm-button.c	(original)
+++ trunk/src/gpm-button.c	Mon Oct 20 14:18:02 2008
@@ -309,13 +309,6 @@
 		button->priv->lid_is_closed = FALSE;
 	}
 
-	/* the names changed in 0.5.8 */
-	if (strcmp (type, GPM_BUTTON_BRIGHT_UP_DEP) == 0) {
-		atype = GPM_BUTTON_BRIGHT_UP;
-	} else if (strcmp (type, GPM_BUTTON_BRIGHT_DOWN_DEP) == 0) {
-		atype = GPM_BUTTON_BRIGHT_DOWN;
-	}
-
 	/* we now emit all buttons, even the ones we don't know */
 	egg_debug ("emitting button-pressed : %s", atype);
 	g_signal_emit (button, signals [BUTTON_PRESSED], 0, atype);

Modified: trunk/src/gpm-button.h
==============================================================================
--- trunk/src/gpm-button.h	(original)
+++ trunk/src/gpm-button.h	Mon Oct 20 14:18:02 2008
@@ -44,8 +44,6 @@
 #define GPM_BUTTON_LID_CLOSED		"lid-down"
 #define GPM_BUTTON_BRIGHT_UP		"brightness-up"
 #define GPM_BUTTON_BRIGHT_DOWN		"brightness-down"
-#define GPM_BUTTON_BRIGHT_UP_DEP	"brightnessup"	 /* Remove when we depend on HAL 0.5.8 */
-#define GPM_BUTTON_BRIGHT_DOWN_DEP	"brightnessdown" /* as these are the old names */
 #define GPM_BUTTON_KBD_BRIGHT_UP	"kbd-illum-up"
 #define GPM_BUTTON_KBD_BRIGHT_DOWN	"kbd-illum-down"
 #define GPM_BUTTON_KBD_BRIGHT_TOGGLE	"kbd-illum-toggle"