Hello community, here is the log from the commit of package yast2-gtk for openSUSE:Factory checked in at Wed Feb 2 01:57:18 CET 2011. -------- --- yast2-gtk/yast2-gtk.changes 2011-01-20 21:30:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-gtk/yast2-gtk.changes 2011-02-01 23:48:33.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Feb 01 22:43:00 WET 2011 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.90 +- printer crash fix: printer tool was misbehaving, somestimes +crashing, when selecting tree item. (Reported by Atri Bhattacharya.) + +------------------------------------------------------------------- +Fri Jan 28 18:03:00 WET 2011 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.89 +- sw_single bug fix: the versions box is showing the to-install +as marked for all versions, not merely the one who is actually +going to get installed. (Reported by Atri.) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-gtk-2.21.88.tar.bz2 New: ---- yast2-gtk-2.21.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-gtk.spec ++++++ --- /var/tmp/diff_new_pack.zkkgK4/_old 2011-02-02 01:56:31.000000000 +0100 +++ /var/tmp/diff_new_pack.zkkgK4/_new 2011-02-02 01:56:31.000000000 +0100 @@ -18,11 +18,11 @@ Name: yast2-gtk -Version: 2.21.88 +Version: 2.21.90 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-gtk-2.21.88.tar.bz2 +Source0: yast2-gtk-2.21.90.tar.bz2 Url: http://en.opensuse.org/YaST2-GTK Summary: YaST2 - GTK+ Graphical User Interface Group: System/YaST ++++++ yast2-gtk-2.21.88.tar.bz2 -> yast2-gtk-2.21.90.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.88/VERSION new/yast2-gtk-2.21.90/VERSION --- old/yast2-gtk-2.21.88/VERSION 2011-01-20 21:28:15.000000000 +0100 +++ new/yast2-gtk-2.21.90/VERSION 2011-02-02 00:03:13.000000000 +0100 @@ -1 +1 @@ -2.21.88 +2.21.90 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.88/VERSION.cmake new/yast2-gtk-2.21.90/VERSION.cmake --- old/yast2-gtk-2.21.88/VERSION.cmake 2011-01-20 21:28:15.000000000 +0100 +++ new/yast2-gtk-2.21.90/VERSION.cmake 2011-02-02 00:03:13.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "88") +SET(VERSION_PATCH "90") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.88/package/yast2-gtk.changes new/yast2-gtk-2.21.90/package/yast2-gtk.changes --- old/yast2-gtk-2.21.88/package/yast2-gtk.changes 2011-01-20 21:28:15.000000000 +0100 +++ new/yast2-gtk-2.21.90/package/yast2-gtk.changes 2011-02-02 00:03:13.000000000 +0100 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Tue Feb 01 22:43:00 WET 2011 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.90 +- printer crash fix: printer tool was misbehaving, somestimes +crashing, when selecting tree item. (Reported by Atri Bhattacharya.) + +------------------------------------------------------------------- +Fri Jan 28 18:03:00 WET 2011 - rpmcruz@alunos.dcc.fc.up.pt + +- 2.21.89 +- sw_single bug fix: the versions box is showing the to-install +as marked for all versions, not merely the one who is actually +going to get installed. (Reported by Atri.) + +------------------------------------------------------------------- Thu Jan 20 20:22:00 WET 2011 - rpmcruz@alunos.dcc.fc.up.pt - 2.21.88 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.88/package/yast2-gtk.spec new/yast2-gtk-2.21.90/package/yast2-gtk.spec --- old/yast2-gtk-2.21.88/package/yast2-gtk.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-gtk-2.21.90/package/yast2-gtk.spec 2011-02-02 00:03:13.000000000 +0100 @@ -0,0 +1,68 @@ +# +# spec file for package yast2-gtk (Version 2.21.89) +# +# norootforbuild;, + + +Name: yast2-gtk +Version: 2.21.89 +Release: 0 + + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: yast2-gtk-2.21.89.tar.bz2 +Url: http://en.opensuse.org/YaST2-GTK +Summary: YaST2 - GTK+ Graphical User Interface +Group: System/YaST +License: GPL v2.1 or later +BuildRequires: cmake +BuildRequires: gcc-c++ blocxx-devel libxcrypt-devel +BuildRequires: gtk2-devel +%if 0%{?suse_version} > 1130 +BuildRequires: gdk-pixbuf-devel +%endif +BuildRequires: yast2-devtools >= 2.16.3 +BuildRequires: yast2-libyui-devel >= 2.18.8 +BuildRequires: libzypp-devel >= 6.3.0 +Requires: gtk2 +Requires: yast2-libyui >= 2.18.8 +Requires: yast2_theme >= 2.16.1 +Requires: libzypp >= 6.3.0 +Provides: yast2_ui yast2-ui-gtk +Provides: yast2_ui_pkg +Source1: yast2-gtk-rpmlintrc + +%description +One of several user interfaces available for YaST2, based on GTK and +the X Window System. + +%prep +%setup + +%build +mkdir build +cd build +export CFLAGS="$RPM_OPT_FLAGS" +export CXXFLAGS="$CFLAGS" +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB=%{_lib} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 \ + .. +make %{?_smp_mflags} VERBOSE=1 + +%install +cd build +make install DESTDIR=$RPM_BUILD_ROOT +cd .. + +%clean +rm -rf "$RPM_BUILD_ROOT" + +%files +%defattr (-, root, root) +%dir %_libdir/YaST2 +%_libdir/YaST2/plugin/ + +%changelog + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.88/src/YGComboBox.cc new/yast2-gtk-2.21.90/src/YGComboBox.cc --- old/yast2-gtk-2.21.88/src/YGComboBox.cc 2011-01-20 21:28:15.000000000 +0100 +++ new/yast2-gtk-2.21.90/src/YGComboBox.cc 2011-02-02 00:03:13.000000000 +0100 @@ -48,6 +48,8 @@ // YGSelectionModel + void blockSelected() {} + void doAddItem (YItem *item) { GtkTreeIter iter; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.88/src/YGSelectionStore.h new/yast2-gtk-2.21.90/src/YGSelectionStore.h --- old/yast2-gtk-2.21.88/src/YGSelectionStore.h 2011-01-20 21:28:15.000000000 +0100 +++ new/yast2-gtk-2.21.90/src/YGSelectionStore.h 2011-02-02 00:03:13.000000000 +0100 @@ -49,6 +49,7 @@ } \ virtual void deleteAllItems() { \ ParentClass::deleteAllItems(); \ + blockSelected(); \ doDeleteAllItems(); \ } \ virtual void selectItem (YItem *item, bool select) { \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.88/src/YGTreeView.cc new/yast2-gtk-2.21.90/src/YGTreeView.cc --- old/yast2-gtk-2.21.88/src/YGTreeView.cc 2011-01-20 21:28:15.000000000 +0100 +++ new/yast2-gtk-2.21.90/src/YGTreeView.cc 2011-02-02 00:03:13.000000000 +0100 @@ -236,7 +236,7 @@ void blockSelected() { // GtkTreeSelection only fires when idle; so set a timeout if (m_blockTimeout) g_source_remove (m_blockTimeout); - m_blockTimeout = g_timeout_add_full (G_PRIORITY_LOW, 250, block_selected_timeout_cb, this, NULL); + m_blockTimeout = g_timeout_add_full (G_PRIORITY_LOW, 50, block_selected_timeout_cb, this, NULL); } static void block_init_cb (GtkWidget *widget, YGTreeView *pThis) @@ -676,6 +676,7 @@ GtkTreeIter iter; addRow (item, &iter, parent); setRowText (&iter, 0, item->iconName(), 1, item->label(), this); +#if 0 // yast2-qt ignores `selected flag if (item->selected()) { #if YAST2_VERSION >= 2019002 if (hasMultiSelection()) @@ -684,14 +685,17 @@ #endif focusItem (item, true); } -/* if (((YTreeItem *) item)->isOpen()) - expand (&iter);*/ +#endif +#if 0 + if (((YTreeItem *) item)->isOpen()) + expand (&iter); +#endif for (YItemConstIterator it = item->childrenBegin(); it != item->childrenEnd(); it++) addNode (*it, &iter); } -/* +#if 0 void expand (GtkTreeIter *iter) { GtkTreePath *path = gtk_tree_model_get_path (getModel(), iter); @@ -706,12 +710,14 @@ return false; return true; } -*/ +#endif // YTree virtual void rebuildTree() { + blockSelected(); + doDeleteAllItems(); for (YItemConstIterator it = YTree::itemsBegin(); it != YTree::itemsEnd(); it++) addNode (*it, NULL); @@ -734,7 +740,10 @@ } }; + g_signal_handlers_block_by_func (getWidget(), (gpointer) row_expanded_cb, this); gtk_tree_model_foreach (getModel(), inner::foreach_sync_open, this); + g_signal_handlers_unblock_by_func (getWidget(), (gpointer) row_expanded_cb, this); + syncCount(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.88/src/pkg/ygtkpkgdetailview.cc new/yast2-gtk-2.21.90/src/pkg/ygtkpkgdetailview.cc --- old/yast2-gtk-2.21.88/src/pkg/ygtkpkgdetailview.cc 2011-01-20 21:28:15.000000000 +0100 +++ new/yast2-gtk-2.21.90/src/pkg/ygtkpkgdetailview.cc 2011-02-02 00:03:13.000000000 +0100 @@ -460,6 +460,7 @@ } modified = sel.toInstall(); } + modified = modified && version.toModify(); if (modified) tooltip = _("Undo"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.88/src/ygtkfixed.c new/yast2-gtk-2.21.90/src/ygtkfixed.c --- old/yast2-gtk-2.21.88/src/ygtkfixed.c 2011-01-20 21:28:15.000000000 +0100 +++ new/yast2-gtk-2.21.90/src/ygtkfixed.c 2011-02-02 00:03:13.000000000 +0100 @@ -114,7 +114,7 @@ x += allocation->x; int y = child->y + allocation->y; GtkAllocation child_alloc = - { x, y, child->width, child->height }; + { x, y, MAX (child->width, 1), MAX (child->height, 1) }; gtk_widget_size_allocate (child->widget, &child_alloc); } GTK_WIDGET_CLASS (ygtk_fixed_parent_class)->size_allocate (widget, allocation); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.88/src/ygtkratiobox.c new/yast2-gtk-2.21.90/src/ygtkratiobox.c --- old/yast2-gtk-2.21.88/src/ygtkratiobox.c 2011-01-20 21:28:15.000000000 +0100 +++ new/yast2-gtk-2.21.90/src/ygtkratiobox.c 2011-02-02 00:03:13.000000000 +0100 @@ -184,6 +184,8 @@ child_alloc.width = width; child_alloc.height = child_length; } + child_alloc.width = MAX (child_alloc.width, 1); + child_alloc.height = MAX (child_alloc.height, 1); gtk_widget_size_allocate (child->widget, &child_alloc); child_pos += child_length + box->spacing; @@ -336,6 +338,8 @@ child_alloc.y += border; child_alloc.width -= border * 2; child_alloc.height -= border * 2; + child_alloc.width = MAX (child_alloc.width, 1); + child_alloc.height = MAX (child_alloc.height, 1); gtk_widget_size_allocate (child, &child_alloc); } GTK_WIDGET_CLASS (ygtk_adj_size_parent_class)->size_allocate (widget, allocation); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.88/tests/Tree-rebuild.ycp new/yast2-gtk-2.21.90/tests/Tree-rebuild.ycp --- old/yast2-gtk-2.21.88/tests/Tree-rebuild.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-gtk-2.21.90/tests/Tree-rebuild.ycp 2011-02-02 00:03:13.000000000 +0100 @@ -0,0 +1,50 @@ +{ + // Test Case for Bug 668602 + // Crashing in printer tool: when rebuilding tree after item is selected. + // See if Label is properly set to the item selected. + + UI::OpenDialog(`VBox ( + `Tree(`id(`tree), + `opt(`notify), + "Select destination directory:", + [ + `item( "/" , true, + [ + `item( "etc", + [ + `item("opt"), + `item("SuSEconfig"), + `item("X11") + ] + ) + ] + ) + ] ), + `Label (`id (`label), "Selected: (none)") + ) + ); + + any id = nil; + + repeat + { + id = UI::UserInput(); + + any item = UI::QueryWidget (`tree, `CurrentItem); + + UI::ChangeWidget( `id( `label ), `Value, sformat( "%1", item ) ); + + + UI::ChangeWidget (`tree, `Items, ( [ + `item( "Option 1:" , true, + [ + `item( "Value 1" , true ), + `item( "Value 2" , true ) + ] ) + ])); + + + } until ( id == `cancel ); + UI::CloseDialog(); +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.88/tests/Tree3.ycp new/yast2-gtk-2.21.90/tests/Tree3.ycp --- old/yast2-gtk-2.21.88/tests/Tree3.ycp 2011-01-20 21:28:15.000000000 +0100 +++ new/yast2-gtk-2.21.90/tests/Tree3.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,123 +0,0 @@ -{ - // Build a dialog with a tree for directory selection, three - // buttons with common values and a label that directly echoes any - // selected directory. - // - // The tree in this example uses the `notify option that makes - // UI::UserInput() return immediately as soon as the user selects a - // tree item rather than the default behaviour which waits for the - // user to activate a button. - - UI::OpenDialog( - `MinWidth( 50, - `VBox( - `Tree(`id(`dest_dir), - `opt(`notify), - "Select destination directory:", - [ - `item( "/" , true, - [ - `item( "etc", - [ - `item("opt"), - `item("SuSEconfig"), - `item("X11") - ] - ), - `item( "usr", false, - [ - "bin", - "lib", - `item("share", - [ - "man", - "info", - "emacs" - ] - ), - `item( `id(`usr_local), "local" ), - `item("X11R6", - [ - "bin", - "lib", - "share", - "man", - "etc" - ] - ) - ] - ), - `item( `id(`opt), "opt", true, - [ - "kde", - "netscape", - "Office51" - ] - ), - `item("home"), - "work", - `item( "<other>") - ] - ) - ] ), - `HBox( - `PushButton(`id(`sel_opt), `opt(`hstretch), "/&opt" ), - `PushButton(`id(`sel_usr), `opt(`hstretch), "/&usr" ), - `PushButton(`id(`sel_usr_local), `opt(`hstretch), "/usr/&local" ) - ), - `HBox( - `HWeight( 2, `Label("Current Item:") ), - `HWeight( 5, `Label(`id(`echoItem), `opt(`outputField, `hstretch), "") ) - ), - `HBox( - `HWeight( 2, `Label("Current Branch:") ), - `HWeight( 5, `Label(`id(`echoBranch), `opt(`outputField, `hstretch), "") ) - ), - `HBox( - `HWeight( 2, `Label("Current Path:") ), - `HWeight( 5, `Label(`id(`echoPath), `opt(`outputField, `hstretch), "") ) - ), - `PushButton(`id(`ok), `opt(`default, `icon ("ok")), "&OK") - ) - ) - ); - - any id = nil; - - repeat - { - id = UI::UserInput(); - - if ( id == `sel_usr) UI::ChangeWidget( `id( `dest_dir ), `CurrentItem, "usr" ); - else if ( id == `sel_usr_local) UI::ChangeWidget( `id( `dest_dir ), `CurrentItem, `usr_local ); - else if ( id == `sel_opt) UI::ChangeWidget( `id( `dest_dir ), `CurrentItem, `opt ); - else if ( id == `dest_dir) - { - any current_dir = UI::QueryWidget(`dest_dir, `CurrentItem ); - - if ( current_dir != nil ) - UI::ChangeWidget( `id( `echoItem ), `Value, sformat( "%1", current_dir ) ); - - list<string> current_branch = (list<string>) UI::QueryWidget(`dest_dir, `CurrentBranch ); - - if ( current_branch != nil ) - { - UI::ChangeWidget(`echoBranch, `Value, sformat( "%1", current_branch) ); - - string current_path = mergestring( current_branch, "/" ); - if ( size( current_path ) > 2 ) - // Remove duplicate "/" at start - current_path = substring( current_path, 1, size( current_path )-1 ); - - UI::ChangeWidget(`echoPath, `Value, sformat( "%1", current_path ) ); - } - } - - } until ( id == `ok ); - - - // Close the dialog. - // Remember to read values from the dialog's widgets BEFORE closing it! - UI::CloseDialog(); - -} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org