← Back to branch summary

~ubuntu-branches/ubuntu/wily/totem/wily

« back to all changes in this revision

Viewing changes to debian/patches/git_clutter_correct_use.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Matthias Niess
  • Date: 2014-03-31 17:40:40 UTC
  • Revision ID: package-import@ubuntu.com-20140331174040-l48yofuivru7jnrf
Tags: 3.10.1-1ubuntu4
https://launchpad.net/bugs/1292262
* debian/patches/revert_shell_menu.patch:
  - clean leftover line leading to a warning
* debian/patches/git_clutter_correct_use.patch:
  - clean some clutter warnings

[ Matthias Niess ]
* debian/patches/git-fix-subtitle-downloader.patch:
  - missing dependency in opensubtitles.py and bad argument passed
    to PyGObject (LP: #1292262)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/git_clutter_correct_use.patch
 
1
From 4a7e14f2fe4aaba751a5de427233a32024f3eb81 Mon Sep 17 00:00:00 2001
 
2
From: Alban Browaeys <prahal@yahoo.com>
 
3
Date: Sat, 29 Jun 2013 05:36:29 +0000
 
4
Subject: backend: Fix pick in the aspect frame
 
5
 
 
6
Fixes:
 
7
(totem:24473): Clutter-WARNING **: The required ID of 2 does not refer
 
8
to an existing actor; this usually implies that the pick() of an actor
 
9
is not correctly implemented or that there is an error in the
 
10
glReadPixels() implementation of the GL driver.
 
11
 
 
12
Let parent do the pick "draw" for the container as per
 
13
Example 24. Pick implementation of a container of the clutter
 
14
reference manual version 1.8, Section "Implementing a new actor".
 
15
 
 
16
https://bugzilla.gnome.org/show_bug.cgi?id=703368
 
17
---
 
18
diff --git a/src/backend/totem-aspect-frame.c b/src/backend/totem-aspect-frame.c
 
19
index 7dee217..7e72e08 100644
 
20
--- a/src/backend/totem-aspect-frame.c
 
21
+++ b/src/backend/totem-aspect-frame.c
 
22
@@ -320,9 +320,7 @@ totem_aspect_frame_pick (ClutterActor       *actor,
 
23
 
 
24
   clutter_actor_get_allocation_box (actor, &box);
 
25
 
 
26
-  cogl_set_source_color4ub (color->red, color->green,
 
27
-                            color->blue, color->alpha);
 
28
-  cogl_rectangle (box.x1, box.y1, box.x2, box.y2);
 
29
+  CLUTTER_ACTOR_CLASS (totem_aspect_frame_parent_class)->pick (actor, color);
 
30
 
 
31
   child = clutter_actor_get_child_at_index (actor, 0);
 
32