[gnome-software: 2/2] Merge branch 'flatpak-devel-desktop-file' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 213023f029166d5cf1ac3f6ae9e45f38d0bb7488
Merge: 948db3b5b 512feeb74
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Apr 20 11:23:35 2021 +0000

    Merge branch 'flatpak-devel-desktop-file' into 'master'
    
    Export desktop file & icon in development builds
    
    See merge request GNOME/gnome-software!704

 data/icons/hicolor/meson.build                                       | 2 +-
 .../{org.gnome.Software.Devel.svg => org.gnome.SoftwareDevel.svg}    | 0
 src/gs-application.c                                                 | 2 +-
 src/meson.build                                                      | 5 +++--
 src/org.gnome.Software.desktop.in                                    | 2 +-
 src/org.gnome.Software.service.in                                    | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
---
diff --cc src/gs-application.c
index 577c3ce34,c5bbda074..ffe984500
--- a/src/gs-application.c
+++ b/src/gs-application.c
@@@ -356,9 -353,9 +356,9 @@@ about_activated (GSimpleAction *action
  
        dialog = GTK_ABOUT_DIALOG (gtk_about_dialog_new ());
        gtk_about_dialog_set_authors (dialog, authors);
 -      gtk_about_dialog_set_copyright (dialog, copyright);
 +      gtk_about_dialog_set_copyright (dialog, _("Copyright \xc2\xa9 2016–2021 GNOME Software 
contributors"));
        gtk_about_dialog_set_license_type (dialog, GTK_LICENSE_GPL_2_0);
-       gtk_about_dialog_set_logo_icon_name (dialog, "org.gnome.Software");
+       gtk_about_dialog_set_logo_icon_name (dialog, APPLICATION_ID);
        gtk_about_dialog_set_translator_credits (dialog, _("translator-credits"));
        gtk_about_dialog_set_version (dialog, get_version());