PsppireSelector: Do not add a default selector func, if an explicit one already exists
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 30 Mar 2016 15:42:44 +0000 (17:42 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 31 Mar 2016 13:07:51 +0000 (15:07 +0200)
Fixes bug #47573.

NEWS
src/ui/gui/psppire-selector.c

diff --git a/NEWS b/NEWS
index 854c79a4f968e32c875ee4ee91d0bcd22bb1caac..2674853a59b744b41c48f71f20059d0f1a3c06e2 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ Please send PSPP bug reports to bug-gnu-pspp@gnu.org.
  
 Changes from 0.10.1 to 0.10.1:
 
+ * A bug where certain dialog boxes could not be properly populated
+   has been fixed.
+
 Changes from 0.8.5 to 0.10.0:
 
  * The QUICK CLUSTER command has a  /PRINT subcommand which shows
index 027f31203b64d5ce7559e643c08b1b699fd4fd2b..17d1c1fd66e1c52d1252277d939b897409dccb2d 100644 (file)
@@ -1053,8 +1053,7 @@ psppire_selector_update_subjects (PsppireSelector *selector)
     g_error ("Unsupported destination widget: %s", G_OBJECT_TYPE_NAME (selector->dest));
 
 
-  /* FIXME: Remove this dependency */
-  if ( PSPPIRE_IS_DICT_VIEW (selector->source) )
+  if ( PSPPIRE_IS_DICT_VIEW (selector->source) && selector->select_items == NULL)
     {
       GObjectClass *class = G_OBJECT_GET_CLASS (selector);
       GType type = G_OBJECT_TYPE (selector->dest);