summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@novell.com>2010-01-27 18:32:49 -0600
committerFederico Mena Quintero <federico@novell.com>2010-01-27 18:32:49 -0600
commit9d20f76c9e0d488a71fe64627cefc80dd5c6376c (patch)
treec46bbe4dd6e3c08d5fe3028d607f6b8fc04fc301
parent869c95b43d4b9928426169318d5f053c934dd01c (diff)
parentd98dc259992a548afa9a30c82bac0fa1cbe63a6a (diff)
downloadgnome-settings-daemon-randr-rotate-wacom-tablet.tar.gz
Merge branch 'master' into randr-rotate-wacom-tabletrandr-rotate-wacom-tablet
-rw-r--r--plugins/xrandr/gsd-xrandr-manager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index 404bce3f..830a5a5a 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -344,7 +344,7 @@ fail:
* We just return whether setting the configuration succeeded.
*/
static gboolean
-apply_configuration_and_display_error (GsdXrandrManager *manager, GnomeGnomeRRConfig *config, guint32 timestamp)
+apply_configuration_and_display_error (GsdXrandrManager *manager, GnomeRRConfig *config, guint32 timestamp)
{
GsdXrandrManagerPrivate *priv = manager->priv;
GError *error;