[gnome-control-center/wip/jsparber/background: 40/40] background: fix merge mistakes created during rebase

[Julian Sparber <jsparber src gnome org>]

commit 4835a6ec1bfcd0aaf4584dfa0e8ae49a5c753a27
Merge: 4303fbe fa365ac
Author: Julian Sparber <julian sparber net>
Date:   Tue Feb 6 20:15:34 2018 +0100

    background: fix merge mistakes created during rebase
    
    https://bugzilla.gnome.org/show_bug.cgi?id=788515

 panels/background/bg-wallpapers-source.c |    5 +-
 panels/background/cc-background-panel.c  |  228 +----------------------------
 2 files changed, 9 insertions(+), 224 deletions(-)
---
diff --cc panels/background/bg-wallpapers-source.c
index 546405d,47d8da2..1b891e5
--- a/panels/background/bg-wallpapers-source.c
+++ b/panels/background/bg-wallpapers-source.c
@@@ -115,11 -113,10 +113,10 @@@ load_default_bg (BgWallpapersSource *se
      g_autofree gchar *filename = NULL;
  
      filename = g_build_filename (system_data_dirs[i],
 -                               "gnome-background-properties",
 -                               "adwaita.xml",
 -                               NULL);
 +                                 "gnome-background-properties",
 +                                 "adwaita.xml",
 +                                 NULL);
-     if (cc_background_xml_load_xml (self->xml, filename)) {
-       g_free (filename);
+     if (cc_background_xml_load_xml (self->xml, filename))
        break;
    }
  }
diff --cc panels/background/cc-background-panel.c
index f34bb56,7efeaae..c143565
--- a/panels/background/cc-background-panel.c
+++ b/panels/background/cc-background-panel.c
@@@ -432,11 -223,9 +223,10 @@@ on_panel_resize (GtkWidget *widget
    }
  }
  
 +
  static void
  reload_current_bg (CcBackgroundPanel *panel,
-                    GSettings *settings
-                   )
+                    GSettings *settings)
  {
    g_autoptr(CcBackgroundItem) saved = NULL;
    CcBackgroundItem *configured;
@@@ -801,8 -588,6 +590,7 @@@ cc_background_panel_init (CcBackgroundP
                                       panel,
                                       WID("background-gallery"),
                                       create_gallery_item);
 +
- 
    /* Background settings */
    g_signal_connect (panel->settings, "changed", G_CALLBACK (on_settings_changed), panel);
  }