=== modified file 'plugins/media-keys/actions/acme-volume-dummy.c'
--- gnome-settings-daemon-2.22.old/plugins/media-keys/actions/acme-volume-dummy.c	2008-03-21 18:17:11 +0000
+++ gnome-settings-daemon-2.22.new/plugins/media-keys/actions/acme-volume-dummy.c	2008-04-01 17:54:31 +0000
@@ -28,6 +28,8 @@ static GObjectClass *parent_class = NULL
 static int acme_volume_dummy_get_volume (AcmeVolume *self);
 static void acme_volume_dummy_set_volume (AcmeVolume *self, int val);
 
+G_DEFINE_TYPE (AcmeVolumeDummy, acme_volume_dummy, ACME_TYPE_VOLUME)
+
 static void
 acme_volume_dummy_finalize (GObject *object)
 {
@@ -60,7 +62,7 @@ acme_volume_dummy_set_volume (AcmeVolume
 }
 
 static void
-acme_volume_dummy_init (AcmeVolume *vol)
+acme_volume_dummy_init (AcmeVolumeDummy *self)
 {
 }
 
@@ -77,30 +79,3 @@ acme_volume_dummy_class_init (AcmeVolume
 	volume_class->set_mute = acme_volume_dummy_set_mute;
 	volume_class->get_mute = acme_volume_dummy_get_mute;
 }
-
-GType acme_volume_dummy_get_type (void)
-{
-	static GType object_type = 0;
-
-	if (!object_type)
-	{
-		static const GTypeInfo object_info =
-		{
-			sizeof (AcmeVolumeDummyClass),
-			NULL,         /* base_init */
-			NULL,         /* base_finalize */
-			(GClassInitFunc) acme_volume_dummy_class_init,
-			NULL,         /* class_finalize */
-			NULL,         /* class_data */
-			sizeof (AcmeVolumeDummy),
-			0,            /* n_preallocs */
-			(GInstanceInitFunc) acme_volume_dummy_init
-		};
-
-		object_type = g_type_register_static (ACME_TYPE_VOLUME,
-				"AcmeVolumeDummy", &object_info, 0);
-	}
-
-	return object_type;
-}
-

=== modified file 'plugins/media-keys/actions/acme-volume-dummy.h'
--- gnome-settings-daemon-2.22.old/plugins/media-keys/actions/acme-volume-dummy.h	2008-03-21 18:17:11 +0000
+++ gnome-settings-daemon-2.22.new/plugins/media-keys/actions/acme-volume-dummy.h	2008-04-01 16:36:33 +0000
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 #include "acme-volume.h"
 
-#define ACME_TYPE_VOLUME_DUMMY		(acme_volume_get_type ())
+#define ACME_TYPE_VOLUME_DUMMY		(acme_volume_dummy_get_type ())
 #define ACME_VOLUME_DUMMY(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), ACME_TYPE_VOLUME_DUMMY, AcmeVolumeDummy))
 #define ACME_VOLUME_DUMMY_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), ACME_TYPE_VOLUME_DUMMY, AcmeVolumeDummyClass))
 #define ACME_IS_VOLUME_DUMMY(obj)	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), ACME_TYPE_VOLUME_DUMMY))
@@ -42,5 +42,3 @@ struct AcmeVolumeDummyClass {
 };
 
 GType acme_volume_dummy_get_type		(void);
-AcmeVolume* acme_volume_dummy_new		(void);
-

