--- a/gntfilesel.c Sat Apr 20 03:07:46 2019 -0400
+++ b/gntfilesel.c Sat Apr 20 19:58:58 2019 -0400
@@ -636,7 +636,7 @@
-cancel_activated_cb(GntWidget *button, GntFileSel *sel)
+cancel_activated_cb(G_GNUC_UNUSED GntWidget *button, GntFileSel *sel) g_signal_emit(sel, signals[SIG_CANCELLED], 0);
@@ -649,11 +649,14 @@
gboolean gnt_file_sel_set_current_location(GntFileSel *sel, const char *path)
- GntFileSelPrivate *priv = gnt_file_sel_get_instance_private(sel);
+ GntFileSelPrivate *priv = NULL; + g_return_val_if_fail(GNT_IS_FILE_SEL(sel), FALSE); + priv = gnt_file_sel_get_instance_private(sel); priv->current = process_path(path);
if (!location_changed(sel, &error)) {
@@ -672,27 +675,43 @@
void gnt_file_sel_set_dirs_only(GntFileSel *sel, gboolean dirs)
- GntFileSelPrivate *priv = gnt_file_sel_get_instance_private(sel);
+ GntFileSelPrivate *priv = NULL; + g_return_if_fail(GNT_IS_FILE_SEL(sel)); + priv = gnt_file_sel_get_instance_private(sel); gboolean gnt_file_sel_get_dirs_only(GntFileSel *sel)
- GntFileSelPrivate *priv = gnt_file_sel_get_instance_private(sel);
+ GntFileSelPrivate *priv = NULL; + g_return_val_if_fail(GNT_IS_FILE_SEL(sel), FALSE); + priv = gnt_file_sel_get_instance_private(sel); void gnt_file_sel_set_suggested_filename(GntFileSel *sel, const char *suggest)
- GntFileSelPrivate *priv = gnt_file_sel_get_instance_private(sel);
+ GntFileSelPrivate *priv = NULL; + g_return_if_fail(GNT_IS_FILE_SEL(sel)); + priv = gnt_file_sel_get_instance_private(sel); priv->suggest = g_strdup(suggest);
char *gnt_file_sel_get_selected_file(GntFileSel *sel)
- GntFileSelPrivate *priv = gnt_file_sel_get_instance_private(sel);
+ GntFileSelPrivate *priv = NULL; + g_return_val_if_fail(GNT_IS_FILE_SEL(sel), NULL); + priv = gnt_file_sel_get_instance_private(sel); ret = g_path_get_dirname(
gnt_entry_get_text(GNT_ENTRY(priv->location)));
@@ -704,28 +723,45 @@
void gnt_file_sel_set_must_exist(GntFileSel *sel, gboolean must)
- GntFileSelPrivate *priv = gnt_file_sel_get_instance_private(sel);
+ GntFileSelPrivate *priv = NULL; + g_return_if_fail(GNT_IS_FILE_SEL(sel)); + priv = gnt_file_sel_get_instance_private(sel); /*XXX: What do I do with this? */
gboolean gnt_file_sel_get_must_exist(GntFileSel *sel)
- GntFileSelPrivate *priv = gnt_file_sel_get_instance_private(sel);
+ GntFileSelPrivate *priv = NULL; + g_return_val_if_fail(GNT_IS_FILE_SEL(sel), FALSE); + priv = gnt_file_sel_get_instance_private(sel); void gnt_file_sel_set_multi_select(GntFileSel *sel, gboolean set)
- GntFileSelPrivate *priv = gnt_file_sel_get_instance_private(sel);
+ GntFileSelPrivate *priv = NULL; + g_return_if_fail(GNT_IS_FILE_SEL(sel)); + priv = gnt_file_sel_get_instance_private(sel); GList *gnt_file_sel_get_selected_multi_files(GntFileSel *sel)
- GntFileSelPrivate *priv = gnt_file_sel_get_instance_private(sel);
+ GntFileSelPrivate *priv = NULL; GList *list = NULL, *iter;
- char *str = gnt_file_sel_get_selected_file(sel);
+ g_return_val_if_fail(GNT_IS_FILE_SEL(sel), NULL); + priv = gnt_file_sel_get_instance_private(sel); + str = gnt_file_sel_get_selected_file(sel); for (iter = priv->tags; iter; iter = iter->next) {
list = g_list_prepend(list, g_strdup(iter->data));
@@ -742,7 +778,11 @@
void gnt_file_sel_set_read_fn(GntFileSel *sel, gboolean (*read_fn)(const char *path, GList **files, GError **error))
- GntFileSelPrivate *priv = gnt_file_sel_get_instance_private(sel);
+ GntFileSelPrivate *priv = NULL; + g_return_if_fail(GNT_IS_FILE_SEL(sel)); + priv = gnt_file_sel_get_instance_private(sel);