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

[mccann svn gnome org]

Author: mccann
Date: Tue Mar 25 00:28:20 2008
New Revision: 233
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=233&view=rev

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

	* configure.ac:
	Add some stuff to the configuration summary.

	* plugins/media-keys/gsd-media-keys-manager.c:
	(gsd_media_keys_manager_start):
	Add a few more profiling points.



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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Mar 25 00:28:20 2008
@@ -266,8 +266,8 @@
 dnl OSS section
 dnl ==============================================
 
+have_oss=no
 if test "x$have_gstreamer" != "xyes"; then
-  have_oss=no
   AC_TRY_COMPILE([
 		  #ifdef __NetBSD__
 		  #include <sys/param.h>
@@ -291,8 +291,8 @@
 dnl ALSA section
 dnl ==============================================
 
+have_alsa=no
 if test "x$have_gstreamer" != "xyes"; then
-  have_alsa=no
   AC_ARG_ENABLE(alsa,
 		AC_HELP_STRING([--disable-alsa],
 			       [turn off ALSA audio support]),
@@ -452,4 +452,11 @@
         Maintainer mode:          ${USE_MAINTAINER_MODE}
 
         dbus-1 system.d dir:      ${DBUS_SYS_DIR}
+
+        OSS support:              ${have_oss}
+        ALSA support:             ${have_alsa}
+        GStreamer support:        ${have_gstreamer}
+        ESD support:              ${WANT_ESD}
+
+        Profiling support:        ${enable_profiling}
 "

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	Tue Mar 25 00:28:20 2008
@@ -1014,16 +1014,21 @@
         init_kbd (manager);
 
         /* initialise Volume handler */
+        gnome_settings_profile_start ("acme_volume_new");
         manager->priv->volume = acme_volume_new ();
+        gnome_settings_profile_end ("acme_volume_new");
 
         /* Start filtering the events */
         for (l = manager->priv->screens; l != NULL; l = l->next) {
+                gnome_settings_profile_start ("gdk_window_add_filter");
+
                 g_debug ("adding key filter for screen: %d",
                          gdk_screen_get_number (l->data));
 
                 gdk_window_add_filter (gdk_screen_get_root_window (l->data),
                                        (GdkFilterFunc)acme_filter_events,
                                        manager);
+                gnome_settings_profile_end ("gdk_window_add_filter");
         }
 
         gnome_settings_profile_end (NULL);