[meld/flatpak-ci: 31/31] meldapp: Remove the separate icon identifier

[Kai Willadsen <kaiw src gnome org>]

commit 4715f1a755f87ecaee93c82f297ad3dadedc97f2
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Nov 30 06:17:46 2019 +1000

    meldapp: Remove the separate icon identifier
    
    We might want this back at some point, but for now it's simpler to just
    use the application ID.

 meld/conf.py.in | 2 --
 meld/meldapp.py | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/meld/conf.py.in b/meld/conf.py.in
index fae36ccc..6459d348 100644
--- a/meld/conf.py.in
+++ b/meld/conf.py.in
@@ -8,8 +8,6 @@ __version__ = "3.21.0"
 
 APPLICATION_NAME = 'Meld'
 APPLICATION_ID = 'org.gnome.Meld'
-# TODO: Ideally this would be the application ID, but we need a MeldDevel icon
-ICON_NAME = 'org.gnome.meld'
 SETTINGS_SCHEMA_ID = 'org.gnome.meld'
 RESOURCE_BASE = '/org/gnome/Meld'
 
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 43123a59..7a9d1d3b 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -46,7 +46,7 @@ class MeldApp(Gtk.Application):
         )
         GLib.set_application_name(meld.conf.APPLICATION_NAME)
         GLib.set_prgname(meld.conf.APPLICATION_ID)
-        Gtk.Window.set_default_icon_name(meld.conf.ICON_NAME)
+        Gtk.Window.set_default_icon_name(meld.conf.APPLICATION_ID)
         self.set_resource_base_path(meld.conf.RESOURCE_BASE)
 
     def do_startup(self):
@@ -115,7 +115,7 @@ class MeldApp(Gtk.Application):
             '/org/gnome/meld/ui/about-dialog.ui')
         dialog = builder.get_object('about-dialog')
         dialog.set_version(meld.conf.__version__)
-        dialog.set_logo_icon_name(meld.conf.ICON_NAME)
+        dialog.set_logo_icon_name(meld.conf.APPLICATION_ID)
         dialog.set_transient_for(self.get_active_window())
         dialog.run()
         dialog.destroy()