aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gslapt.glade28
-rw-r--r--src/callbacks.c245
-rw-r--r--src/interface.c156
3 files changed, 223 insertions, 206 deletions
diff --git a/gslapt.glade b/gslapt.glade
index 280ed36..d35466a 100644
--- a/gslapt.glade
+++ b/gslapt.glade
@@ -834,7 +834,7 @@
<accelerator key="y" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1577">
+ <widget class="GtkImage" id="image1601">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -857,7 +857,7 @@
<accelerator key="a" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1578">
+ <widget class="GtkImage" id="image1602">
<property name="visible">True</property>
<property name="stock">gtk-go-up</property>
<property name="icon_size">1</property>
@@ -880,7 +880,7 @@
<accelerator key="Return" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1579">
+ <widget class="GtkImage" id="image1603">
<property name="visible">True</property>
<property name="stock">gtk-apply</property>
<property name="icon_size">1</property>
@@ -926,12 +926,12 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Unmark All</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="unmark_all_activate" last_modification_time="Fri, 05 Aug 2005 16:42:40 GMT"/>
<signal name="activate" handler="unmark_all_activate" last_modification_time="Fri, 05 Aug 2005 16:40:24 GMT"/>
+ <signal name="activate" handler="unmark_all_activate" last_modification_time="Fri, 05 Aug 2005 16:42:40 GMT"/>
<accelerator key="z" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1580">
+ <widget class="GtkImage" id="image1604">
<property name="visible">True</property>
<property name="stock">gtk-undo</property>
<property name="icon_size">1</property>
@@ -959,7 +959,7 @@
<accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1581">
+ <widget class="GtkImage" id="image1605">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -1058,7 +1058,7 @@
<accelerator key="n" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1582">
+ <widget class="GtkImage" id="image1606">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_available.png</property>
<property name="xalign">0.5</property>
@@ -1079,7 +1079,7 @@
<accelerator key="i" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1583">
+ <widget class="GtkImage" id="image1607">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_install.png</property>
<property name="xalign">0.5</property>
@@ -1100,7 +1100,7 @@
<accelerator key="e" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1584">
+ <widget class="GtkImage" id="image1608">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_reinstall.png</property>
<property name="xalign">0.5</property>
@@ -1121,7 +1121,7 @@
<accelerator key="u" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1585">
+ <widget class="GtkImage" id="image1609">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_upgrade.png</property>
<property name="xalign">0.5</property>
@@ -1142,7 +1142,7 @@
<accelerator key="d" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1586">
+ <widget class="GtkImage" id="image1610">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_downgrade.png</property>
<property name="xalign">0.5</property>
@@ -1163,7 +1163,7 @@
<accelerator key="r" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1587">
+ <widget class="GtkImage" id="image1611">
<property name="visible">True</property>
<property name="pixbuf">pkg_action_remove.png</property>
<property name="xalign">0.5</property>
@@ -1196,7 +1196,7 @@
<signal name="activate" handler="open_icon_legend" last_modification_time="Wed, 01 Jun 2005 03:20:34 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1588">
+ <widget class="GtkImage" id="image1612">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</property>
<property name="icon_size">1</property>
@@ -1217,7 +1217,7 @@
<signal name="activate" handler="open_about" last_modification_time="Sat, 05 Feb 2005 20:48:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image1589">
+ <widget class="GtkImage" id="image1613">
<property name="visible">True</property>
<property name="stock">gtk-about</property>
<property name="icon_size">1</property>
diff --git a/src/callbacks.c b/src/callbacks.c
index b4a9165..69854c9 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -76,6 +76,17 @@ static void exclude_dep_error_callback (GtkObject *object, gpointer user_data);
static void install_dep_error_callback (GtkObject *object, gpointer user_data);
static void view_installed_or_available_packages (gboolean show_installed, gboolean show_available);
+static int set_iter_for_install(GtkTreeModel *model, GtkTreeIter *iter,
+ slapt_pkg_info_t *pkg);
+static int set_iter_for_reinstall(GtkTreeModel *model, GtkTreeIter *iter,
+ slapt_pkg_info_t *pkg);
+static int set_iter_for_downgrade(GtkTreeModel *model, GtkTreeIter *iter,
+ slapt_pkg_info_t *pkg);
+static int set_iter_for_upgrade(GtkTreeModel *model, GtkTreeIter *iter,
+ slapt_pkg_info_t *pkg);
+static int set_iter_for_remove(GtkTreeModel *model, GtkTreeIter *iter,
+ slapt_pkg_info_t *pkg);
+
void on_gslapt_destroy (GtkObject *object, gpointer user_data)
{
@@ -262,6 +273,7 @@ void add_pkg_for_install (GtkWidget *gslapt, gpointer user_data)
gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(filter_model),&actual_iter,&filter_iter);
model = GTK_TREE_MODEL(gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(filter_model)));
+ /* a=installed,i=install,r=remove,u=upgrade,z=available */
/* if it is not already installed, install it */
if ( installed_pkg == NULL ) {
@@ -273,23 +285,15 @@ void add_pkg_for_install (GtkWidget *gslapt, gpointer user_data)
gchar *status = NULL;
slapt_add_install_to_transaction(trans,pkg);
- status = g_strdup_printf("i%s",pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_install.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,status,-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,TRUE,-1);
+ set_iter_for_install(model, &actual_iter, pkg);
set_execute_active();
- g_free(status);
/* if there is a conflict, we schedule the conflict for removal */
if ( (conflicted_pkg = slapt_is_conflicted(trans,all,installed,pkg)) != NULL ) {
slapt_add_remove_to_transaction(trans,conflicted_pkg);
set_execute_active();
if (set_iter_to_pkg(model,&actual_iter,conflicted_pkg)) {
- gchar *rstatus = g_strdup_printf("r%s",conflicted_pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_remove.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,rstatus,-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,TRUE,-1);
- g_free(rstatus);
+ set_iter_for_remove(model, &actual_iter, conflicted_pkg);
}
}
@@ -316,60 +320,30 @@ void add_pkg_for_install (GtkWidget *gslapt, gpointer user_data)
slapt_add_remove_to_transaction(trans,conflicted_pkg);
set_execute_active();
if (set_iter_to_pkg(model,&actual_iter,conflicted_pkg)) {
- gchar *rstatus = g_strdup_printf("r%s",conflicted_pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_remove.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,rstatus,-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,TRUE,-1);
- g_free(rstatus);
+ set_iter_for_remove(model, &actual_iter, conflicted_pkg);
}
}else{
slapt_add_upgrade_to_transaction(trans,installed_pkg,pkg);
if (global_config->re_install == TRUE) {
if (ver_cmp == 0) {
- gchar *status = g_strdup_printf("u%s",pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_reinstall.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,TRUE,-1);
- g_free(status);
+ set_iter_for_reinstall(model,&actual_iter,pkg);
} else {
- gchar *status = g_strdup_printf("u%s",pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_downgrade.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,TRUE,-1);
- g_free(status);
+ set_iter_for_downgrade(model,&actual_iter,pkg);
if (set_iter_to_pkg(model,&actual_iter,installed_pkg)) {
- gchar *ustatus = g_strdup_printf("u%s",installed_pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_downgrade.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,ustatus,-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,TRUE,-1);
- g_free(ustatus);
+ set_iter_for_downgrade(model,&actual_iter,installed_pkg);
}
}
} else {
slapt_pkg_info_t *inst_avail = slapt_get_exact_pkg(all,installed_pkg->name,installed_pkg->version);
- gchar *status = g_strdup_printf("u%s",pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_upgrade.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,status,-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,TRUE,-1);
- g_free(status);
+ set_iter_for_upgrade(model, &actual_iter, pkg);
if ( pkg != NULL && set_iter_to_pkg(model,&actual_iter,pkg)) {
- gchar *ustatus = g_strdup_printf("u%s",pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_upgrade.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,ustatus,-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,TRUE,-1);
- g_free(ustatus);
+ set_iter_for_upgrade(model, &actual_iter, pkg);
}
if (installed_pkg != NULL && set_iter_to_pkg(model,&actual_iter,installed_pkg)) {
- gchar *ustatus = g_strdup_printf("u%s",installed_pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_upgrade.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,ustatus,-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,TRUE,-1);
- g_free(ustatus);
+ set_iter_for_upgrade(model, &actual_iter, installed_pkg);
}
if (inst_avail != NULL && set_iter_to_pkg(model,&actual_iter,inst_avail)) {
- gchar *ustatus = g_strdup_printf("u%s",inst_avail->name);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_upgrade.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,ustatus,-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,TRUE,-1);
- g_free(ustatus);
+ set_iter_for_upgrade(model, &actual_iter, inst_avail);
}
}
set_execute_active();
@@ -425,21 +399,13 @@ void add_pkg_for_removal (GtkWidget *gslapt, gpointer user_data)
deps = slapt_is_required_by(global_config,installed,pkg);
slapt_add_remove_to_transaction(trans,pkg);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_remove.png"),-1);
- status = g_strdup_printf("r%s",pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,status,-1);
- g_free(status);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,TRUE,-1);
+ set_iter_for_remove(model, &actual_iter, pkg);
set_execute_active();
for (c = 0; c < deps->pkg_count;c++) {
slapt_add_remove_to_transaction(trans,deps->pkgs[c]);
if (set_iter_to_pkg(model,&actual_iter,deps->pkgs[c])) {
- gchar *status = g_strdup_printf("u%s",deps->pkgs[c]->name);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_remove.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,status,-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,MARKED_COLUMN,TRUE,-1);
- g_free(status);
+ set_iter_for_remove(model, &actual_iter, deps->pkgs[c]);
}
}
@@ -638,10 +604,10 @@ void build_searched_treeviewlist (GtkWidget *treeview, gchar *pattern)
filter_model = GTK_TREE_MODEL_FILTER(gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(package_model)));
base_model = GTK_TREE_MODEL(gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(filter_model)));
- view_list_all = gtk_check_menu_item_get_active(GTK_RADIO_MENU_ITEM(lookup_widget(gslapt,"view_all_packages_menu")));
- view_list_available = gtk_check_menu_item_get_active(GTK_RADIO_MENU_ITEM(lookup_widget(gslapt,"view_available_packages_menu")));
- view_list_installed = gtk_check_menu_item_get_active(GTK_RADIO_MENU_ITEM(lookup_widget(gslapt,"view_installed_packages_menu")));
- view_list_marked = gtk_check_menu_item_get_active(GTK_RADIO_MENU_ITEM(lookup_widget(gslapt,"view_marked_packages_menu")));
+ view_list_all = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(lookup_widget(gslapt,"view_all_packages_menu")));
+ view_list_available = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(lookup_widget(gslapt,"view_available_packages_menu")));
+ view_list_installed = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(lookup_widget(gslapt,"view_installed_packages_menu")));
+ view_list_marked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(lookup_widget(gslapt,"view_marked_packages_menu")));
a_matches = slapt_search_pkg_list(all,pattern);
i_matches = slapt_search_pkg_list(installed,pattern);
@@ -1794,11 +1760,7 @@ static void mark_upgrade_packages (void)
) {
slapt_add_upgrade_to_transaction(trans,installed->pkgs[i],update_pkg);
if (set_iter_to_pkg(base_model,&iter,update_pkg)) {
- gchar *ustatus = g_strdup_printf("u%s",update_pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(base_model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_upgrade.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(base_model),&iter,STATUS_COLUMN,ustatus,-1);
- gtk_list_store_set(GTK_LIST_STORE(base_model),&iter,MARKED_COLUMN,TRUE,-1);
- g_free(ustatus);
+ set_iter_for_upgrade(base_model, &iter, update_pkg);
}
++mark_count;
}else{
@@ -2612,10 +2574,7 @@ static int ladd_deps_to_trans (slapt_transaction_t *tran, struct slapt_pkg_list
if ( conflicted_pkg != NULL ) {
slapt_add_remove_to_transaction(tran,conflicted_pkg);
if (set_iter_to_pkg(GTK_TREE_MODEL(base_model),&iter,conflicted_pkg)) {
- gchar *status = g_strdup_printf("r%s",conflicted_pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(base_model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_remove.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(base_model),&iter,STATUS_COLUMN,status,-1);
- g_free(status);
+ set_iter_for_remove(base_model, &iter, conflicted_pkg);
}
}
@@ -2623,20 +2582,14 @@ static int ladd_deps_to_trans (slapt_transaction_t *tran, struct slapt_pkg_list
if ( dep_installed == NULL ) {
slapt_add_install_to_transaction(tran,deps->pkgs[c]);
if (set_iter_to_pkg(GTK_TREE_MODEL(base_model),&iter,deps->pkgs[c])) {
- gchar *status = g_strdup_printf("i%s",deps->pkgs[c]->name);
- gtk_list_store_set(GTK_LIST_STORE(base_model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_install.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(base_model),&iter,STATUS_COLUMN,status,-1);
- g_free(status);
+ set_iter_for_install(base_model, &iter, deps->pkgs[c]);
}
} else {
/* add only if its a valid upgrade */
if (slapt_cmp_pkgs(dep_installed,deps->pkgs[c]) < 0 ) {
slapt_add_upgrade_to_transaction(tran,dep_installed,deps->pkgs[c]);
if (set_iter_to_pkg(GTK_TREE_MODEL(base_model),&iter,deps->pkgs[c])) {
- gchar *status = g_strdup_printf("u%s",deps->pkgs[c]->name);
- gtk_list_store_set(GTK_LIST_STORE(base_model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_upgrade.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(base_model),&iter,STATUS_COLUMN,status,-1);
- g_free(status);
+ set_iter_for_upgrade(base_model, &iter, deps->pkgs[c]);
}
}
}
@@ -2758,13 +2711,21 @@ void build_treeview_columns (GtkWidget *treeview)
static int lsearch_upgrade_transaction (slapt_transaction_t *tran,slapt_pkg_info_t *pkg)
{
unsigned int i,found = 1, not_found = 0;
+
+ /*
+ lookup the package in the upgrade list, checking for the same name,version
+ or location (in the case of location, either the same location for upgrade
+ or installed)
+ */
for (i = 0; i < tran->upgrade_pkgs->pkg_count;i++) {
if (strcmp(pkg->name,tran->upgrade_pkgs->pkgs[i]->upgrade->name) == 0 &&
strcmp(pkg->version,tran->upgrade_pkgs->pkgs[i]->upgrade->version) == 0 &&
- strcmp(pkg->location,tran->upgrade_pkgs->pkgs[i]->upgrade->location) == 0) {
+ (strcmp(pkg->location,tran->upgrade_pkgs->pkgs[i]->upgrade->location) == 0) ||
+ (strcmp(pkg->location,tran->upgrade_pkgs->pkgs[i]->installed->location) == 0)) {
return found;
}
}
+
return not_found;
}
@@ -2953,26 +2914,24 @@ void unmark_all_activate (GtkMenuItem *menuitem, gpointer user_data)
static void reset_search_list (void)
{
- GtkTreeModelFilter *filter_model;
- GtkTreeModel *base_model;
- GtkTreeIter iter;
- gboolean valid;
- GtkTreeView *treeview;
- GtkTreeModelSort *package_model;
+ gboolean view_list_all = FALSE, view_list_installed = FALSE,
+ view_list_available = FALSE, view_list_marked = FALSE;
- treeview = GTK_TREE_VIEW(lookup_widget(gslapt,"pkg_listing_treeview"));
- package_model = GTK_TREE_MODEL_SORT(gtk_tree_view_get_model(treeview));
+ view_list_all = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(lookup_widget(gslapt,"view_all_packages_menu")));
+ view_list_available = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(lookup_widget(gslapt,"view_available_packages_menu")));
+ view_list_installed = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(lookup_widget(gslapt,"view_installed_packages_menu")));
+ view_list_marked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(lookup_widget(gslapt,"view_marked_packages_menu")));
- filter_model = GTK_TREE_MODEL_FILTER(gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(package_model)));
- base_model = GTK_TREE_MODEL(gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(filter_model)));
-
- valid = gtk_tree_model_get_iter_first(base_model,&iter);
- while (valid) {
- gtk_list_store_set(GTK_LIST_STORE(base_model),&iter,VISIBLE_COLUMN,TRUE,-1);
- valid = gtk_tree_model_iter_next(base_model,&iter);
+ if (view_list_all) {
+ view_all_packages(NULL,NULL);
+ } else if (view_list_installed) {
+ view_installed_packages(NULL,NULL);
+ } else if (view_list_available) {
+ view_available_packages(NULL,NULL);
+ } else if (view_list_marked) {
+ view_marked_packages(NULL,NULL);
}
- gtk_check_menu_item_set_active(GTK_RADIO_MENU_ITEM(lookup_widget(gslapt,"view_all_packages_menu")),TRUE);
}
GtkEntryCompletion *build_search_completions (void)
@@ -3193,31 +3152,23 @@ static void install_dep_error_callback (GtkObject *object, gpointer user_data)
set_iter_to_pkg(model,&iter,installed_pkg);
if (installed_pkg == NULL) {
- gchar *status = g_strdup_printf("i%s",pkg->name);
slapt_add_install_to_transaction(trans,pkg);
-
- gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_install.png"),-1);
- gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_COLUMN,status,-1);
- g_free(status);
-
+ set_iter_for_install(model, &iter, pkg);
set_execute_active();
} else {
- gchar *status = g_strdup_printf("u%s",pkg->name);
int ver_cmp = slapt_cmp_pkgs(installed_pkg,pkg);
slapt_add_upgrade_to_transaction(trans,installed_pkg,pkg);
if (ver_cmp == 0) {
- gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_reinstall.png"),-1);
+ set_iter_for_reinstall(model, &iter, pkg);
} else if (ver_cmp > 1) {
- gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_upgrade.png"),-1);
+ set_iter_for_upgrade(model, &iter, pkg);
} else if (ver_cmp < 1) {
- gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_downgrade.png"),-1);
+ set_iter_for_downgrade(model, &iter, pkg);
}
- gtk_list_store_set(GTK_LIST_STORE(model),&iter,STATUS_COLUMN,status,-1);
- g_free(status);
set_execute_active();
@@ -3231,11 +3182,27 @@ void view_all_packages (GtkMenuItem *menuitem, gpointer user_data)
{
gchar *pattern = (gchar *)gtk_entry_get_text(GTK_ENTRY(lookup_widget(gslapt,"search_entry")));
GtkTreeView *treeview = GTK_TREE_VIEW(lookup_widget(gslapt,"pkg_listing_treeview"));
+ GtkTreeModelFilter *filter_model;
+ GtkTreeModel *base_model;
+ GtkTreeIter iter;
+ gboolean valid;
+ GtkTreeModelSort *package_model;
if (pattern && strlen(pattern) > 0)
- build_searched_treeviewlist(treeview, pattern);
- else
- reset_search_list();
+ return build_searched_treeviewlist(GTK_WIDGET(treeview), pattern);
+
+ treeview = GTK_TREE_VIEW(lookup_widget(gslapt,"pkg_listing_treeview"));
+ package_model = GTK_TREE_MODEL_SORT(gtk_tree_view_get_model(treeview));
+
+ filter_model = GTK_TREE_MODEL_FILTER(gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(package_model)));
+ base_model = GTK_TREE_MODEL(gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(filter_model)));
+
+ valid = gtk_tree_model_get_iter_first(base_model,&iter);
+ while (valid) {
+ gtk_list_store_set(GTK_LIST_STORE(base_model),&iter,VISIBLE_COLUMN,TRUE,-1);
+ valid = gtk_tree_model_iter_next(base_model,&iter);
+ }
+
}
void view_available_packages (GtkMenuItem *menuitem, gpointer user_data)
@@ -3247,7 +3214,7 @@ void view_available_packages (GtkMenuItem *menuitem, gpointer user_data)
view_installed_or_available_packages(show_installed, show_available);
if (pattern && strlen(pattern) > 0)
- build_searched_treeviewlist(treeview, pattern);
+ build_searched_treeviewlist(GTK_WIDGET(treeview), pattern);
}
void view_installed_packages (GtkMenuItem *menuitem, gpointer user_data)
@@ -3259,7 +3226,7 @@ void view_installed_packages (GtkMenuItem *menuitem, gpointer user_data)
view_installed_or_available_packages(show_installed, show_available);
if (pattern && strlen(pattern) > 0)
- build_searched_treeviewlist(treeview, pattern);
+ build_searched_treeviewlist(GTK_WIDGET(treeview), pattern);
}
void view_installed_or_available_packages (gboolean show_installed, gboolean show_available)
@@ -3335,6 +3302,56 @@ void view_marked_packages (GtkMenuItem *menuitem, gpointer user_data)
}
if (pattern && strlen(pattern) > 0)
- build_searched_treeviewlist(treeview, pattern);
+ build_searched_treeviewlist(GTK_WIDGET(treeview), pattern);
+}
+
+static int set_iter_for_install(GtkTreeModel *model, GtkTreeIter *iter,
+ slapt_pkg_info_t *pkg)
+{
+ gchar *status = g_strdup_printf("i%s",pkg->name);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_install.png"),-1);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
+ g_free(status);
+}
+
+static int set_iter_for_reinstall(GtkTreeModel *model, GtkTreeIter *iter,
+ slapt_pkg_info_t *pkg)
+{
+ gchar *status = g_strdup_printf("u%s",pkg->name);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_reinstall.png"),-1);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
+ g_free(status);
+}
+
+static int set_iter_for_downgrade(GtkTreeModel *model, GtkTreeIter *iter,
+ slapt_pkg_info_t *pkg)
+{
+ gchar *status = g_strdup_printf("u%s",pkg->name);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_downgrade.png"),-1);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
+ g_free(status);
+}
+
+static int set_iter_for_upgrade(GtkTreeModel *model, GtkTreeIter *iter,
+ slapt_pkg_info_t *pkg)
+{
+ gchar *status = g_strdup_printf("u%s",pkg->name);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_upgrade.png"),-1);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
+ g_free(status);
+}
+
+static int set_iter_for_remove(GtkTreeModel *model, GtkTreeIter *iter,
+ slapt_pkg_info_t *pkg)
+{
+ gchar *status = g_strdup_printf("r%s",pkg->name);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_remove.png"),-1);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
+ g_free(status);
}
diff --git a/src/interface.c b/src/interface.c
index 2450079..12f355d 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -444,20 +444,20 @@ create_gslapt (void)
GtkWidget *actions2;
GtkWidget *actions2_menu;
GtkWidget *update1;
- GtkWidget *image1577;
+ GtkWidget *image1601;
GtkWidget *mark_all_upgrades2;
- GtkWidget *image1578;
+ GtkWidget *image1602;
GtkWidget *execute1;
- GtkWidget *image1579;
+ GtkWidget *image1603;
GtkWidget *separator2;
GtkWidget *quit;
GtkWidget *edit1;
GtkWidget *edit1_menu;
GtkWidget *unmark_all1;
- GtkWidget *image1580;
+ GtkWidget *image1604;
GtkWidget *separator1;
GtkWidget *preferences2;
- GtkWidget *image1581;
+ GtkWidget *image1605;
GtkWidget *view1;
GtkWidget *view1_menu;
GSList *view_all_packages_menu_group = NULL;
@@ -468,23 +468,23 @@ create_gslapt (void)
GtkWidget *package1;
GtkWidget *package1_menu;
GtkWidget *unmark1;
- GtkWidget *image1582;
+ GtkWidget *image1606;
GtkWidget *install1;
- GtkWidget *image1583;
+ GtkWidget *image1607;
GtkWidget *re_install1;
- GtkWidget *image1584;
+ GtkWidget *image1608;
GtkWidget *upgrade1;
- GtkWidget *image1585;
+ GtkWidget *image1609;
GtkWidget *downgrade1;
- GtkWidget *image1586;
+ GtkWidget *image1610;
GtkWidget *remove1;
- GtkWidget *image1587;
+ GtkWidget *image1611;
GtkWidget *help3;
GtkWidget *help3_menu;
GtkWidget *icon_legend1;
- GtkWidget *image1588;
+ GtkWidget *image1612;
GtkWidget *about3;
- GtkWidget *image1589;
+ GtkWidget *image1613;
GtkWidget *action_toolbar;
GtkIconSize tmp_toolbar_icon_size;
GtkWidget *tmp_image;
@@ -600,10 +600,10 @@ create_gslapt (void)
GDK_y, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1577 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1577, "image1577");
- gtk_widget_show (image1577);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (update1), image1577);
+ image1601 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1601, "image1601");
+ gtk_widget_show (image1601);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (update1), image1601);
mark_all_upgrades2 = gtk_image_menu_item_new_with_mnemonic (_("Mark All Upgrades"));
gtk_widget_set_name (mark_all_upgrades2, "mark_all_upgrades2");
@@ -614,10 +614,10 @@ create_gslapt (void)
GDK_a, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1578 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1578, "image1578");
- gtk_widget_show (image1578);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mark_all_upgrades2), image1578);
+ image1602 = gtk_image_new_from_stock ("gtk-go-up", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1602, "image1602");
+ gtk_widget_show (image1602);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mark_all_upgrades2), image1602);
execute1 = gtk_image_menu_item_new_with_mnemonic (_("Execute"));
gtk_widget_set_name (execute1, "execute1");
@@ -628,10 +628,10 @@ create_gslapt (void)
GDK_Return, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1579 = gtk_image_new_from_stock ("gtk-apply", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1579, "image1579");
- gtk_widget_show (image1579);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (execute1), image1579);
+ image1603 = gtk_image_new_from_stock ("gtk-apply", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1603, "image1603");
+ gtk_widget_show (image1603);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (execute1), image1603);
separator2 = gtk_separator_menu_item_new ();
gtk_widget_set_name (separator2, "separator2");
@@ -661,10 +661,10 @@ create_gslapt (void)
GDK_z, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1580 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1580, "image1580");
- gtk_widget_show (image1580);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (unmark_all1), image1580);
+ image1604 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1604, "image1604");
+ gtk_widget_show (image1604);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (unmark_all1), image1604);
separator1 = gtk_separator_menu_item_new ();
gtk_widget_set_name (separator1, "separator1");
@@ -680,10 +680,10 @@ create_gslapt (void)
GDK_p, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1581 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1581, "image1581");
- gtk_widget_show (image1581);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences2), image1581);
+ image1605 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1605, "image1605");
+ gtk_widget_show (image1605);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences2), image1605);
view1 = gtk_menu_item_new_with_mnemonic (_("_View"));
gtk_widget_set_name (view1, "view1");
@@ -753,10 +753,10 @@ create_gslapt (void)
GDK_n, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1582 = create_pixmap (gslapt, "pkg_action_available.png");
- gtk_widget_set_name (image1582, "image1582");
- gtk_widget_show (image1582);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (unmark1), image1582);
+ image1606 = create_pixmap (gslapt, "pkg_action_available.png");
+ gtk_widget_set_name (image1606, "image1606");
+ gtk_widget_show (image1606);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (unmark1), image1606);
install1 = gtk_image_menu_item_new_with_mnemonic (_("Install"));
gtk_widget_set_name (install1, "install1");
@@ -767,10 +767,10 @@ create_gslapt (void)
GDK_i, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1583 = create_pixmap (gslapt, "pkg_action_install.png");
- gtk_widget_set_name (image1583, "image1583");
- gtk_widget_show (image1583);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (install1), image1583);
+ image1607 = create_pixmap (gslapt, "pkg_action_install.png");
+ gtk_widget_set_name (image1607, "image1607");
+ gtk_widget_show (image1607);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (install1), image1607);
re_install1 = gtk_image_menu_item_new_with_mnemonic (_("Re-Install"));
gtk_widget_set_name (re_install1, "re_install1");
@@ -781,10 +781,10 @@ create_gslapt (void)
GDK_e, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1584 = create_pixmap (gslapt, "pkg_action_reinstall.png");
- gtk_widget_set_name (image1584, "image1584");
- gtk_widget_show (image1584);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (re_install1), image1584);
+ image1608 = create_pixmap (gslapt, "pkg_action_reinstall.png");
+ gtk_widget_set_name (image1608, "image1608");
+ gtk_widget_show (image1608);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (re_install1), image1608);
upgrade1 = gtk_image_menu_item_new_with_mnemonic (_("Upgrade"));
gtk_widget_set_name (upgrade1, "upgrade1");
@@ -795,10 +795,10 @@ create_gslapt (void)
GDK_u, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1585 = create_pixmap (gslapt, "pkg_action_upgrade.png");
- gtk_widget_set_name (image1585, "image1585");
- gtk_widget_show (image1585);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (upgrade1), image1585);
+ image1609 = create_pixmap (gslapt, "pkg_action_upgrade.png");
+ gtk_widget_set_name (image1609, "image1609");
+ gtk_widget_show (image1609);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (upgrade1), image1609);
downgrade1 = gtk_image_menu_item_new_with_mnemonic (_("Downgrade"));
gtk_widget_set_name (downgrade1, "downgrade1");
@@ -809,10 +809,10 @@ create_gslapt (void)
GDK_d, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1586 = create_pixmap (gslapt, "pkg_action_downgrade.png");
- gtk_widget_set_name (image1586, "image1586");
- gtk_widget_show (image1586);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (downgrade1), image1586);
+ image1610 = create_pixmap (gslapt, "pkg_action_downgrade.png");
+ gtk_widget_set_name (image1610, "image1610");
+ gtk_widget_show (image1610);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (downgrade1), image1610);
remove1 = gtk_image_menu_item_new_with_mnemonic (_("Remove"));
gtk_widget_set_name (remove1, "remove1");
@@ -823,10 +823,10 @@ create_gslapt (void)
GDK_r, (GdkModifierType) GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
- image1587 = create_pixmap (gslapt, "pkg_action_remove.png");
- gtk_widget_set_name (image1587, "image1587");
- gtk_widget_show (image1587);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image1587);
+ image1611 = create_pixmap (gslapt, "pkg_action_remove.png");
+ gtk_widget_set_name (image1611, "image1611");
+ gtk_widget_show (image1611);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (remove1), image1611);
help3 = gtk_menu_item_new_with_mnemonic (_("_Help"));
gtk_widget_set_name (help3, "help3");
@@ -842,20 +842,20 @@ create_gslapt (void)
gtk_widget_show (icon_legend1);
gtk_container_add (GTK_CONTAINER (help3_menu), icon_legend1);
- image1588 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1588, "image1588");
- gtk_widget_show (image1588);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (icon_legend1), image1588);
+ image1612 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1612, "image1612");
+ gtk_widget_show (image1612);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (icon_legend1), image1612);
about3 = gtk_image_menu_item_new_with_mnemonic (_("About"));
gtk_widget_set_name (about3, "about3");
gtk_widget_show (about3);
gtk_container_add (GTK_CONTAINER (help3_menu), about3);
- image1589 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
- gtk_widget_set_name (image1589, "image1589");
- gtk_widget_show (image1589);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about3), image1589);
+ image1613 = gtk_image_new_from_stock ("gtk-about", GTK_ICON_SIZE_MENU);
+ gtk_widget_set_name (image1613, "image1613");
+ gtk_widget_show (image1613);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (about3), image1613);
action_toolbar = gtk_toolbar_new ();
gtk_widget_set_name (action_toolbar, "action_toolbar");
@@ -1418,20 +1418,20 @@ create_gslapt (void)
GLADE_HOOKUP_OBJECT (gslapt, actions2, "actions2");
GLADE_HOOKUP_OBJECT (gslapt, actions2_menu, "actions2_menu");
GLADE_HOOKUP_OBJECT (gslapt, update1, "update1");
- GLADE_HOOKUP_OBJECT (gslapt, image1577, "image1577");
+ GLADE_HOOKUP_OBJECT (gslapt, image1601, "image1601");
GLADE_HOOKUP_OBJECT (gslapt, mark_all_upgrades2, "mark_all_upgrades2");
- GLADE_HOOKUP_OBJECT (gslapt, image1578, "image1578");
+ GLADE_HOOKUP_OBJECT (gslapt, image1602, "image1602");
GLADE_HOOKUP_OBJECT (gslapt, execute1, "execute1");
- GLADE_HOOKUP_OBJECT (gslapt, image1579, "image1579");
+ GLADE_HOOKUP_OBJECT (gslapt, image1603, "image1603");
GLADE_HOOKUP_OBJECT (gslapt, separator2, "separator2");
GLADE_HOOKUP_OBJECT (gslapt, quit, "quit");
GLADE_HOOKUP_OBJECT (gslapt, edit1, "edit1");
GLADE_HOOKUP_OBJECT (gslapt, edit1_menu, "edit1_menu");
GLADE_HOOKUP_OBJECT (gslapt, unmark_all1, "unmark_all1");
- GLADE_HOOKUP_OBJECT (gslapt, image1580, "image1580");
+ GLADE_HOOKUP_OBJECT (gslapt, image1604, "image1604");
GLADE_HOOKUP_OBJECT (gslapt, separator1, "separator1");
GLADE_HOOKUP_OBJECT (gslapt, preferences2, "preferences2");
- GLADE_HOOKUP_OBJECT (gslapt, image1581, "image1581");
+ GLADE_HOOKUP_OBJECT (gslapt, image1605, "image1605");
GLADE_HOOKUP_OBJECT (gslapt, view1, "view1");
GLADE_HOOKUP_OBJECT (gslapt, view1_menu, "view1_menu");
GLADE_HOOKUP_OBJECT (gslapt, view_all_packages_menu, "view_all_packages_menu");
@@ -1441,23 +1441,23 @@ create_gslapt (void)
GLADE_HOOKUP_OBJECT (gslapt, package1, "package1");
GLADE_HOOKUP_OBJECT (gslapt, package1_menu, "package1_menu");
GLADE_HOOKUP_OBJECT (gslapt, unmark1, "unmark1");
- GLADE_HOOKUP_OBJECT (gslapt, image1582, "image1582");
+ GLADE_HOOKUP_OBJECT (gslapt, image1606, "image1606");
GLADE_HOOKUP_OBJECT (gslapt, install1, "install1");
- GLADE_HOOKUP_OBJECT (gslapt, image1583, "image1583");
+ GLADE_HOOKUP_OBJECT (gslapt, image1607, "image1607");
GLADE_HOOKUP_OBJECT (gslapt, re_install1, "re_install1");
- GLADE_HOOKUP_OBJECT (gslapt, image1584, "image1584");
+ GLADE_HOOKUP_OBJECT (gslapt, image1608, "image1608");
GLADE_HOOKUP_OBJECT (gslapt, upgrade1, "upgrade1");
- GLADE_HOOKUP_OBJECT (gslapt, image1585, "image1585");
+ GLADE_HOOKUP_OBJECT (gslapt, image1609, "image1609");
GLADE_HOOKUP_OBJECT (gslapt, downgrade1, "downgrade1");
- GLADE_HOOKUP_OBJECT (gslapt, image1586, "image1586");
+ GLADE_HOOKUP_OBJECT (gslapt, image1610, "image1610");
GLADE_HOOKUP_OBJECT (gslapt, remove1, "remove1");
- GLADE_HOOKUP_OBJECT (gslapt, image1587, "image1587");
+ GLADE_HOOKUP_OBJECT (gslapt, image1611, "image1611");
GLADE_HOOKUP_OBJECT (gslapt, help3, "help3");
GLADE_HOOKUP_OBJECT (gslapt, help3_menu, "help3_menu");
GLADE_HOOKUP_OBJECT (gslapt, icon_legend1, "icon_legend1");
- GLADE_HOOKUP_OBJECT (gslapt, image1588, "image1588");
+ GLADE_HOOKUP_OBJECT (gslapt, image1612, "image1612");
GLADE_HOOKUP_OBJECT (gslapt, about3, "about3");
- GLADE_HOOKUP_OBJECT (gslapt, image1589, "image1589");
+ GLADE_HOOKUP_OBJECT (gslapt, image1613, "image1613");
GLADE_HOOKUP_OBJECT (gslapt, action_toolbar, "action_toolbar");
GLADE_HOOKUP_OBJECT (gslapt, action_bar_update_button, "action_bar_update_button");
GLADE_HOOKUP_OBJECT (gslapt, action_bar_upgrade_button, "action_bar_upgrade_button");