r38279 - in /desktop/unstable/five-or-more/debian: changelog patches/fix-glines-crash.patch

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Fri May 31 21:38:22 2013
New Revision: 38279

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38279
Log:
updated with patch from git

Modified:
    desktop/unstable/five-or-more/debian/changelog
    desktop/unstable/five-or-more/debian/patches/fix-glines-crash.patch

Modified: desktop/unstable/five-or-more/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/five-or-more/debian/changelog?rev=38279&op=diff
==============================================================================
--- desktop/unstable/five-or-more/debian/changelog [utf-8] (original)
+++ desktop/unstable/five-or-more/debian/changelog [utf-8] Fri May 31 21:38:22 2013
@@ -1,7 +1,6 @@
 five-or-more (1:3.8.1-2) UNRELEASED; urgency=low
 
-  * Add fix-glines-crash.patch to fix crashes on 32-bit
-    Thanks Julian Taylor for recognizing that the bug still exists
+  * Add fix-glines-crash.patch to fix crash with Unity on 32-bit
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Thu, 30 May 2013 17:32:23 -0400
 

Modified: desktop/unstable/five-or-more/debian/patches/fix-glines-crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/five-or-more/debian/patches/fix-glines-crash.patch?rev=38279&op=diff
==============================================================================
--- desktop/unstable/five-or-more/debian/patches/fix-glines-crash.patch [utf-8] (original)
+++ desktop/unstable/five-or-more/debian/patches/fix-glines-crash.patch [utf-8] Fri May 31 21:38:22 2013
@@ -1,16 +1,30 @@
-Description: prevent draw before preview is initinialized
-Origin: upstream bug
 Bug-Ubuntu: https://launchpad.net/bugs/995281
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=675628
 
+From 752fd6abc2a2c9e6c6fc9e23583ac0ffcfc5e6bb Mon Sep 17 00:00:00 2001
+From: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
+Date: Fri, 31 May 2013 21:59:55 +0000
+Subject: prepare the preview surfaces before the board is shown
+
+Move the reset_game call before the widgets are shown in activate_cb.
+Otherwise this results in a configure event on unity where the
+previews are drawn before they have been prepared.
+
+This fixes the problem on unity.
+---
+diff --git a/src/glines.c b/src/glines.c
+index b8b47a9..1e106bb 100644
 --- a/src/glines.c
 +++ b/src/glines.c
-@@ -442,7 +442,7 @@
+@@ -1614,9 +1614,8 @@ startup_cb (GApplication *application)
+ static void
+ activate_cb (GApplication *application)
+ {
+-  gtk_widget_show_all (app);
+-
+   reset_game ();
++  gtk_widget_show_all (app);
+   start_game ();
+ }
  
-   for (i = 0; i < MAXNPIECES; i++) {
- 
--    if (i < npieces)
-+    if (i < npieces && preview[i] > 0 )
-       pattern = cairo_pattern_create_for_surface (preview_surfaces[preview[i] - 1]);
-     else
-       pattern = cairo_pattern_create_for_surface (blank_preview_surface);
+