[geary/geary-0.12] Fix gnome-shell notifications missing an icon under flatpak. Bug 790103.

[Michael Gratton <mjog src gnome org>]

commit 9377074aef7ef6876b80ddb8d1b50f18b6f916ec
Author: Michael James Gratton <mike vee net>
Date:   Tue Nov 14 13:08:15 2017 +1100

    Fix gnome-shell notifications missing an icon under flatpak. Bug 790103.
    
    * icons: Rename application icons to match fully-qualified app name. Update
      references to the olde name with the fully-qualified app name.

 desktop/geary-autostart.desktop.in                 |    2 +-
 desktop/org.gnome.Geary.desktop.in                 |    2 +-
 icons/CMakeLists.txt                               |   14 +++++++-------
 .../16x16/apps/{geary.png => org.gnome.Geary.png}  |  Bin 742 -> 742 bytes
 .../24x24/apps/{geary.png => org.gnome.Geary.png}  |  Bin 1295 -> 1295 bytes
 .../apps/{geary.png => org.gnome.Geary.png}        |  Bin 24639 -> 24639 bytes
 .../32x32/apps/{geary.png => org.gnome.Geary.png}  |  Bin 1666 -> 1666 bytes
 .../48x48/apps/{geary.png => org.gnome.Geary.png}  |  Bin 2672 -> 2672 bytes
 .../apps/{geary.png => org.gnome.Geary.png}        |  Bin 62570 -> 62570 bytes
 ...y-symbolic.svg => org.gnome.Geary-symbolic.svg} |    0
 org.gnome.Geary.json                               |    2 --
 src/client/application/geary-application.vala      |    6 +++++-
 src/client/application/geary-controller.vala       |    3 ---
 src/client/notification/libnotify.vala             |    2 +-
 ui/login.glade                                     |    2 +-
 15 files changed, 16 insertions(+), 17 deletions(-)
---
diff --git a/desktop/geary-autostart.desktop.in b/desktop/geary-autostart.desktop.in
index c6d5a6d..fac778f 100644
--- a/desktop/geary-autostart.desktop.in
+++ b/desktop/geary-autostart.desktop.in
@@ -4,7 +4,7 @@ _GenericName=Email
 _X-GNOME-FullName=Geary Mail
 _Comment=Send and receive email
 _Keywords=Email;E-mail;Mail;
-Icon=geary
+Icon=org.gnome.Geary
 TryExec=geary
 Exec=geary --hidden
 Type=Application
diff --git a/desktop/org.gnome.Geary.desktop.in b/desktop/org.gnome.Geary.desktop.in
index 3935cbf..b849569 100644
--- a/desktop/org.gnome.Geary.desktop.in
+++ b/desktop/org.gnome.Geary.desktop.in
@@ -5,7 +5,7 @@ _X-GNOME-FullName=Geary Email
 _Comment=Send and receive email
 # Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
 _Keywords=Mail;E-mail;IMAP;GMail;Yahoo;Hotmail;Outlook;
-Icon=geary
+Icon=org.gnome.Geary
 TryExec=geary
 Exec=geary %U
 Type=Application
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 0e2e9c2..316dbd6 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -27,13 +27,13 @@ set(ICON_FILES
 install(FILES ${ICON_FILES} DESTINATION ${ICONS_DEST})
 
 # Application icon goes in theme directory
-install(FILES "hicolor/16x16/apps/geary.png" DESTINATION share/icons/hicolor/16x16/apps)
-install(FILES "hicolor/24x24/apps/geary.png" DESTINATION share/icons/hicolor/24x24/apps)
-install(FILES "hicolor/32x32/apps/geary.png" DESTINATION share/icons/hicolor/32x32/apps)
-install(FILES "hicolor/48x48/apps/geary.png" DESTINATION share/icons/hicolor/48x48/apps)
-install(FILES "hicolor/256x256/apps/geary.png" DESTINATION share/icons/hicolor/256x256/apps)
-install(FILES "hicolor/512x512/apps/geary.png" DESTINATION share/icons/hicolor/512x512/apps)
-install(FILES "hicolor/symbolic/apps/geary-symbolic.svg" DESTINATION share/icons/hicolor/symbolic/apps)
+install(FILES "hicolor/16x16/apps/org.gnome.Geary.png" DESTINATION share/icons/hicolor/16x16/apps)
+install(FILES "hicolor/24x24/apps/org.gnome.Geary.png" DESTINATION share/icons/hicolor/24x24/apps)
+install(FILES "hicolor/32x32/apps/org.gnome.Geary.png" DESTINATION share/icons/hicolor/32x32/apps)
+install(FILES "hicolor/48x48/apps/org.gnome.Geary.png" DESTINATION share/icons/hicolor/48x48/apps)
+install(FILES "hicolor/256x256/apps/org.gnome.Geary.png" DESTINATION share/icons/hicolor/256x256/apps)
+install(FILES "hicolor/512x512/apps/org.gnome.Geary.png" DESTINATION share/icons/hicolor/512x512/apps)
+install(FILES "hicolor/symbolic/apps/org.gnome.Geary-symbolic.svg" DESTINATION 
share/icons/hicolor/symbolic/apps)
 
 # Optional: update icon cache at install time.
 if (ICON_UPDATE)
diff --git a/icons/hicolor/symbolic/apps/geary-symbolic.svg 
b/icons/hicolor/symbolic/apps/org.gnome.Geary-symbolic.svg
similarity index 100%
rename from icons/hicolor/symbolic/apps/geary-symbolic.svg
rename to icons/hicolor/symbolic/apps/org.gnome.Geary-symbolic.svg
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index 2500c26..5605138 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -5,8 +5,6 @@
     "runtime-version": "3.26",
     "sdk": "org.gnome.Sdk",
     "command": "geary",
-    "rename-icon": "geary",
-    "copy-icon": true,
     "finish-args": [
         /* X11 + XShm access */
         "--share=ipc", "--socket=x11",
diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
index 933be38..5c17116 100644
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@ -195,8 +195,12 @@ public class GearyApplication : Gtk.Application {
         Geary.Logging.init();
         Date.init();
 
+        // Calls Gtk.init(), amongst other things
         base.startup();
 
+        // Ensure all geary windows have an icon
+        Gtk.Window.set_default_icon_name(APP_ID);
+
         add_action_entries(action_entries, this);
     }
     
@@ -460,7 +464,7 @@ public class GearyApplication : Gtk.Application {
             "authors", AUTHORS,
             "copyright", string.join("\n", COPYRIGHT_1, COPYRIGHT_2),
             "license-type", Gtk.License.LGPL_2_1,
-            "logo-icon-name", "geary",
+            "logo-icon-name", APP_ID,
             "version", VERSION,
             "website", WEBSITE,
             "website-label", WEBSITE_LABEL,
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index 8998fcd..049b1db 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -171,9 +171,6 @@ public class GearyController : Geary.BaseObject {
         // custom icons)
         IconFactory.instance.init();
 
-        // Ensure all geary windows have an icon
-        Gtk.Window.set_default_icon_name("geary");
-
         apply_app_menu_fix();
 
         // Setup actions.
diff --git a/src/client/notification/libnotify.vala b/src/client/notification/libnotify.vala
index 2356d51..c27c3f3 100644
--- a/src/client/notification/libnotify.vala
+++ b/src/client/notification/libnotify.vala
@@ -158,7 +158,7 @@ public class Libnotify : Geary.BaseObject {
         // Avoid constructor due to ABI change
         Notify.Notification notification = (Notify.Notification) GLib.Object.new(
             typeof (Notify.Notification),
-            "icon-name", "geary",
+            "icon-name", "org.gnome.Geary",
             "summary", GLib.Environment.get_application_name());
         notification.set_hint_string("desktop-entry", "org.gnome.Geary");
         if (caps.find_custom("actions", GLib.strcmp) != null)
diff --git a/ui/login.glade b/ui/login.glade
index df3c7b5..9f6871e 100644
--- a/ui/login.glade
+++ b/ui/login.glade
@@ -21,7 +21,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="pixel_size">64</property>
-            <property name="icon_name">geary</property>
+            <property name="icon_name">org.gnome.Geary</property>
           </object>
           <packing>
             <property name="expand">False</property>