Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed assignment to function parameters in free_setting and preferences_... #2

Closed
wants to merge 1 commit into from
Closed

Fixed assignment to function parameters in free_setting and preferences_... #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/preferences.c
View file
Open in desktop
Expand Up @@ -122,10 +122,10 @@ static void preferences_dialog_generic_toggled_event(GtkToggleButton * widget, g
}

/* Generic "focus-out-event" handler for GtkEntry events */
static gboolean preferences_dialog_generic_focus_out_event(GtkWidget * widget, GdkEventFocus * event, gchar * s)
static gboolean preferences_dialog_generic_focus_out_event(GtkWidget * widget, GdkEventFocus * event, gchar ** s)
{
g_free(s);
s = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget)));
g_free(*s);
*s = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget)));
return FALSE;
}

Expand Down Expand Up @@ -249,7 +249,7 @@ void terminal_preferences_dialog(GtkAction * action, LXTerminal * terminal)
w = GTK_WIDGET(gtk_builder_get_object(builder, "select_by_word"));
gtk_entry_set_text(GTK_ENTRY(w), setting->word_selection_characters);
g_signal_connect(G_OBJECT(w), "focus-out-event",
G_CALLBACK(preferences_dialog_generic_focus_out_event), setting->word_selection_characters);
G_CALLBACK(preferences_dialog_generic_focus_out_event), &setting->word_selection_characters);

w = GTK_WIDGET(gtk_builder_get_object(builder, "disable_f10"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), setting->disable_f10);
Expand Down Expand Up @@ -334,6 +334,6 @@ void terminal_preferences_dialog(GtkAction * action, LXTerminal * terminal)
}
else
{
free_setting(setting);
free_setting(&setting);
}
}
6 changes: 3 additions & 3 deletions src/setting.c
View file
Open in desktop
Expand Up @@ -85,7 +85,7 @@ void set_setting(Setting * new_setting)
{
if (setting != NULL)
{
free_setting(setting);
free_setting(&setting);
}
setting = new_setting;
}
Expand Down Expand Up @@ -189,7 +189,7 @@ Setting * copy_setting(Setting * setting)
}

/* Deep free settings. */
void free_setting(Setting * setting)
void free_setting(Setting ** setting)
{
g_return_if_fail (setting != NULL);

Expand All @@ -209,7 +209,7 @@ void free_setting(Setting * setting)
g_free(setting->move_tab_right_accel);

g_slice_free(Setting, setting);
setting = NULL;
*setting = NULL;
}

/* Load settings from configuration file. */
Expand Down
2 changes: 1 addition & 1 deletion src/setting.h
View file
Open in desktop
Expand Up @@ -112,7 +112,7 @@ extern Setting * load_setting();

/* Utils for chsnge setting through preference */
extern void set_setting(Setting * setting);
extern void free_setting(Setting * setting);
extern void free_setting(Setting ** setting);
extern Setting * copy_setting(Setting * setting);

extern void print_setting();
Expand Down