Author: rpmcruz
Date: Wed Oct 8 03:03:59 2008
New Revision: 51945
URL: http://svn.opensuse.org/viewcvs/yast?rev=51945&view=rev
Log:
* src/yzyppwrapper.cc: fixed libzypp deprecated call.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/configure.in.in
trunk/gtk/src/ygtksteps.c
trunk/gtk/src/yzyppwrapper.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=51945&r1=51944&r2=51945&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Wed Oct 8 03:03:59 2008
@@ -18,6 +18,8 @@
* src/ygtksteps.c: bug fix 432705: first work: use a GtkVBox and labels.
+ * src/yzyppwrapper.cc: fixed libzypp deprecated call.
+
2008-10-06 Ricardo Cruz
* src/ygtkwizard.h/.c: collapse all button functions and accept button
Modified: trunk/gtk/configure.in.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/configure.in.in?rev=51945&r1=51944&r2=51945&view=diff
==============================================================================
--- trunk/gtk/configure.in.in (original)
+++ trunk/gtk/configure.in.in Wed Oct 8 03:03:59 2008
@@ -52,6 +52,9 @@
PKG_CHECK_MODULES( ZYPP, libzypp )
AC_SUBST(ZYPP_LIBS)
+verstxt=`pkg-config --modversion libzypp`
+zypp_vers=`echo "$verstxt" | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+AC_DEFINE_UNQUOTED(ZYPP_VERSION, $zypp_vers, [libzypp version for compile conditionals])
verstxt=`pkg-config --modversion yast2-libyui`
yast_vers=`echo "$verstxt" | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
Modified: trunk/gtk/src/ygtksteps.c
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtksteps.c?rev=51945&r1=51944&r2=51945&view=diff
==============================================================================
--- trunk/gtk/src/ygtksteps.c (original)
+++ trunk/gtk/src/ygtksteps.c Wed Oct 8 03:03:59 2008
@@ -31,7 +31,6 @@
static void ygtk_steps_destroy (GtkObject *object)
{
YGtkSteps *steps = YGTK_STEPS (object);
-
if (steps->current_mark_timeout_id) {
g_source_remove (steps->current_mark_timeout_id);
steps->current_mark_timeout_id = 0;
@@ -42,8 +41,6 @@
if (steps->current_mark_layout)
g_object_unref (steps->current_mark_layout);
steps->current_mark_layout = NULL;
-
- ygtk_steps_clear (steps);
GTK_OBJECT_CLASS (ygtk_steps_parent_class)->destroy (object);
}
@@ -52,6 +49,8 @@
gboolean bold = steps->current_step == step;
GList *children = gtk_container_get_children (GTK_CONTAINER (steps));
GtkWidget *label = (GtkWidget *) g_list_nth_data (children, step);
+ if (g_object_get_data (G_OBJECT (label), "header"))
+ return;
if (bold) {
PangoAttrList *attrbs = pango_attr_list_new();
pango_attr_list_insert (attrbs, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
@@ -73,9 +72,11 @@
int n = 0;
for (i = children; i; i = i->next, n++) {
if (n <= steps->current_step) {
+ GtkWidget *label = i->data;
+ if (g_object_get_data (G_OBJECT (label), "header"))
+ continue;
PangoLayout *mark = (n == steps->current_step) ?
steps->current_mark_layout : steps->check_mark_layout;
- GtkWidget *label = i->data;
int x = label->allocation.x, y = label->allocation.y;
x += 4;
if (n == steps->current_step) {
@@ -111,8 +112,8 @@
void ygtk_steps_append_heading (YGtkSteps *steps, const gchar *heading)
{
-fprintf (stderr, "add header: %s\n", heading);
GtkWidget *label = gtk_label_new (heading);
+ g_object_set_data (G_OBJECT (label), "header", GINT_TO_POINTER (1));
gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
PangoAttrList *attrbs = pango_attr_list_new();
Modified: trunk/gtk/src/yzyppwrapper.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=51945&r1=51944&r2=51945&view=diff
==============================================================================
--- trunk/gtk/src/yzyppwrapper.cc (original)
+++ trunk/gtk/src/yzyppwrapper.cc Wed Oct 8 03:03:59 2008
@@ -430,7 +430,11 @@
text += br + "<b>" + _("Website:") + "</b> " + url + "</a>";
if (!license.empty())
text += br + "<b>" + _("License:") + "</b> " + license;
+#if ZYPP_VERSION >= 50130050
+ text += br + "<b>" + _("Size:") + "</b> " + object->installSize().asString();
+#else
text += br + "<b>" + _("Size:") + "</b> " + object->installsize().asString();
+#endif
break;
}
case Ypp::Package::PATCH_TYPE:
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
