Author: rpmcruz
Date: Tue Jun 8 18:35:26 2010
New Revision: 62096
URL: http://svn.opensuse.org/viewcvs/yast?rev=62096&view=rev
Log:
* src/pkg/ygtkpkgfilterview.cc: honor run solver
dialog's cancel button, on switch repository.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/pkg/ygtkpkgfilterview.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62096&r1=62095&r2=62096&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Tue Jun 8 18:35:26 2010
@@ -1,5 +1,10 @@
2010-06-07 Ricardo Cruz
+ * src/pkg/ygtkpkgfilterview.cc: honor run solver
+ dialog's cancel button, on switch repository.
+
+2010-06-07 Ricardo Cruz
+
* src/pkg/ygtkpkgfilterview.cc: bug fix: run solver on
switch repository. Reported by Atri Bhattacharya.
Modified: trunk/gtk/src/pkg/ygtkpkgfilterview.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgfilterview.cc?rev=62096&r1=62095&r2=62096&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkgfilterview.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkgfilterview.cc Tue Jun 8 18:35:26 2010
@@ -443,16 +443,22 @@
}
}
-static void switch_clicked_cb (GtkButton *button, YGtkPkgRepositoryModel *pThis)
+static void switch_repo_status (Ypp::Repository *repo)
{
- Ypp::Repository *repo = pThis->impl->selected;
ZyppRepository zrepo = repo->zyppRepo();
if (zypp::getZYpp()->resolver()->upgradingRepo (zrepo))
zypp::getZYpp()->resolver()->removeUpgradeRepo (zrepo);
else
zypp::getZYpp()->resolver()->addUpgradeRepo (zrepo);
+}
+
+static void switch_clicked_cb (GtkButton *button, YGtkPkgRepositoryModel *pThis)
+{
+ Ypp::Repository *repo = pThis->impl->selected;
+ switch_repo_status (repo);
+ if (!Ypp::runSolver()) // on solver cancel -- switch back
+ switch_repo_status (repo);
sync_toolbox_buttons (repo, gtk_widget_get_parent (GTK_WIDGET (button)));
- Ypp::runSolver();
}
GtkWidget *YGtkPkgRepositoryModel::createToolboxRow (int row)
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
