[gnome-control-center/wip/jsparber/background] [build] remove chooser stuff form meson.build and add new files move background.ui to data and [mino

[Julian Sparber <jsparber src gnome org>]

commit 17c54530b5c0f8d581a25fc42f8c8f820570b4cf
Author: Julian Sparber <julian sparber net>
Date:   Sat Feb 3 19:36:56 2018 +0100

    [build] remove chooser stuff form meson.build and add new files
    move background.ui to data and [minor] warning fix
    
    https://bugzilla.gnome.org/show_bug.cgi?id=788515

 panels/background/background.gresource.xml  |    2 +-
 panels/background/cc-background-grid-item.c |    2 +-
 panels/background/{ => data}/background.ui  |    0
 panels/background/meson.build               |   11 ++++-------
 4 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/panels/background/background.gresource.xml b/panels/background/background.gresource.xml
index 4a76129..96aa31c 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 0fe7871..33ea52d 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/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 ccb13c3..847bd82 100644
--- a/panels/background/meson.build
+++ b/panels/background/meson.build
@@ -59,8 +59,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,12 +68,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-xml.c'
+  'cc-background-grid-item.c',
+  'cc-background-store.c',
+  'cc-background-xml.c',
+  'cc-background-panel.c'
 )
 
 deps = common_deps + [
@@ -93,8 +92,6 @@ cflags += [
   '-DGNOME_DESKTOP_USE_UNSTABLE_API'
 ]
 
-sources = common_sources + files('cc-background-panel.c')
-
 panels_libs += static_library(
   cappletname,
   sources: sources,