summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2008-12-15 02:33:10 +0000
committerJason Woodward2008-12-15 02:33:10 +0000
commit74c8e5bac2d88222fec4afccfe1e9a1e913a2342 (patch)
treefe60089cfcded9d0ceff1f9402444aa0db832e4e
parent92ee74a199322499f1aa69a85bc2679c2aad29f5 (diff)
downloadgslapt-74c8e5bac2d88222fec4afccfe1e9a1e913a2342.tar.gz
unmark the installed version of an upgrade when unmarking the upgrade
-rw-r--r--src/callbacks.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/callbacks.c b/src/callbacks.c
index c3f8952..e2db420 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -2550,14 +2550,13 @@ void unmark_package(GtkWidget *gslapt, gpointer user_data)
return;
}
+ if (slapt_get_exact_pkg(installed,pkg_name,pkg_version) != NULL)
+ is_installed = 1;
+
if (((pkg = slapt_get_pkg_by_details(all,pkg_name,pkg_version,pkg_location)) == NULL)) {
pkg = slapt_get_exact_pkg(installed,pkg_name,pkg_version);
- is_installed = 1;
- } else {
- if (slapt_get_exact_pkg(installed,pkg_name,pkg_version) != NULL) {
- is_installed = 1;
- }
}
+
if (pkg == NULL) {
fprintf(stderr,"Failed to find package: %s-%s@%s\n",pkg_name,pkg_version,pkg_location);
g_free(pkg_name);
@@ -2606,6 +2605,7 @@ void unmark_package(GtkWidget *gslapt, gpointer user_data)
GdkPixbuf *status_icon = create_pixbuf("pkg_action_installed.png");
gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,status_icon,-1);
gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,istatus,-1);
+ gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,FALSE,-1);
g_free(istatus);
gdk_pixbuf_unref(status_icon);
} else {