summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann <sandmann@redhat.com>2008-06-16 18:55:56 +0000
committerSøren Sandmann Pedersen <ssp@src.gnome.org>2008-06-16 18:55:56 +0000
commit29cbd8d345764b8975a988a8630dd7de9437b1ee (patch)
tree05aa93e2fad9ba1e588fcd63bca5c1d5982bbe70
parent63be17e09dac2b411a1d2ac354f1104e6f1bcef1 (diff)
downloadgnome-settings-daemon-randr-12.tar.gz
Port to new gnome-desktop APIrandr-12
Mon Jun 16 14:50:53 2008 Søren Sandmann <sandmann@redhat.com> * Port to new gnome-desktop API svn path=/branches/randr-12/; revision=376
-rw-r--r--ChangeLog4
-rw-r--r--plugins/xrandr/gsd-xrandr-manager.c10
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f73491a2..a0c13ea7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 16 14:50:53 2008 Søren Sandmann <sandmann@redhat.com>
+
+ * Port to new gnome-desktop API
+
Mon Jun 16 14:30:13 2008 Søren Sandmann <sandmann@redhat.com>
* Merge from trunk.
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index d53bf834..48e16530 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -39,8 +39,8 @@
#define GNOME_DESKTOP_USE_UNSTABLE_API
-#include <libgnomeui/monitor-db.h>
-#include <libgnomeui/randrwrap.h>
+#include <libgnomeui/gnome-rr-config.h>
+#include <libgnomeui/gnome-rr.h>
#ifdef HAVE_RANDR
#include <X11/extensions/Xrandr.h>
@@ -67,7 +67,7 @@ struct GsdXrandrManagerPrivate
{
/* Key code of the fn-F7 video key (XF86Display) */
guint keycode;
- RWScreen *rw_screen;
+ GnomeRRScreen *rw_screen;
gboolean running;
GtkStatusIcon *status_icon;
@@ -103,7 +103,7 @@ on_client_message (GdkXEvent *xevent,
GdkEvent *event,
gpointer data)
{
- RWScreen *screen = data;
+ GnomeRRScreen *screen = data;
XEvent *ev = (XEvent *)xevent;
if (ev->type == ClientMessage &&
@@ -146,7 +146,7 @@ event_filter (GdkXEvent *xevent,
}
static void
-on_randr_event (RWScreen *screen, gpointer data)
+on_randr_event (GnomeRRScreen *screen, gpointer data)
{
GsdXrandrManager *manager = GSD_XRANDR_MANAGER (data);