[gnome-desktop] GnomeBG: remove the ability not to draw the background
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-desktop] GnomeBG: remove the ability not to draw the background
- Date: Thu, 21 Feb 2013 11:17:57 +0000 (UTC)
commit ac536ef65ee399c3267b29049c62c70074b0a97d
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Mon Dec 17 20:24:14 2012 +0100
GnomeBG: remove the ability not to draw the background
Neither gnome-settings-daemon nor nautilus were checking for this
property, and I don't want to add the useless key to the screensaver
schema too.
If one doesn't want to have GNOME draw the background, it should not
run GNOME.
(This does not affect having something else on top of the background,
as mutter is smart enough to avoid drawing in that case)
https://bugzilla.gnome.org/show_bug.cgi?id=690378
libgnome-desktop/gnome-bg.c | 27 ---------------------------
libgnome-desktop/gnome-bg.h | 4 +---
2 files changed, 1 insertions(+), 30 deletions(-)
---
diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
index 36e4a5f..13e4ace 100644
--- a/libgnome-desktop/gnome-bg.c
+++ b/libgnome-desktop/gnome-bg.c
@@ -47,7 +47,6 @@ Author: Soren Sandmann <sandmann redhat com>
#include "gnome-bg-slide-show.h"
#include "gnome-bg-crossfade.h"
-#define BG_KEY_DRAW_BACKGROUND "draw-background"
#define BG_KEY_PRIMARY_COLOR "primary-color"
#define BG_KEY_SECONDARY_COLOR "secondary-color"
#define BG_KEY_COLOR_TYPE "color-shading-type"
@@ -79,7 +78,6 @@ struct _GnomeBG
GDesktopBackgroundShading color_type;
GdkColor primary;
GdkColor secondary;
- gboolean is_enabled;
GFileMonitor * file_monitor;
@@ -306,8 +304,6 @@ gnome_bg_load_from_preferences (GnomeBG *bg,
g_return_if_fail (GNOME_IS_BG (bg));
g_return_if_fail (G_IS_SETTINGS (settings));
- bg->is_enabled = g_settings_get_boolean (settings, BG_KEY_DRAW_BACKGROUND);
-
/* Filename */
filename = g_settings_get_mapped (settings, BG_KEY_PICTURE_URI, bg_gsettings_mapping, NULL);
@@ -354,7 +350,6 @@ gnome_bg_save_to_preferences (GnomeBG *bg,
uri = g_filename_to_uri (bg->filename, NULL, NULL);
if (uri == NULL)
uri = g_strdup ("");
- g_settings_set_boolean (settings, BG_KEY_DRAW_BACKGROUND, bg->is_enabled);
g_settings_set_string (settings, BG_KEY_PICTURE_URI, uri);
g_settings_set_string (settings, BG_KEY_PRIMARY_COLOR, primary);
g_settings_set_string (settings, BG_KEY_SECONDARY_COLOR, secondary);
@@ -509,28 +504,6 @@ gnome_bg_get_color (GnomeBG *bg,
*secondary = bg->secondary;
}
-void
-gnome_bg_set_draw_background (GnomeBG *bg,
- gboolean draw_background)
-{
- g_return_if_fail (bg != NULL);
-
- if (bg->is_enabled != draw_background) {
- bg->is_enabled = draw_background;
-
- queue_changed (bg);
- }
-}
-
-gboolean
-gnome_bg_get_draw_background (GnomeBG *bg)
-{
- g_return_val_if_fail (bg != NULL, FALSE);
-
- return bg->is_enabled;
-}
-
-
const gchar *
gnome_bg_get_filename (GnomeBG *bg)
{
diff --git a/libgnome-desktop/gnome-bg.h b/libgnome-desktop/gnome-bg.h
index fdd4cc4..69d1bef 100644
--- a/libgnome-desktop/gnome-bg.h
+++ b/libgnome-desktop/gnome-bg.h
@@ -63,11 +63,9 @@ void gnome_bg_set_color (GnomeBG *bg,
GDesktopBackgroundShading type,
GdkColor *primary,
GdkColor *secondary);
-void gnome_bg_set_draw_background (GnomeBG *bg,
- gboolean draw_background);
+
/* Getters */
GDesktopBackgroundStyle gnome_bg_get_placement (GnomeBG *bg);
-gboolean gnome_bg_get_draw_background (GnomeBG *bg);
void gnome_bg_get_color (GnomeBG *bg,
GDesktopBackgroundShading *type,
GdkColor *primary,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]