gnome-desktop r5084 - in branches/randr-12/libgnome-desktop: . libgnomeui

[ssp svn gnome org]

Author: ssp
Date: Wed May 14 22:02:42 2008
New Revision: 5084
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5084&view=rev

Log:
2008-05-14  Soren Sandmann Pedersen  <sandmann redhat com>

	* libgnomeui/randrwrap.h: Add copyright statement and warning
	about unstable API.

	* libgnomeui/monitor-db.h: Same.

	* monitor-db.c: Same

	* randrwrap.c: Same

	* edid.h: Add Copyright statement and header guards



Modified:
   branches/randr-12/libgnome-desktop/ChangeLog
   branches/randr-12/libgnome-desktop/edid.h
   branches/randr-12/libgnome-desktop/libgnomeui/monitor-db.h
   branches/randr-12/libgnome-desktop/libgnomeui/randrwrap.h
   branches/randr-12/libgnome-desktop/monitor-db.c
   branches/randr-12/libgnome-desktop/randrwrap.c

Modified: branches/randr-12/libgnome-desktop/edid.h
==============================================================================
--- branches/randr-12/libgnome-desktop/edid.h	(original)
+++ branches/randr-12/libgnome-desktop/edid.h	Wed May 14 22:02:42 2008
@@ -1,3 +1,30 @@
+/* edid.h
+ *
+ * Copyright 2007, 2008, Red Hat, Inc.
+ * 
+ * This file is part of the Gnome Library.
+ * 
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome 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
+ * Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ * 
+ * Author: Soren Sandmann <sandmann redhat com>
+ */
+
+#ifndef EDID_H
+#define EDID_H
+
 typedef unsigned char uchar;
 typedef struct MonitorInfo MonitorInfo;
 typedef struct Timing Timing;
@@ -168,3 +195,5 @@
 MonitorInfo *decode_edid (const uchar *data);
 char *       make_display_name (const char        *output_name,
 				const MonitorInfo *info);
+
+#endif

Modified: branches/randr-12/libgnome-desktop/libgnomeui/monitor-db.h
==============================================================================
--- branches/randr-12/libgnome-desktop/libgnomeui/monitor-db.h	(original)
+++ branches/randr-12/libgnome-desktop/libgnomeui/monitor-db.h	Wed May 14 22:02:42 2008
@@ -1,6 +1,33 @@
+/* monitor-db.h
+ *
+ * Copyright 2007, 2008, Red Hat, Inc.
+ * 
+ * This file is part of the Gnome Library.
+ * 
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome 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
+ * Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ * 
+ * Author: Soren Sandmann <sandmann redhat com>
+ */
 #ifndef MONITOR_DB_H
 #define MONITOR_DB_H
 
+#ifndef GNOME_DESKTOP_USE_UNSTABLE_API
+#error    monitor-db.h is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including monitor-db.h
+#endif
+
 #include <libgnomeui/randrwrap.h>
 #include <glib.h>
 

Modified: branches/randr-12/libgnome-desktop/libgnomeui/randrwrap.h
==============================================================================
--- branches/randr-12/libgnome-desktop/libgnomeui/randrwrap.h	(original)
+++ branches/randr-12/libgnome-desktop/libgnomeui/randrwrap.h	Wed May 14 22:02:42 2008
@@ -1,6 +1,33 @@
+/* randrwrap.h
+ *
+ * Copyright 2007, 2008, Red Hat, Inc.
+ * 
+ * This file is part of the Gnome Library.
+ * 
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome 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
+ * Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ * 
+ * Author: Soren Sandmann <sandmann redhat com>
+ */
 #ifndef RANDR_WRAP_H
 #define RANDR_WRAP_H
 
+#ifndef GNOME_DESKTOP_USE_UNSTABLE_API
+#error    randrwrap is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including randrwrap.h
+#endif
+
 #include <glib.h>
 #include <gdk/gdk.h>
 

Modified: branches/randr-12/libgnome-desktop/monitor-db.c
==============================================================================
--- branches/randr-12/libgnome-desktop/monitor-db.c	(original)
+++ branches/randr-12/libgnome-desktop/monitor-db.c	Wed May 14 22:02:42 2008
@@ -1,6 +1,33 @@
+/* monitor-db.c
+ *
+ * Copyright 2007, 2008, Red Hat, Inc.
+ * 
+ * This file is part of the Gnome Library.
+ * 
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome 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
+ * Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ * 
+ * Author: Soren Sandmann <sandmann redhat com>
+ */
+
+#define GNOME_DESKTOP_USE_UNSTABLE_API
+
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
+#include <glib/gstdio.h>
 #include "libgnomeui/monitor-db.h"
 #include "edid.h"
 
@@ -968,7 +995,7 @@
 
 	filename = get_old_config_filename ();
 	if (g_file_test (filename, G_FILE_TEST_EXISTS))
-	    unlink (filename);
+	    g_unlink (filename);
 
 	g_free (filename);
     }

Modified: branches/randr-12/libgnome-desktop/randrwrap.c
==============================================================================
--- branches/randr-12/libgnome-desktop/randrwrap.c	(original)
+++ branches/randr-12/libgnome-desktop/randrwrap.c	Wed May 14 22:02:42 2008
@@ -1,3 +1,29 @@
+/* randrwrap.c
+ *
+ * Copyright 2007, 2008, Red Hat, Inc.
+ * 
+ * This file is part of the Gnome Library.
+ * 
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome 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
+ * Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ * 
+ * Author: Soren Sandmann <sandmann redhat com>
+ */
+
+#define GNOME_DESKTOP_USE_UNSTABLE_API
+
 #include "libgnomeui/randrwrap.h"
 #include <string.h>
 #include <X11/Xlib.h>