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

[jensg svn gnome org]

Author: jensg
Date: Sun Apr 20 21:05:49 2008
New Revision: 310
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=310&view=rev

Log:
2008-04-20  Jens Granseuer  <jensgr gmx net>

	* plugins/media-keys/actions/acme-volume-alsa.c:
	(acme_volume_alsa_finalize), (acme_volume_alsa_class_init):
	* plugins/media-keys/actions/acme-volume-dummy.c:
	(acme_volume_dummy_finalize), (acme_volume_dummy_class_init):
	* plugins/media-keys/actions/acme-volume-gstreamer.c:
	(acme_volume_gstreamer_finalize),
	(acme_volume_gstreamer_class_init):
	* plugins/media-keys/actions/acme-volume-oss.c:
	(acme_volume_oss_finalize), (acme_volume_oss_class_init):
	* plugins/media-keys/actions/acme-volume.c:
	(acme_volume_class_init): drop redundant GType stuff


Modified:
   trunk/ChangeLog
   trunk/plugins/media-keys/actions/acme-volume-alsa.c
   trunk/plugins/media-keys/actions/acme-volume-dummy.c
   trunk/plugins/media-keys/actions/acme-volume-gstreamer.c
   trunk/plugins/media-keys/actions/acme-volume-oss.c
   trunk/plugins/media-keys/actions/acme-volume.c

Modified: trunk/plugins/media-keys/actions/acme-volume-alsa.c
==============================================================================
--- trunk/plugins/media-keys/actions/acme-volume-alsa.c	(original)
+++ trunk/plugins/media-keys/actions/acme-volume-alsa.c	Sun Apr 20 21:05:49 2008
@@ -48,8 +48,6 @@
 	guint timer_id;
 };
 
-static GObjectClass *parent_class = NULL;
-
 static int acme_volume_alsa_get_volume (AcmeVolume *self);
 static void acme_volume_alsa_set_volume (AcmeVolume *self, int val);
 static gboolean acme_volume_alsa_open (AcmeVolumeAlsa *self);
@@ -78,7 +76,7 @@
 		self->_priv = NULL;
 	}
 
-	G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (acme_volume_alsa_parent_class)->finalize (object);
 }
 
 static void
@@ -319,8 +317,6 @@
 	AcmeVolumeClass *volume_class = ACME_VOLUME_CLASS (klass);
 	G_OBJECT_CLASS (klass)->finalize = acme_volume_alsa_finalize;
 
-	parent_class = g_type_class_peek_parent (klass);
-
 	volume_class->set_volume = acme_volume_alsa_set_volume;
 	volume_class->get_volume = acme_volume_alsa_get_volume;
 	volume_class->set_mute = acme_volume_alsa_set_mute;

Modified: trunk/plugins/media-keys/actions/acme-volume-dummy.c
==============================================================================
--- trunk/plugins/media-keys/actions/acme-volume-dummy.c	(original)
+++ trunk/plugins/media-keys/actions/acme-volume-dummy.c	Sun Apr 20 21:05:49 2008
@@ -23,8 +23,6 @@
 #include "config.h"
 #include "acme-volume-dummy.h"
 
-static GObjectClass *parent_class = NULL;
-
 G_DEFINE_TYPE (AcmeVolumeDummy, acme_volume_dummy, ACME_TYPE_VOLUME)
 
 static void
@@ -33,7 +31,7 @@
 	g_return_if_fail (object != NULL);
 	g_return_if_fail (ACME_IS_VOLUME_DUMMY (object));
 
-	G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (acme_volume_dummy_parent_class)->finalize (object);
 }
 
 static void
@@ -76,8 +74,6 @@
 	AcmeVolumeClass *volume_class = ACME_VOLUME_CLASS (klass);
 	G_OBJECT_CLASS (klass)->finalize = acme_volume_dummy_finalize;
 
-	parent_class = g_type_class_peek_parent (klass);
-
 	volume_class->set_volume = acme_volume_dummy_set_volume;
 	volume_class->get_volume = acme_volume_dummy_get_volume;
 	volume_class->set_mute = acme_volume_dummy_set_mute;

Modified: trunk/plugins/media-keys/actions/acme-volume-gstreamer.c
==============================================================================
--- trunk/plugins/media-keys/actions/acme-volume-gstreamer.c	(original)
+++ trunk/plugins/media-keys/actions/acme-volume-gstreamer.c	Sun Apr 20 21:05:49 2008
@@ -51,8 +51,6 @@
 	GConfClient *gconf_client;
 };
 
-static GObjectClass *parent_class = NULL;
-
 G_DEFINE_TYPE (AcmeVolumeGStreamer, acme_volume_gstreamer, ACME_TYPE_VOLUME)
 
 static int acme_volume_gstreamer_get_volume (AcmeVolume *self);
@@ -87,7 +85,7 @@
 
 	g_free (self->_priv);
 
-	G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (acme_volume_gstreamer_parent_class)->finalize (object);
 }
 
 static void
@@ -447,8 +445,6 @@
 
 	gst_init (NULL, NULL);
 
-	parent_class = g_type_class_peek_parent (klass);
-
 	volume_class->set_volume = acme_volume_gstreamer_set_volume;
 	volume_class->get_volume = acme_volume_gstreamer_get_volume;
 	volume_class->set_mute = acme_volume_gstreamer_set_mute;

Modified: trunk/plugins/media-keys/actions/acme-volume-oss.c
==============================================================================
--- trunk/plugins/media-keys/actions/acme-volume-oss.c	(original)
+++ trunk/plugins/media-keys/actions/acme-volume-oss.c	Sun Apr 20 21:05:49 2008
@@ -45,8 +45,6 @@
 	gboolean mute;
 };
 
-static GObjectClass *parent_class = NULL;
-
 static int acme_volume_oss_get_volume (AcmeVolume *self);
 static void acme_volume_oss_set_volume (AcmeVolume *self, int val);
 static gboolean acme_volume_oss_mixer_check (AcmeVolumeOss *self, int fd);
@@ -66,7 +64,7 @@
 	g_return_if_fail (self->_priv != NULL);
 	g_free (self->_priv);
 
-	G_OBJECT_CLASS (parent_class)->finalize (object);
+	G_OBJECT_CLASS (acme_volume_oss_parent_class)->finalize (object);
 }
 
 static int
@@ -193,8 +191,6 @@
 	AcmeVolumeClass *volume_class = ACME_VOLUME_CLASS (klass);
 	G_OBJECT_CLASS (klass)->finalize = acme_volume_oss_finalize;
 
-	parent_class = g_type_class_peek_parent (klass);
-
 	volume_class->set_volume = acme_volume_oss_set_volume;
 	volume_class->get_volume = acme_volume_oss_get_volume;
 	volume_class->set_mute = acme_volume_oss_set_mute;

Modified: trunk/plugins/media-keys/actions/acme-volume.c
==============================================================================
--- trunk/plugins/media-keys/actions/acme-volume.c	(original)
+++ trunk/plugins/media-keys/actions/acme-volume.c	Sun Apr 20 21:05:49 2008
@@ -32,14 +32,11 @@
 #include "acme-volume-gstreamer.h"
 #endif
 
-static GObjectClass *parent_class = NULL;
-
 G_DEFINE_TYPE (AcmeVolume, acme_volume, G_TYPE_OBJECT)
 
 static void
 acme_volume_class_init (AcmeVolumeClass *klass)
 {
-	parent_class = g_type_class_peek_parent (klass);
 }
 
 static void