gnome-media r3820 - in trunk: . gst-mixer/src

[jhaitsma svn gnome org]

Author: jhaitsma
Date: Mon Mar 24 15:59:02 2008
New Revision: 3820
URL: http://svn.gnome.org/viewvc/gnome-media?rev=3820&view=rev

Log:
2008-03-24  Jaap Haitsma  <jaap haitsma org>

	reviewed by: Marc-Andre Lureau

	* gst-mixer/src/preferences.c:
	(gnome_volume_control_preferences_class_init),
	(gnome_volume_control_preferences_dispose),
	(gnome_volume_control_preferences_response):
	Use G_DEFINE_TYPE for preferences type


Modified:
   trunk/ChangeLog
   trunk/gst-mixer/src/preferences.c

Modified: trunk/gst-mixer/src/preferences.c
==============================================================================
--- trunk/gst-mixer/src/preferences.c	(original)
+++ trunk/gst-mixer/src/preferences.c	Mon Mar 24 15:59:02 2008
@@ -42,6 +42,8 @@
   NUM_COLS
 };
 
+G_DEFINE_TYPE (GnomeVolumeControlPreferences, gnome_volume_control_preferences, GTK_TYPE_DIALOG)
+
 static void	gnome_volume_control_preferences_class_init	(GnomeVolumeControlPreferencesClass *klass);
 static void	gnome_volume_control_preferences_init	(GnomeVolumeControlPreferences *prefs);
 static void	gnome_volume_control_preferences_dispose (GObject *object);
@@ -62,35 +64,6 @@
 					 GConfEntry      *entry,
 					 gpointer         userdata);
 
-static GtkNotebookClass *parent_class = NULL;
-
-GType
-gnome_volume_control_preferences_get_type (void)
-{
-  static GType gnome_volume_control_preferences_type = 0;
-
-  if (!gnome_volume_control_preferences_type) {
-    static const GTypeInfo gnome_volume_control_preferences_info = {
-      sizeof (GnomeVolumeControlPreferencesClass),
-      NULL,
-      NULL,
-      (GClassInitFunc) gnome_volume_control_preferences_class_init,
-      NULL,
-      NULL,
-      sizeof (GnomeVolumeControlPreferences),
-      0,
-      (GInstanceInitFunc) gnome_volume_control_preferences_init,
-      NULL
-    };
-
-    gnome_volume_control_preferences_type =
-	g_type_register_static (GTK_TYPE_DIALOG, 
-				"GnomeVolumeControlPreferences",
-				&gnome_volume_control_preferences_info, 0);
-  }
-
-  return gnome_volume_control_preferences_type;
-}
 
 static void
 gnome_volume_control_preferences_class_init (GnomeVolumeControlPreferencesClass *klass)
@@ -98,8 +71,6 @@
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GtkDialogClass *gtkdialog_class = (GtkDialogClass *) klass;
 
-  parent_class = g_type_class_ref (GTK_TYPE_DIALOG);
-
   gobject_class->dispose = gnome_volume_control_preferences_dispose;
   gtkdialog_class->response = gnome_volume_control_preferences_response;
 }
@@ -231,7 +202,7 @@
     prefs->mixer = NULL;
   }
 
-  G_OBJECT_CLASS (parent_class)->dispose (object);
+  G_OBJECT_CLASS (gnome_volume_control_preferences_parent_class)->dispose (object);
 }
 
 static void
@@ -247,8 +218,8 @@
       break;
   }
 
-  if (((GtkDialogClass *) parent_class)->response)
-    ((GtkDialogClass *) parent_class)->response (dialog, response_id);
+  if (((GtkDialogClass *) gnome_volume_control_preferences_parent_class)->response)
+    ((GtkDialogClass *) gnome_volume_control_preferences_parent_class)->response (dialog, response_id);
 }
 
 /*