[gnome-control-center/wip/jsparber/background: 12/15] background: adapt meson.build for file changes

[Julian Sparber <jsparber src gnome org>]

commit dac02a9405e43aef38c6674a4e8a2d40643efcfc
Author: Julian Sparber <julian sparber net>
Date:   Fri Feb 2 18:13:05 2018 +0100

    background: adapt meson.build for file changes
    
    - remove file for the chooser gallery from meson.build
    - add new source files to meson.build
    - move background.ui to data
    - remove old source files and images from git
    - fix build warnings
    
    https://bugzilla.gnome.org/show_bug.cgi?id=788515

 panels/background/background.gresource.xml  |   2 +-
 panels/background/bg-colors-source.c        | 256 -------
 panels/background/bg-colors-source.h        |  41 --
 panels/background/bg-pictures-source.c      | 997 ----------------------------
 panels/background/bg-pictures-source.h      |  50 --
 panels/background/cc-background-grid-item.c |   2 +-
 panels/background/cc-background-item.c      |   1 -
 panels/background/{ => data}/background.ui  |   0
 panels/background/meson.build               |  43 +-
 panels/background/noise-texture-light.png   | Bin 69136 -> 0 bytes
 panels/background/slideshow-symbolic.svg    |  70 --
 11 files changed, 5 insertions(+), 1457 deletions(-)
---
diff --git a/panels/background/background.gresource.xml b/panels/background/background.gresource.xml
index 4a76129c2..96aa31c3f 100644
--- a/panels/background/background.gresource.xml
+++ b/panels/background/background.gresource.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/control-center/background">
-    <file preprocess="xml-stripblanks">background.ui</file>
+    <file alias="background.ui" preprocess="xml-stripblanks">data/background.ui</file>
     <file alias="background.css">data/background.css</file> 
   </gresource>
 </gresources>
diff --git a/panels/background/cc-background-grid-item.c b/panels/background/cc-background-grid-item.c
index 0fe7871db..33ea52d35 100644
--- a/panels/background/cc-background-grid-item.c
+++ b/panels/background/cc-background-grid-item.c
@@ -88,7 +88,7 @@ add_slideshow_emblem (CcBackgroundGridItem *item,
                       gint                  h,
                       gint                  scale_factor)
 {
-  GdkPixbuf *slideshow_emblem;
+  GdkPixbuf *slideshow_emblem = NULL;
 
   int eh;
   int ew;
diff --git a/panels/background/cc-background-item.c b/panels/background/cc-background-item.c
index 13c65837d..c547cb150 100644
--- a/panels/background/cc-background-item.c
+++ b/panels/background/cc-background-item.c
@@ -143,7 +143,6 @@ set_bg_properties (CcBackgroundItem *item)
 {
         GdkRGBA pcolor = { 0, 0, 0, 0 };
         GdkRGBA scolor = { 0, 0, 0, 0 };
-        GdkColor p, s;
 
         if (item->uri) {
                g_autoptr(GFile) file = NULL;
diff --git a/panels/background/background.ui b/panels/background/data/background.ui
similarity index 100%
rename from panels/background/background.ui
rename to panels/background/data/background.ui
diff --git a/panels/background/meson.build b/panels/background/meson.build
index 69dad5bd3..faa44830f 100644
--- a/panels/background/meson.build
+++ b/panels/background/meson.build
@@ -17,21 +17,11 @@ i18n.merge_file(
   install_dir: control_center_desktopdir
 )
 
-install_data(
-  'slideshow-symbolic.svg',
-  install_dir: join_paths(control_center_icondir, 'hicolor', 'scalable', 'categories')
-)
-
 install_data(
   'slideshow-emblem.svg',
   install_dir: join_paths(control_center_icondir, 'hicolor', 'scalable', 'emblems')
 )
 
-install_data(
-  'noise-texture-light.png',
-  install_dir: join_paths(control_center_pkgdatadir, 'pixmaps')
-)
-
 common_sources = []
 
 enums = 'gdesktop-enums-types'
@@ -59,8 +49,6 @@ common_sources += gnome.mkenums(
   vtail: '      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static ("@EnumName@", values);\n  
}\n  return etype;\n}\n'
 )
 
-resource_data = files('background.ui')
-
 common_sources += gnome.compile_resources(
   'cc-@0@-resources'.format(cappletname),
   cappletname + '.gresource.xml',
@@ -70,16 +58,13 @@ common_sources += gnome.compile_resources(
 )
 
 sources = common_sources + files(
-  'bg-colors-source.c',
-  'bg-pictures-source.c',
   'bg-source.c',
   'bg-wallpapers-source.c',
+  'cc-background-item.c',
   'cc-background-grid-item.c',
   'cc-background-store.c',
-  'cc-background-chooser-dialog.c',
-  'cc-background-grilo-miner.c',
-  'cc-background-item.c',
-  'cc-background-xml.c'
+  'cc-background-xml.c',
+  'cc-background-panel.c'
 )
 
 deps = common_deps + [
@@ -97,32 +82,10 @@ cflags += [
   '-DGNOME_DESKTOP_USE_UNSTABLE_API'
 ]
 
-libbackground_chooser = static_library(
-  cappletname + '-chooser',
-  sources: sources,
-  include_directories: top_inc,
-  dependencies: deps,
-  c_args: cflags
-)
-
-sources = common_sources + files('cc-background-panel.c')
-
 panels_libs += static_library(
   cappletname,
   sources: sources,
   include_directories: top_inc,
   dependencies: deps,
   c_args: cflags,
-  link_with: libbackground_chooser
-)
-
-test_name = 'test-chooser-dialog'
-
-executable(
-  test_name,
-  test_name + '.c',
-  include_directories: top_inc,
-  dependencies: deps,
-  c_args: cflags,
-  link_with: libbackground_chooser
 )