Author: michael_meeks
Date: Mon Jul 23 14:35:44 2007
New Revision: 39596
URL: http://svn.opensuse.org/viewcvs/yast?rev=39596&view=rev
Log:
2007-07-23 Michael Meeks
* src/YGPackageSelector.cc
* (compat_gtk_tree_model_filter_convert_child_iter_to_iter):
back-compat method for older gtk+s (SLED10).
* configure.in: autodetect pre ZYPP 3 version, and adapt
accordingly.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/configure.in.in
trunk/gtk/src/YGPackageSelector.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=39596&r1=39595&r2=39596&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Mon Jul 23 14:35:44 2007
@@ -1,5 +1,11 @@
2007-07-23 Michael Meeks
+ * src/YGPackageSelector.cc (compat_gtk_tree_model_filter_convert_child_iter_to_iter):
+ back-compat method for older gtk+s (SLED10).
+
+ * configure.in: autodetect pre ZYPP 3 version, and adapt
+ accordingly.
+
* src/YGPackageSelector.cc (induceObjects): fix tribool related
crasher.
Modified: trunk/gtk/configure.in.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/configure.in.in?rev=39596&r1=39595&r2=39596&view=diff
==============================================================================
--- trunk/gtk/configure.in.in (original)
+++ trunk/gtk/configure.in.in Mon Jul 23 14:35:44 2007
@@ -36,6 +36,14 @@
AC_MSG_ERROR(libzypp-devel not installed.)
fi
+AC_MSG_CHECKING([for zypp 3])
+if test -f /usr/include/zypp/SourceManager.h; then
+ AC_DEFINE(PRE_ZYPP_3, 1, [defined if using an older SL10.1 era zypp])
+ AC_MSG_RESULT([pre 3])
+else
+ AC_MSG_RESULT([found])
+fi
+
PKG_CHECK_MODULES( ZYPP, libzypp )
AC_SUBST(ZYPP_LIBS)
Modified: trunk/gtk/src/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev=39596&r1=39595&r2=39596&view=diff
==============================================================================
--- trunk/gtk/src/YGPackageSelector.cc (original)
+++ trunk/gtk/src/YGPackageSelector.cc Mon Jul 23 14:35:44 2007
@@ -20,8 +20,6 @@
#include "ygtkfindentry.h"
//#define DISABLE_PACKAGE_SELECTOR
-// TODO: check zypp version
-//#define PRE_ZYPP_3
#ifndef DISABLE_PACKAGE_SELECTOR
#include
@@ -1917,6 +1915,38 @@
return false;
}
+ // For SLED10 / older gtk+'s ...
+ static bool compat_gtk_tree_model_filter_convert_child_iter_to_iter (GtkTreeModelFilter *filter,
+ GtkTreeIter *filter_iter,
+ GtkTreeIter *child_iter)
+ {
+#if GTK_CHECK_VERSION(2,10,0)
+ return gtk_tree_model_filter_convert_child_iter_to_iter (filter, filter_iter, child_iter);
+#else // cut/paste from gtk+ HEAD...
+ gboolean ret;
+ GtkTreePath *child_path, *path;
+
+ memset (filter_iter, 0, sizeof (GtkTreeIter));
+
+ GtkTreeModel *child_model;
+ g_object_get (G_OBJECT (filter), "child-model", &child_model, NULL);
+ child_path = gtk_tree_model_get_path (child_model, child_iter);
+ g_return_val_if_fail (child_path != NULL, FALSE);
+
+ path = gtk_tree_model_filter_convert_child_path_to_path (filter,
+ child_path);
+ gtk_tree_path_free (child_path);
+
+ if (!path)
+ return FALSE;
+
+ ret = gtk_tree_model_get_iter (GTK_TREE_MODEL (filter), filter_iter, path);
+ gtk_tree_path_free (path);
+
+ return ret;
+#endif
+ }
+
static bool sync_tree_views_scroll (GtkTreeView *current_view, GtkTreeView *other_view,
GtkTreePath *current_path, bool select_it)
{
@@ -1940,7 +1970,7 @@
gtk_tree_model_get_iter (base_model, &iter, _path);
gtk_tree_path_free (_path);
- while (!gtk_tree_model_filter_convert_child_iter_to_iter (
+ while (!compat_gtk_tree_model_filter_convert_child_iter_to_iter (
GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (other_view)),
&other_iter, &iter))
{
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
