Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-kids/gcompris/files: gcompris-9.5-cursor.patch
Date: Fri, 28 Jan 2011 07:48:03
Message-Id: 20110128074753.3B1EF20047@flycatcher.gentoo.org
1 mr_bones_ 11/01/28 07:47:53
2
3 Added: gcompris-9.5-cursor.patch
4 Log:
5 add upstream patch to fix cursor visibility (bug #353009)
6
7 (Portage version: 2.1.9.25/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 games-kids/gcompris/files/gcompris-9.5-cursor.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-kids/gcompris/files/gcompris-9.5-cursor.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-kids/gcompris/files/gcompris-9.5-cursor.patch?rev=1.1&content-type=text/plain
14
15 Index: gcompris-9.5-cursor.patch
16 ===================================================================
17 From af5058722f44ab548c9ad754fe9d9594369c5ff2 Mon Sep 17 00:00:00 2001
18 From: Peter Ujfalusi <peter.ujfalusi@×××××.com>
19 Date: Thu, 27 Jan 2011 22:36:55 +0000
20 Subject: Fixed invisible cursor on 64 bits systems.
21
22 The propoerty struct is now properly initialized even on 64 bits systems.
23 ---
24 diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c
25 index a4e618b..d5053f9 100644
26 --- a/src/gcompris/gcompris.c
27 +++ b/src/gcompris/gcompris.c
28 @@ -1541,9 +1541,6 @@ main (int argc, char *argv[])
29 g_option_context_parse (context, &argc, &argv, &error);
30 g_option_context_free(context);
31
32 - // Set the default gcompris cursor
33 - properties->defaultcursor = GCOMPRIS_DEFAULT_CURSOR;
34 -
35 /* Set the default message handler, it avoids message with option -D */
36 g_log_set_handler (NULL, G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_DEBUG | G_LOG_FLAG_FATAL
37 | G_LOG_FLAG_RECURSION, gc_log_handler, NULL);
38 diff --git a/src/gcompris/properties.c b/src/gcompris/properties.c
39 index 29e43dd..cd36624 100644
40 --- a/src/gcompris/properties.c
41 +++ b/src/gcompris/properties.c
42 @@ -143,10 +143,13 @@ gc_prop_new ()
43 {
44 GcomprisProperties *tmp;
45
46 - tmp = (GcomprisProperties *) malloc (sizeof (GcomprisProperties));
47 + tmp = (GcomprisProperties *) calloc (1, sizeof (GcomprisProperties));
48 tmp->music = 1;
49 tmp->fx = 1;
50 tmp->fullscreen = 1;
51 + // Set the default gcompris cursor
52 + tmp->defaultcursor = GCOMPRIS_DEFAULT_CURSOR;
53 + tmp->nocursor = 0;
54 tmp->timer = 1;
55 tmp->skin = g_strdup("babytoy");
56 tmp->key = g_strdup("default");
57 --
58 cgit v0.8.3.1