gnome-desktop r5374 - in trunk: . libgnome-desktop libgnome-desktop/libgnomeui

[federico svn gnome org]

Author: federico
Date: Tue Feb  3 23:27:39 2009
New Revision: 5374
URL: http://svn.gnome.org/viewvc/gnome-desktop?rev=5374&view=rev

Log:
Don't break the API/ABI with gnome_rr_config_apply_stored()
2009-02-03  Federico Mena Quintero  <federico novell com>

	Don't break the API/ABI for gnome_rr_config_apply_stored(); just
	deprecate it.

	* gnome-rr-config.c (gnome_rr_config_apply_stored): Remove the
	"filename" argument to avoid breaking the API/ABI.
	(gnome_rr_config_apply_from_filename): New public function that
	takes a filename.

	* libgnomeui/gnome-rr-config.h (gnome_rr_config_apply_from_filename):
	New prototype.

Signed-off-by: Federico Mena Quintero <federico novell com>

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libgnome-desktop/ChangeLog
   trunk/libgnome-desktop/gnome-rr-config.c
   trunk/libgnome-desktop/libgnomeui/gnome-rr-config.h

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Feb  3 23:27:39 2009
@@ -19,7 +19,7 @@
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
 
-LT_VERSION=12:0:1
+LT_VERSION=13:0:2
 AC_SUBST(LT_VERSION)
 
 AM_MAINTAINER_MODE

Modified: trunk/libgnome-desktop/gnome-rr-config.c
==============================================================================
--- trunk/libgnome-desktop/gnome-rr-config.c	(original)
+++ trunk/libgnome-desktop/gnome-rr-config.c	Tue Feb  3 23:27:39 2009
@@ -1173,12 +1173,26 @@
 }
 
 gboolean
-gnome_rr_config_apply_stored (GnomeRRScreen *screen, const char *filename, GError **error)
+gnome_rr_config_apply_stored (GnomeRRScreen *screen, GError **error)
+{
+    char *filename;
+    gboolean result;
+
+    filename = gnome_rr_config_get_intended_filename ();
+    result = gnome_rr_config_apply_from_filename (screen, filename, error);
+    g_free (filename);
+
+    return result;
+}
+
+gboolean
+gnome_rr_config_apply_from_filename (GnomeRRScreen *screen, const char *filename, GError **error)
 {
     GnomeRRConfig *stored;
     GError *my_error;
 
     g_return_val_if_fail (screen != NULL, FALSE);
+    g_return_val_if_fail (filename != NULL, FALSE);
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
     my_error = NULL;

Modified: trunk/libgnome-desktop/libgnomeui/gnome-rr-config.h
==============================================================================
--- trunk/libgnome-desktop/libgnomeui/gnome-rr-config.h	(original)
+++ trunk/libgnome-desktop/libgnomeui/gnome-rr-config.h	Tue Feb  3 23:27:39 2009
@@ -87,8 +87,12 @@
 					      GnomeRRScreen  *screen,
 					      GError        **error);
 gboolean        gnome_rr_config_apply_stored (GnomeRRScreen  *screen,
-					      const char     *filename,
 					      GError        **error);
+
+gboolean        gnome_rr_config_apply_from_filename (GnomeRRScreen  *screen,
+						     const char     *filename
+						     GError        **error);
+
 gboolean        gnome_rr_config_applicable   (GnomeRRConfig  *configuration,
 					      GnomeRRScreen  *screen,
 					      GError        **error);