← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gnome-desktop3/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/git_revert_draw_background.patch

  • Committer: Package Import Robot
  • Author(s): Tim Lunn
  • Date: 2013-05-28 09:10:46 UTC
  • mfrom: (1.6.1) (21.1.10 experimental)
  • Revision ID: package-import@ubuntu.com-20130528091046-b0oc28za9l97fgq1
Tags: 3.8.2-0ubuntu1
https://launchpad.net/bugs/1184812
* New upstream release
* Sync with Debian (LP: #1184812) Remaining changes:
  - debian/patches:
    + 04_compute_average_color.patch: Compute the avergage color in
      gnome-desktop itself, not in unity to fix some races (LP #963140)
    + tweak_color_computation.patch, Patch from Gord, no patch header,
      no bug link.
    + git_revert_draw_background.patch
    + ubuntu_language.patch, Ported relevant bits from g-c-c 
      52_region_language.patch, as required for gnome 3.8 region panel
    + ubuntu_language_list_from_SUPPORTED.patch,
      adds api to get list of available languages from SUPPORTED file.
      To be used by gnome 3.8 region panel language installation.
  - debian/control.in:
    + Don't break gnome-shell << 3.7.90
    + Use source:Version for gnome-desktop3-data Depend
    + Add epoch to gnome-desktop3-data's Breaks/Replaces, as our old
      gnome-desktop source package introduced an epoch. This needs to be
      kept until after 14.04 LTS.
 - Install helper tools into a versioned directory (by overriding
   libexecdir). They could alternatively be installed in a separate package
* Dropped changes:
  - 02_refuse_to_break_GL_compositors.patch:
    + Doesn't appear to be needed any more
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/git_revert_draw_background.patch
 
1
From a256e037a85447b58f9aab8fd3cc7a8056a3f375 Mon Sep 17 00:00:00 2001
 
2
From: Tim Lunn <tim@feathertop.org>
 
3
Date: Thu, 21 Mar 2013 11:23:33 +1100
 
4
Subject: [PATCH] Revert "GnomeBG: remove the ability not to draw the
 
5
 background"
 
6
 
 
7
This reverts commit ac536ef65ee399c3267b29049c62c70074b0a97d.
 
8
 
 
9
 
 
10
https://bugzilla.gnome.org/show_bug.cgi?id=690378
 
11
---
 
12
 libgnome-desktop/gnome-bg.c | 27 +++++++++++++++++++++++++++
 
13
 libgnome-desktop/gnome-bg.h |  4 +++-
 
14
 2 files changed, 30 insertions(+), 1 deletion(-)
 
15
 
 
16
diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
 
17
index 13e4ace..36e4a5f 100644
 
18
--- a/libgnome-desktop/gnome-bg.c
 
19
+++ b/libgnome-desktop/gnome-bg.c
 
20
@@ -47,6 +47,7 @@ Author: Soren Sandmann <sandmann@redhat.com>
 
21
 #include "gnome-bg-slide-show.h"
 
22
 #include "gnome-bg-crossfade.h"
 
23
 
 
24
+#define BG_KEY_DRAW_BACKGROUND    "draw-background"
 
25
 #define BG_KEY_PRIMARY_COLOR      "primary-color"
 
26
 #define BG_KEY_SECONDARY_COLOR    "secondary-color"
 
27
 #define BG_KEY_COLOR_TYPE         "color-shading-type"
 
28
@@ -78,6 +79,7 @@ struct _GnomeBG
 
29
        GDesktopBackgroundShading       color_type;
 
30
        GdkColor                primary;
 
31
        GdkColor                secondary;
 
32
+       gboolean                is_enabled;
 
33
 
 
34
        GFileMonitor *          file_monitor;
 
35
 
 
36
@@ -304,6 +306,8 @@ gnome_bg_load_from_preferences (GnomeBG   *bg,
 
37
        g_return_if_fail (GNOME_IS_BG (bg));
 
38
        g_return_if_fail (G_IS_SETTINGS (settings));
 
39
 
 
40
+       bg->is_enabled = g_settings_get_boolean (settings, BG_KEY_DRAW_BACKGROUND);
 
41
+
 
42
        /* Filename */
 
43
        filename = g_settings_get_mapped (settings, BG_KEY_PICTURE_URI, bg_gsettings_mapping, NULL);
 
44
 
 
45
@@ -350,6 +354,7 @@ gnome_bg_save_to_preferences (GnomeBG   *bg,
 
46
                uri = g_filename_to_uri (bg->filename, NULL, NULL);
 
47
        if (uri == NULL)
 
48
                uri = g_strdup ("");
 
49
+       g_settings_set_boolean (settings, BG_KEY_DRAW_BACKGROUND, bg->is_enabled);
 
50
        g_settings_set_string (settings, BG_KEY_PICTURE_URI, uri);
 
51
        g_settings_set_string (settings, BG_KEY_PRIMARY_COLOR, primary);
 
52
        g_settings_set_string (settings, BG_KEY_SECONDARY_COLOR, secondary);
 
53
@@ -504,6 +509,28 @@ gnome_bg_get_color (GnomeBG                   *bg,
 
54
                *secondary = bg->secondary;
 
55
 }
 
56
 
 
57
+void
 
58
+gnome_bg_set_draw_background (GnomeBG  *bg,
 
59
+                             gboolean  draw_background)
 
60
+{
 
61
+       g_return_if_fail (bg != NULL);
 
62
+       
 
63
+       if (bg->is_enabled != draw_background) {
 
64
+               bg->is_enabled = draw_background;
 
65
+               
 
66
+               queue_changed (bg);
 
67
+       }
 
68
+}
 
69
+
 
70
+gboolean
 
71
+gnome_bg_get_draw_background (GnomeBG *bg)
 
72
+{
 
73
+       g_return_val_if_fail (bg != NULL, FALSE);
 
74
+
 
75
+       return bg->is_enabled;
 
76
+}
 
77
+
 
78
+
 
79
 const gchar *
 
80
 gnome_bg_get_filename (GnomeBG *bg)
 
81
 {
 
82
diff --git a/libgnome-desktop/gnome-bg.h b/libgnome-desktop/gnome-bg.h
 
83
index 69d1bef..fdd4cc4 100644
 
84
--- a/libgnome-desktop/gnome-bg.h
 
85
+++ b/libgnome-desktop/gnome-bg.h
 
86
@@ -63,9 +63,11 @@ void             gnome_bg_set_color             (GnomeBG               *bg,
 
87
                                                 GDesktopBackgroundShading type,
 
88
                                                 GdkColor              *primary,
 
89
                                                 GdkColor              *secondary);
 
90
-
 
91
+void             gnome_bg_set_draw_background   (GnomeBG               *bg,
 
92
+                                                gboolean               draw_background);
 
93
 /* Getters */
 
94
 GDesktopBackgroundStyle gnome_bg_get_placement  (GnomeBG               *bg);
 
95
+gboolean         gnome_bg_get_draw_background   (GnomeBG               *bg);
 
96
 void            gnome_bg_get_color             (GnomeBG               *bg,
 
97
                                                 GDesktopBackgroundShading *type,
 
98
                                                 GdkColor              *primary,
 
99
-- 
 
100
1.8.1.2
 
101