Merge lp:~donadigo/appcenter/fix-package-link-show into lp:~elementary-apps/appcenter/appcenter

[Adam Bieńkowski]

* Fix link handling so that it shows the package even if the window is already shown

This branch fixes wrong position of the link handling, which is causing that the package will not be shown when the window is already opened.

This also simplifies the foreach loop to use "values" property instead of "entries".

=== modified file 'src/Application.vala'
--- src/Application.vala	2016-12-27 23:45:51 +0000
+++ src/Application.vala	2016-12-28 16:32:57 +0000
@@ -115,15 +115,6 @@
                 main_window = null;
             });
 
-            if (link != null) {
-                var package = client.get_package_for_id (link);
-                if (package != null) {
-                    main_window.show_package (package);
-                } else {
-                    warning (_("Specified link '%s' could not be found, going back to the main panel").printf (link));
-                }
-            }
-
             add_window (main_window);
             main_window.show_all ();
             if (show_updates) {
@@ -131,6 +122,15 @@
             }
         }
 
+        if (link != null) {
+            var package = client.get_package_for_id (link);
+            if (package != null) {
+                main_window.show_package (package);
+            } else {
+                warning (_("Specified link '%s' could not be found, going back to the main panel").printf (link));
+            }
+        }
+
         main_window.present ();
     }
 

=== modified file 'src/Core/Client.vala'
--- src/Core/Client.vala	2016-12-27 23:45:51 +0000
+++ src/Core/Client.vala	2016-12-28 16:32:57 +0000
@@ -467,8 +467,7 @@
     }
 
     public AppCenterCore.Package? get_package_for_id (string id) {
-        foreach (var entry in package_list.entries) {
-            var package = entry.value;
+        foreach (var package in package_list.values) {
             if (package.component.id == id) {
                 return package;
             }