gnome-settings-daemon r230 - in trunk: . plugins/media-keys plugins/sound

[mccann svn gnome org]

Author: mccann
Date: Mon Mar 24 18:53:17 2008
New Revision: 230
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=230&view=rev

Log:
2008-03-24  William Jon McCann  <jmccann redhat com>

	* plugins/media-keys/gsd-media-keys-manager.c:
	(acme_filter_events):
	* plugins/sound/gsd-sound-manager.c: (start_gnome_sound):
	Fix two compiler warnings.



Modified:
   trunk/ChangeLog
   trunk/plugins/media-keys/gsd-media-keys-manager.c
   trunk/plugins/sound/gsd-sound-manager.c

Modified: trunk/plugins/media-keys/gsd-media-keys-manager.c
==============================================================================
--- trunk/plugins/media-keys/gsd-media-keys-manager.c	(original)
+++ trunk/plugins/media-keys/gsd-media-keys-manager.c	Mon Mar 24 18:53:17 2008
@@ -956,8 +956,6 @@
         keycode = xev->xkey.keycode;
         state = xev->xkey.state;
 
-        g_debug ("Got key: %u state: %u");
-
         for (i = 0; i < HANDLED_KEYS; i++) {
                 if (keys[i].key == NULL) {
                         continue;

Modified: trunk/plugins/sound/gsd-sound-manager.c
==============================================================================
--- trunk/plugins/sound/gsd-sound-manager.c	(original)
+++ trunk/plugins/sound/gsd-sound-manager.c	Mon Mar 24 18:53:17 2008
@@ -116,7 +116,7 @@
         }
 
         manager->priv->child_watch_id = g_child_watch_add (manager->priv->pid,
-                                                           reset_esd_pid,
+                                                           (GChildWatchFunc)reset_esd_pid,
                                                            manager);
 
         starttime = time (NULL);