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=8f7af0acaf8a9253242d89fcdb26e285841f7833;hp=42fbea44e6c4cfe78a878346397ea79a08efd25d;hpb=f23643cfa3b4c6b9a5fe0cd890a8d1b7240a8552;p=pspp

diff --git a/src/ui/gui/psppire-encoding-selector.c b/src/ui/gui/psppire-encoding-selector.c
index 42fbea44e6..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"
@@ -173,7 +172,7 @@ psppire_encoding_selector_new (const char *default_encoding,
                                       renderer, set_sensitive,
                                       NULL, NULL);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (hbox),
                       gtk_label_new (_("Character Encoding: ")),
                       FALSE, FALSE, 0);
@@ -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;
 }