cromer/pamac-classic
2
0
Fork 3
Code Issues 2 Pull Requests 1 Releases 13 Wiki Activity

fix displaying empty details page

Browse Source
This commit is contained in:
guinux 2016-05-01 10:19:35 +02:00
parent e7bc6266d2
commit c650791851
1 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/manager_window.vala
View File

@ -796,35 +796,48 @@ namespace Pamac {
var treemodel = treeview.get_model (); var treemodel = treeview.get_model ();
Gtk.TreeIter iter; Gtk.TreeIter iter;
treemodel.get_iter (out iter, path); treemodel.get_iter (out iter, path);
string val; string depstring;
treemodel.get (iter, 1, out val); treemodel.get (iter, 1, out depstring);
string pkgname = val.split (":", 2)[0].replace (" [" + dgettext (null, "Installed") + "]", ""); // if depstring contains a version restriction search a satisfier directly
// just search for the name first to search for AUR after if (">" in depstring || "=" in depstring || "<" in depstring) {
AlpmPackage pkg = transaction.get_installed_pkg (pkgname); var pkg = transaction.find_installed_satisfier (depstring);
if (pkg.name == "") { if (pkg.name != "") {
pkg = transaction.get_sync_pkg (pkgname); display_package_properties (pkg.name);
} } else {
if (pkg.name == "") { pkg = transaction.find_sync_satisfier (depstring);
this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH)); if (pkg.name != "") {
while (Gtk.events_pending ()) { display_package_properties (pkg.name);
Gtk.main_iteration ();
}
transaction.get_aur_details.begin (pkgname, (obj, res) => {
this.get_window ().set_cursor (null);
if (transaction.get_aur_details.end (res).name != "") {
display_aur_properties (pkgname);
} else {
pkg = transaction.find_installed_satisfier (pkgname);
if (pkg.name == "") {
pkg = transaction.find_sync_satisfier (pkgname);
}
if (pkg.name != "") {
display_package_properties (pkgname);
}
} }
}); }
} else { } else {
display_package_properties (pkgname); string pkgname = depstring.split (":", 2)[0].replace (" [" + dgettext (null, "Installed") + "]", "");
// just search for the name first to search for AUR after
if (transaction.get_installed_pkg (pkgname).name != "") {
display_package_properties (pkgname);
} else if (transaction.get_sync_pkg (pkgname).name != "") {
display_package_properties (pkgname);
} else {
this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH));
while (Gtk.events_pending ()) {
Gtk.main_iteration ();
}
transaction.get_aur_details.begin (pkgname, (obj, res) => {
this.get_window ().set_cursor (null);
if (transaction.get_aur_details.end (res).name != "") {
display_aur_properties (pkgname);
} else {
var pkg = transaction.find_installed_satisfier (pkgname);
if (pkg.name != "") {
display_package_properties (pkg.name);
} else {
pkg = transaction.find_sync_satisfier (pkgname);
if (pkg.name != "") {
display_package_properties (pkg.name);
}
}
}
});
}
} }
} }
} }