Merge remote branch 'gvdb/master'

[platform/upstream/glib.git] / gio / gnativevolumemonitor.c

diff --git a/gio/gnativevolumemonitor.c b/gio/gnativevolumemonitor.c
index d7fa98c..71c0c5a 100644 (file)
--- a/gio/gnativevolumemonitor.c
+++ b/gio/gnativevolumemonitor.c
@@ -1,4 +1,26 @@
-#include <config.h>
+/* GIO - GLib Input, Output and Streaming Library
+ *
+ * Copyright (C) 2006-2007 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Alexander Larsson <alexl@redhat.com>
+ */
+
+#include "config.h"
 
 #include <string.h>
 
@@ -12,8 +34,7 @@ G_DEFINE_ABSTRACT_TYPE (GNativeVolumeMonitor, g_native_volume_monitor, G_TYPE_VO
 static void
 g_native_volume_monitor_finalize (GObject *object)
 {
-  if (G_OBJECT_CLASS (g_native_volume_monitor_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_native_volume_monitor_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_native_volume_monitor_parent_class)->finalize (object);
 }
 
 
@@ -30,3 +51,6 @@ static void
 g_native_volume_monitor_init (GNativeVolumeMonitor *native_monitor)
 {
 }
+
+#define __G_NATIVE_VOLUME_MONITOR_C__
+#include "gioaliasdef.c"