← Back to branch summary

~ubuntu-branches/ubuntu/wily/gnome-screenshot/wily-proposed

« back to all changes in this revision

Viewing changes to debian/patches/0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2015-06-08 17:52:26 UTC
  • Revision ID: package-import@ubuntu.com-20150608175226-t0v0q5esokk3uc0a
Tags: 3.16.2-0ubuntu2
* debian/patches/0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch:
  Fix the flash not ever going away under GTK 3.16.
* debian/patches/0002-Scale-images-by-the-scale-factor-in-use.patch: Scale
  the screenshot by the scaling factor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch
 
1
From a846198d824cd8dd39d37d869607cdb2193dbd83 Mon Sep 17 00:00:00 2001
 
2
From: Iain Lane <iain@orangesquash.org.uk>
 
3
Date: Mon, 8 Jun 2015 13:32:21 +0100
 
4
Subject: [PATCH 1/2] cheese-flash: Don't set a GdkVisual: it makes the flash
 
5
 never end on gtk3.16
 
6
 
 
7
---
 
8
 src/cheese-flash.c | 9 ---------
 
9
 1 file changed, 9 deletions(-)
 
10
 
 
11
diff --git a/src/cheese-flash.c b/src/cheese-flash.c
 
12
index f60cd56..51155bd 100644
 
13
--- a/src/cheese-flash.c
 
14
+++ b/src/cheese-flash.c
 
15
@@ -71,7 +71,6 @@ cheese_flash_init (CheeseFlash *self)
 
16
   cairo_region_t *input_region;
 
17
   GtkWindow *window;
 
18
   GdkScreen *screen;
 
19
-  GdkVisual *visual;
 
20
 
 
21
   priv->flash_timeout_tag = 0;
 
22
   priv->fade_timeout_tag  = 0;
 
23
@@ -89,14 +88,6 @@ cheese_flash_init (CheeseFlash *self)
 
24
   gtk_window_set_accept_focus (window, FALSE);
 
25
   gtk_window_set_focus_on_map (window, FALSE);
 
26
 
 
27
-  /* no shadow */
 
28
-  screen = gtk_widget_get_screen (GTK_WIDGET (window));
 
29
-  visual = gdk_screen_get_rgba_visual (screen);
 
30
-  if (visual == NULL)
 
31
-    visual = gdk_screen_get_system_visual (screen);
 
32
-
 
33
-  gtk_widget_set_visual (GTK_WIDGET (window), visual);
 
34
-
 
35
   /* Don't consume input */
 
36
   gtk_widget_realize (GTK_WIDGET (window));
 
37
 
 
38
-- 
 
39
2.1.4
 
40