diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2011-04-13 14:06:15 +0200 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2011-04-13 14:06:15 +0200 |
commit | 5a059211d044488b4a511e44e83b498ef864b044 (patch) | |
tree | 1724b43c8a6b39214d8b78e0a3a0f6f60dc6842a /gtk | |
parent | c75ef9040b9721770c26912df3827a1c2694022f (diff) | |
parent | 9535546e3b13c81afdb9d2bfe6f86f6ce00aee64 (diff) |
Merge commit 'refs/merge-requests/6' of git://gitorious.org/spice-gtk/spice-gtk into merge-requests/6
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/display/gnome-rr.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/gtk/display/gnome-rr.c b/gtk/display/gnome-rr.c index f141e8e..86d5319 100644 --- a/gtk/display/gnome-rr.c +++ b/gtk/display/gnome-rr.c @@ -266,12 +266,9 @@ ScreenInfo * screen_info_new (GnomeRRScreen *screen, gboolean needs_reprobe, GError **error) { ScreenInfo *info = g_new0 (ScreenInfo, 1); - GnomeRRScreenPrivate *priv; g_return_val_if_fail (screen != NULL, NULL); - priv = screen->priv; - info->outputs = NULL; info->crtcs = NULL; info->modes = NULL; @@ -945,15 +942,14 @@ void gnome_rr_screen_set_primary_output (GnomeRRScreen *screen, GnomeRROutput *output) { - GnomeRRScreenPrivate *priv; - g_return_if_fail (GNOME_IS_RR_SCREEN (screen)); - priv = screen->priv; - #if RANDR_LIBRARY_IS_AT_LEAST_1_3 + GnomeRRScreenPrivate *priv; RROutput id; + priv = screen->priv; + if (output) id = output->id; else |