takino/termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get rid of code duplication with a macro

Browse Source
This commit is contained in:
Daniel Micay 2012-06-07 12:41:48 -04:00
parent 3a799f80d9
commit 9748445778
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
termite.c
View File

@ -245,6 +245,8 @@ static gboolean position_overlay_cb(GtkBin *overlay, GtkWidget *widget, GdkRecta
return TRUE; return TRUE;
} }
#define IGNORE_ON_ERROR(ERROR) if (ERROR) { g_error_free(error); error = NULL; } else
static void load_config(GtkWindow *window, VteTerminal *vte) { static void load_config(GtkWindow *window, VteTerminal *vte) {
GError *error = NULL; GError *error = NULL;
GKeyFile *config = g_key_file_new(); GKeyFile *config = g_key_file_new();
@ -253,50 +255,32 @@ static void load_config(GtkWindow *window, VteTerminal *vte) {
g_error_free(error); g_error_free(error);
} else { } else {
gboolean resize_grip = g_key_file_get_boolean(config, "options", "resize_grip", &error); gboolean resize_grip = g_key_file_get_boolean(config, "options", "resize_grip", &error);
if (error) { IGNORE_ON_ERROR(error) {
g_error_free(error);
error = NULL;
} else {
gtk_window_set_has_resize_grip(GTK_WINDOW(window), resize_grip); gtk_window_set_has_resize_grip(GTK_WINDOW(window), resize_grip);
} }
gboolean scroll_on_output = g_key_file_get_boolean(config, "options", "scroll_on_output", &error); gboolean scroll_on_output = g_key_file_get_boolean(config, "options", "scroll_on_output", &error);
if (error) { IGNORE_ON_ERROR(error) {
g_error_free(error);
error = NULL;
} else {
vte_terminal_set_scroll_on_output(vte, scroll_on_output); vte_terminal_set_scroll_on_output(vte, scroll_on_output);
} }
gboolean scroll_on_keystroke = g_key_file_get_boolean(config, "options", "scroll_on_keystroke", &error); gboolean scroll_on_keystroke = g_key_file_get_boolean(config, "options", "scroll_on_keystroke", &error);
if (error) { IGNORE_ON_ERROR(error) {
g_error_free(error);
error = NULL;
} else {
vte_terminal_set_scroll_on_keystroke(vte, scroll_on_keystroke); vte_terminal_set_scroll_on_keystroke(vte, scroll_on_keystroke);
} }
gboolean audible_bell = g_key_file_get_boolean(config, "options", "audible_bell", &error); gboolean audible_bell = g_key_file_get_boolean(config, "options", "audible_bell", &error);
if (error) { IGNORE_ON_ERROR(error) {
g_error_free(error);
error = NULL;
} else {
vte_terminal_set_audible_bell(vte, audible_bell); vte_terminal_set_audible_bell(vte, audible_bell);
} }
gboolean visible_bell = g_key_file_get_boolean(config, "options", "visible_bell", &error); gboolean visible_bell = g_key_file_get_boolean(config, "options", "visible_bell", &error);
if (error) { IGNORE_ON_ERROR(error) {
g_error_free(error);
error = NULL;
} else {
vte_terminal_set_visible_bell(vte, visible_bell); vte_terminal_set_visible_bell(vte, visible_bell);
} }
gboolean mouse_autohide = g_key_file_get_boolean(config, "options", "mouse_autohide", &error); gboolean mouse_autohide = g_key_file_get_boolean(config, "options", "mouse_autohide", &error);
if (error) { IGNORE_ON_ERROR(error) {
g_error_free(error);
error = NULL;
} else {
vte_terminal_set_mouse_autohide(vte, mouse_autohide); vte_terminal_set_mouse_autohide(vte, mouse_autohide);
} }
} }