diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
| commit | a6ee13798647ec09fb33e316a90ef6ed0b7f314a (patch) | |
| tree | 815ded684a1ee9e4c23c2f03c98691b9272243c1 /extra/gnome-desktop | |
| parent | c3b94090a6330f678ade2f767e76ab7802d3463e (diff) | |
| parent | 4d22176132f4a830ab0cc510dabbc9f8c1c362ea (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/csfml/PKGBUILD
community/evolution-rss/PKGBUILD
community/inn/PKGBUILD
community/libssh2/PKGBUILD
community/perl-xml-dom/PKGBUILD
community/php52/PKGBUILD
community/python-pysfml/PKGBUILD
community/skype-call-recorder/PKGBUILD
extra/ipod-sharp/PKGBUILD
extra/madwifi-utils/PKGBUILD
extra/madwifi/PKGBUILD
Diffstat (limited to 'extra/gnome-desktop')
| -rw-r--r-- | extra/gnome-desktop/randr-fix.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/extra/gnome-desktop/randr-fix.patch b/extra/gnome-desktop/randr-fix.patch deleted file mode 100644 index c5d83ef2c..000000000 --- a/extra/gnome-desktop/randr-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From aa93854f2ba6b0f72f1bdff9699b5724a72c89c9 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Sun, 01 May 2011 00:48:03 +0000 -Subject: Don't fall over if RANDR is missing - -When RANDR is not present, the screen object never gets an info, -and since screen_info_free asserts, we must not call it unconditionally -in finalize. -This fixes https://bugzilla.gnome.org/show_bug.cgi?id=649053 ---- -diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c -index 4a9d98e..eb3d735 100644 ---- a/libgnome-desktop/gnome-rr.c -+++ b/libgnome-desktop/gnome-rr.c -@@ -748,7 +748,8 @@ gnome_rr_screen_finalize (GObject *gobject) - - gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen); - -- screen_info_free (screen->priv->info); -+ if (screen->priv->info) -+ screen_info_free (screen->priv->info); - - G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject); - } --- -cgit v0.9 |