X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-encoding-selector.c;h=a551ef054937a467941b1c998b2e7ae4d13099fd;hb=faa4f310af58bc1dfd56be0575745c91a59d88b3;hp=82677d8f59005660190be372b593f52bdf0327d2;hpb=e4e0d0fdf07ad9b9b2790630ff3f9a458919735f;p=pspp

diff --git a/src/ui/gui/psppire-encoding-selector.c b/src/ui/gui/psppire-encoding-selector.c
index 82677d8f59..a551ef0549 100644
--- a/src/ui/gui/psppire-encoding-selector.c
+++ b/src/ui/gui/psppire-encoding-selector.c
@@ -18,7 +18,6 @@
 
 #include "ui/gui/psppire-encoding-selector.h"
 
-#include <assert.h>
 #include <stdlib.h>
 
 #include "libpspp/cast.h"
@@ -183,13 +182,17 @@ psppire_encoding_selector_new (const char *default_encoding,
   return hbox;
 }
 
+/*
+   Return a string describing the currently selected encoding.
+   The caller should free this string when no longer required.
+*/
 gchar *
 psppire_encoding_selector_get_encoding (GtkWidget *selector)
 {
   gchar *encoding = NULL;
-  GList *list, *pos;
+  GList *pos;
+  GList *list = gtk_container_get_children (GTK_CONTAINER (selector));
 
-  list = gtk_container_get_children (GTK_CONTAINER (selector));
   for (pos = list; pos; pos = pos->next)
     {
       GtkWidget *widget = pos->data;
@@ -206,7 +209,14 @@ psppire_encoding_selector_get_encoding (GtkWidget *selector)
           break;
         }
     }
+
   g_list_free (list);
 
-  return encoding && !strcmp (encoding, "Auto") ? NULL : encoding;
+  if (0 == strcmp (encoding, "Auto"))
+    {
+      g_free (encoding);
+      return NULL;
+    }
+
+  return encoding;
 }