[gnome-control-center/wip/carlosg/flat-timezone-map: 1/3] datetime: Drop colormap




commit 05570504418907fe96809660dfe606d39756f1be
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Jun 17 16:17:17 2022 +0200

    datetime: Drop colormap
    
    This image file is nowadays unused, except for loading/destroying it.
    We can simply drop this.

 panels/datetime/cc-timezone-map.c      |  10 ----------
 panels/datetime/data/cc.png            | Bin 51482 -> 0 bytes
 panels/datetime/datetime.gresource.xml |   1 -
 panels/datetime/meson.build            |   1 -
 4 files changed, 12 deletions(-)
---
diff --git a/panels/datetime/cc-timezone-map.c b/panels/datetime/cc-timezone-map.c
index 3c7c8fcd8..924727b53 100644
--- a/panels/datetime/cc-timezone-map.c
+++ b/panels/datetime/cc-timezone-map.c
@@ -48,7 +48,6 @@ struct _CcTimezoneMap
   GdkTexture *orig_background_dim;
 
   GdkTexture *background;
-  GdkTexture *color_map;
   GdkTexture *pin;
 
   gdouble selected_offset;
@@ -85,7 +84,6 @@ cc_timezone_map_dispose (GObject *object)
 {
   CcTimezoneMap *self = CC_TIMEZONE_MAP (object);
 
-  g_clear_object (&self->color_map);
   g_clear_object (&self->orig_background);
   g_clear_object (&self->orig_background_dim);
   g_clear_object (&self->background);
@@ -499,14 +497,6 @@ cc_timezone_map_init (CcTimezoneMap *map)
       g_clear_error (&err);
     }
 
-  map->color_map = texture_from_resource (DATETIME_RESOURCE_PATH "/cc.png", &err);
-  if (!map->color_map)
-    {
-      g_warning ("Could not load background image: %s",
-                 (err) ? err->message : "Unknown error");
-      g_clear_error (&err);
-    }
-
   map->pin = texture_from_resource (DATETIME_RESOURCE_PATH "/pin.png", &err);
   if (!map->pin)
     {
diff --git a/panels/datetime/datetime.gresource.xml b/panels/datetime/datetime.gresource.xml
index 742b1f9e2..322ba5c8f 100644
--- a/panels/datetime/datetime.gresource.xml
+++ b/panels/datetime/datetime.gresource.xml
@@ -5,7 +5,6 @@
     <file>backward</file>
     <file alias="bg.png">data/bg.png</file>
     <file alias="bg_dim.png">data/bg_dim.png</file>
-    <file alias="cc.png">data/cc.png</file>
     <file alias="pin.png">data/pin.png</file>
     <file alias="timezone_0.png">data/timezone_0.png</file>
     <file alias="timezone_0_dim.png">data/timezone_0_dim.png</file>
diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build
index 9bbdc7ce0..99a158e9a 100644
--- a/panels/datetime/meson.build
+++ b/panels/datetime/meson.build
@@ -29,7 +29,6 @@ i18n.merge_file(
 resource_data = files(
   'data/bg_dim.png',
   'data/bg.png',
-  'data/cc.png',
   'data/pin.png',
   'data/timezone_0_dim.png',
   'data/timezone_0.png',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]