Author: rpmcruz Date: Fri Apr 1 01:12:02 2011 New Revision: 63689 URL: http://svn.opensuse.org/viewcvs/yast?rev=63689&view=rev Log: Sync with trunk: fix crash (bnc#677007) Modified: branches/SuSE-Linux-11_4-Branch/gtk/VERSION branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes branches/SuSE-Linux-11_4-Branch/gtk/src/YGTreeView.cc Modified: branches/SuSE-Linux-11_4-Branch/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/VERSION?rev=63689&r1=63688&r2=63689&view=diff ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/VERSION (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/VERSION Fri Apr 1 01:12:02 2011 @@ -1 +1 @@ -2.21.92 +2.21.93 Modified: branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake?rev=63689&r1=63688&r2=63689&view=diff ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/VERSION.cmake Fri Apr 1 01:12:02 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "92") +SET(VERSION_PATCH "93") Modified: branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes?rev=63689&r1=63688&r2=63689&view=diff ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/package/yast2-gtk.changes Fri Apr 1 01:12:02 2011 @@ -1,3 +1,11 @@ +Fri Apr 01 00:09:00 WET 2011 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.93 +- backport trunk fixes: +- firewall tool crash fix (bnc#677007). +- refer to LibreOffice rather than OpenOffice.org in help text +(bnc#675486). + ------------------------------------------------------------------- Fri Feb 11 15:05:00 WET 2011 - rpmcruz@alunos.dcc.fc.up.pt Modified: branches/SuSE-Linux-11_4-Branch/gtk/src/YGTreeView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/gtk/src/YGTreeView.cc?rev=63689&r1=63688&r2=63689&view=diff ============================================================================== --- branches/SuSE-Linux-11_4-Branch/gtk/src/YGTreeView.cc (original) +++ branches/SuSE-Linux-11_4-Branch/gtk/src/YGTreeView.cc Fri Apr 1 01:12:02 2011 @@ -388,6 +388,7 @@ void setCell (GtkTreeIter *iter, int column, const YTableCell *cell) { + if (!cell) return; std::string label (cell->label()); if (label == "X") label = YUI::app()->glyph (YUIGlyph_CheckMark); @@ -428,8 +429,10 @@ if (item) { GtkTreeIter iter; addRow (item, &iter); - for (int i = 0; i < columns(); i++) - setCell (&iter, i, item->cell(i)); + int i = 0; + for (YTableCellIterator it = item->cellsBegin(); + it != item->cellsEnd(); it++) + setCell (&iter, i++, *it); if (item->selected()) focusItem (item, true); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org