From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 30 Mar 2016 15:42:44 +0000 (+0200)
Subject: PsppireSelector: Do not add a default selector func, if an explicit one already exists
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d7adfb52428ce225a6287848a830c08de13986b;p=pspp

PsppireSelector: Do not add a default selector func, if an explicit one already exists

Fixes bug #47573.
---

diff --git a/NEWS b/NEWS
index 854c79a4f9..2674853a59 100644
--- 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
diff --git a/src/ui/gui/psppire-selector.c b/src/ui/gui/psppire-selector.c
index 027f31203b..17d1c1fd66 100644
--- a/src/ui/gui/psppire-selector.c
+++ b/src/ui/gui/psppire-selector.c
@@ -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);