diff --git a/resources/manager_window.ui b/resources/manager_window.ui index 35aed8459fdc34d91e06a598771eba1f05a5f5c1..0e02b519cb4b1fd0f85977433e77adeb0facaec8 100644 --- a/resources/manager_window.ui +++ b/resources/manager_window.ui @@ -669,7 +669,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">18</property> - <property name="orientation">vertical</property> <property name="spacing">18</property> <child> <object class="GtkBox" id="properties_box2"> @@ -745,6 +744,7 @@ <object class="GtkButtonBox" id="details_buttonbox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <property name="layout_style">start</property> <child> @@ -793,6 +793,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> diff --git a/src/user_daemon.vala b/src/user_daemon.vala index 70e0ee18f6e550fd0573b1fe1ca6452aa23d6b22..5a670cf63e5fd95223b84ebc6d0af59ac3d2de67 100644 --- a/src/user_daemon.vala +++ b/src/user_daemon.vala @@ -504,36 +504,6 @@ namespace Pamac { syncdbs.next (); } result.join (syncpkgs.diff (result, (Alpm.List.CompareFunc) alpm_pkg_compare_name)); - // search in Appstream - Alpm.List<unowned Alpm.Package> appstream_results = null; - app_store.get_apps ().foreach ((app) => { - var iter = HashTableIter<string,string> (app.get_names ()); - unowned string name; - while (iter.next (null, out name)) { - if (search_string in name) { - unowned Alpm.Package? alpm_pkg = alpm_handle.localdb.get_pkg (app.get_pkgname_default ()); - if (alpm_pkg == null) { - alpm_pkg = get_syncpkg (app.get_pkgname_default ()); - } - if (alpm_pkg != null) { - appstream_results.add (alpm_pkg); - } - } - } - iter = HashTableIter<string,string> (app.get_descriptions ()); - unowned string desc; - while (iter.next (null, out desc)) { - if (search_string in desc) { - unowned Alpm.Package? alpm_pkg = alpm_handle.localdb.get_pkg (app.get_pkgname_default ()); - if (alpm_pkg == null) { - alpm_pkg = get_syncpkg (app.get_pkgname_default ()); - } - if (alpm_pkg != null) { - appstream_results.add (alpm_pkg); - } - } - } - }); // use custom sort function global_search_string = search_string; result.sort (result.length, (Alpm.List.CompareFunc) alpm_pkg_sort_search_by_relevance);