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

@@ -5,7 +5,7 @@ Comment=Send and receive email
 # Translators: These are desktop search terms. Do not translate semicolons, end line with a semicolon.
 Keywords=Email;E-mail;Mail;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=geary
+Icon=org.gnome.Geary
 TryExec=geary
 Exec=geary --hidden
 Type=Application

desktop/org.gnome.Geary.desktop.in

@@ -5,7 +5,7 @@ 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;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=geary
+Icon=org.gnome.Geary
 TryExec=geary
 Exec=geary %U
 Type=Application

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/16x16/apps/org.gnome.Geary.png" DESTINATION share/icons/hicolor/16x16/apps)
-install(FILES "hicolor/24x24/apps/geary.png" DESTINATION share/icons/hicolor/24x24/apps)
+install(FILES "hicolor/24x24/apps/org.gnome.Geary.png" DESTINATION share/icons/hicolor/24x24/apps)
-install(FILES "hicolor/32x32/apps/geary.png" DESTINATION share/icons/hicolor/32x32/apps)
+install(FILES "hicolor/32x32/apps/org.gnome.Geary.png" DESTINATION share/icons/hicolor/32x32/apps)
-install(FILES "hicolor/48x48/apps/geary.png" DESTINATION share/icons/hicolor/48x48/apps)
+install(FILES "hicolor/48x48/apps/org.gnome.Geary.png" DESTINATION share/icons/hicolor/48x48/apps)
-install(FILES "hicolor/256x256/apps/geary.png" DESTINATION share/icons/hicolor/256x256/apps)
+install(FILES "hicolor/256x256/apps/org.gnome.Geary.png" DESTINATION share/icons/hicolor/256x256/apps)
-install(FILES "hicolor/512x512/apps/geary.png" DESTINATION share/icons/hicolor/512x512/apps)
+install(FILES "hicolor/512x512/apps/org.gnome.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/symbolic/apps/org.gnome.Geary-symbolic.svg" DESTINATION share/icons/hicolor/symbolic/apps)
 
 # Optional: update icon cache at install time.
 if (ICON_UPDATE)

org.gnome.Geary.json

@@ -5,8 +5,6 @@
     "runtime-version": "master",
     "sdk": "org.gnome.Sdk",
     "command": "geary",
-    "rename-icon": "geary",
-    "copy-icon": true,
 
     /* Nightly build args, remove these when creating a new stable branch */
     "tags": ["nightly"],
@@ -105,7 +103,7 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://git.gnome.org/browse/geary",
+                    "url": "/home/mjg/Projects/GNOME/geary",
                     "branch": "master"
                 }
             ]

src/client/application/geary-application.vala

@@ -187,8 +187,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);
     }
     
@@ -413,7 +417,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,

src/client/application/geary-controller.vala

@@ -174,9 +174,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();
 
         // Listen for attempts to close the application.

src/client/notification/libnotify.vala

@@ -158,9 +158,9 @@ 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", "geary");
+        notification.set_hint_string("desktop-entry", "org.gnome.Geary");
         if (caps.find_custom("actions", GLib.strcmp) != null)
             notification.add_action("default", _("Open"), on_default_action);
         

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>