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);
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;
break;
}
}
+
g_list_free (list);
- return encoding && !strcmp (encoding, "Auto") ? NULL : encoding;
+ if (0 == strcmp (encoding, "Auto"))
+ {
+ g_free (encoding);
+ return NULL;
+ }
+
+ return encoding;
}