diff options
| author | Dave Davenport <qball@gmpclient.org> | 2016-01-07 21:27:20 +0100 |
|---|---|---|
| committer | Dave Davenport <qball@gmpclient.org> | 2016-01-07 21:27:20 +0100 |
| commit | fa51aeb484374cf22493d0da81e298a9052f1451 (patch) | |
| tree | 245055e789ece34b0b6945cc0e949ea4a599e2fc /source/dialogs/script.c | |
| parent | e8daff0f6ad49cd17b225622fa1875ee2960a70f (diff) | |
More splitting and abstracting.
Diffstat (limited to 'source/dialogs/script.c')
| -rw-r--r-- | source/dialogs/script.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/source/dialogs/script.c b/source/dialogs/script.c index 68147bf7..9943b6d1 100644 --- a/source/dialogs/script.c +++ b/source/dialogs/script.c @@ -157,7 +157,7 @@ static void script_mode_destroy ( Mode *sw ) sw->private_data = NULL; } } -static char *mgrv ( const Mode *sw, unsigned int selected_line, G_GNUC_UNUSED int *state, int get_entry ) +static char *_get_display_value ( const Mode *sw, unsigned int selected_line, G_GNUC_UNUSED int *state, int get_entry ) { ScriptModePrivateData *rmpd = sw->private_data; return get_entry ? g_strdup ( rmpd->cmd_list[selected_line] ) : NULL; @@ -175,6 +175,7 @@ static int script_is_not_ascii ( const Mode *sw, unsigned int index ) return !g_str_is_ascii ( rmpd->cmd_list[index] ); } +#include "mode-private.h" Mode *script_switcher_parse_setup ( const char *str ) { Mode *sw = g_malloc0 ( sizeof ( *sw ) ); @@ -192,17 +193,17 @@ Mode *script_switcher_parse_setup ( const char *str ) } g_free ( parse ); if ( index == 2 ) { - sw->free = script_switcher_free; - sw->keysym = None; - sw->modmask = AnyModifier; - sw->_init = script_mode_init; - sw->_get_num_entries = script_mode_get_num_entries; - sw->result = script_mode_result; - sw->_destroy = script_mode_destroy; - sw->token_match = script_token_match; - sw->get_completion = NULL, - sw->mgrv = mgrv; - sw->is_not_ascii = script_is_not_ascii; + sw->free = script_switcher_free; + sw->keysym = None; + sw->modmask = AnyModifier; + sw->_init = script_mode_init; + sw->_get_num_entries = script_mode_get_num_entries; + sw->_result = script_mode_result; + sw->_destroy = script_mode_destroy; + sw->_token_match = script_token_match; + sw->_get_completion = NULL, + sw->_get_display_value = _get_display_value; + sw->_is_not_ascii = script_is_not_ascii; return sw; } |