Commits January 2012

commits@lists.geany.org

6 participants
36 discussions

[geany/geany] ca340a: Properly handle remote URIs received through drag 'n drop

by Colomban Wendling

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 31 Jan 2012 14:22:20 Commit: ca340a8aa332e0c9ff4e5a5f54de944d6a091a74 https://github.com/geany/geany/commit/ca340a8aa332e0c9ff4e5a5f54de944d6a091… Log Message: ----------- Properly handle remote URIs received through drag 'n drop Closes #2966770, #3479567. Modified Paths: -------------- src/document.c Modified: src/document.c 7 files changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -1246,10 +1246,11 @@ void document_open_file_list(const gchar *data, gsize length) list = g_strsplit(data, utils_get_eol_char(utils_get_line_endings(data, length)), 0); - for (i = 0; list[i] != NULL; i++) + /* stop at the end or first empty item, because last item is empty but not null */ + for (i = 0; list[i] != NULL && list[i][0] != '\0'; i++) { - filename = g_filename_from_uri(list[i], NULL, NULL); - if (G_UNLIKELY(filename == NULL)) + filename = utils_get_path_from_uri(list[i]); + if (filename == NULL) continue; document_open_file(filename, FALSE, NULL, NULL); g_free(filename); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 10 months

[geany/geany] 9876ce: Remove a redundant check

by Colomban Wendling

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 31 Jan 2012 13:41:15 Commit: 9876ce5a3fdfe04936f23d5fd12fa47d66d524dd https://github.com/geany/geany/commit/9876ce5a3fdfe04936f23d5fd12fa47d66d52… Log Message: ----------- Remove a redundant check Modified Paths: -------------- src/main.c Modified: src/main.c 8 files changed, 2 insertions(+), 6 deletions(-) =================================================================== @@ -866,13 +866,9 @@ static void load_settings(void) void main_load_project_from_command_line(const gchar *locale_filename, gboolean use_session) { - gchar *pfile = NULL; - - if (utils_is_uri(locale_filename)) - pfile = utils_get_path_from_uri(locale_filename); - else - pfile = g_strdup(locale_filename); + gchar *pfile; + pfile = utils_get_path_from_uri(locale_filename); if (pfile != NULL) { if (use_session) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 10 months

[geany/geany] 9ff4ee: Fix Color Schemes menu items activation when used with libdbusmenu.

by Matthew Brush

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Tue, 31 Jan 2012 05:32:16 Commit: 9ff4eec8538549078d2011bd6be31d7c6f9b0194 https://github.com/geany/geany/commit/9ff4eec8538549078d2011bd6be31d7c6f9b0… Log Message: ----------- Fix Color Schemes menu items activation when used with libdbusmenu. I'm not even going to try to explain why this fixes it :) Modified Paths: -------------- src/highlighting.c src/main.c Modified: src/highlighting.c 9 files changed, 3 insertions(+), 6 deletions(-) =================================================================== @@ -1172,10 +1172,6 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) gchar *fname; gchar *path; - /* prevent callback on setting initial value */ - if (!GTK_WIDGET_MAPPED(menuitem)) - return; - /* check if default item */ if (!user_data) { @@ -1255,14 +1251,15 @@ static void add_color_scheme_item(GtkWidget *menu, const gchar *fname) g_key_file_free(skeyfile); } + g_signal_connect(item, "activate", + G_CALLBACK(on_color_scheme_clicked), GINT_TO_POINTER(fname != NULL)); + group = gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(item)); if (utils_str_equal(editor_prefs.color_scheme, fname)) gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), TRUE); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(menu), item); - g_signal_connect(item, "activate", - G_CALLBACK(on_color_scheme_clicked), GINT_TO_POINTER(fname != NULL)); } Modified: src/main.c 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1037,7 +1037,6 @@ gint main(gint argc, gchar **argv) sidebar_init(); load_settings(); /* load keyfile */ - highlighting_init(); msgwin_init(); build_init(); ui_create_insert_menu_items(); @@ -1045,6 +1044,9 @@ gint main(gint argc, gchar **argv) keybindings_init(); notebook_init(); filetypes_init(); + /* depends on filetypes_array being not NULL so must be after + * filetypes_init(). */ + highlighting_init(); templates_init(); navqueue_init(); document_init_doclist(); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 10 months

[geany/geany] cc3c26: Fix makefile.win32 for included regex removal

by Colomban Wendling

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 26 Jan 2012 21:52:22 Commit: cc3c2684fb969b2bdfc8fec30831eb0c9aee1677 https://github.com/geany/geany/commit/cc3c2684fb969b2bdfc8fec30831eb0c9aee1… Log Message: ----------- Fix makefile.win32 for included regex removal Modified Paths: -------------- tagmanager/makefile.win32 Modified: tagmanager/makefile.win32 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -9,7 +9,7 @@ RM = del COMPLIB=tagmanager.a -REGEX_DEFINES = -DHAVE_REGCOMP -DREGEX_MALLOC -DSTDC_HEADERS=1 +REGEX_DEFINES = -DHAVE_REGCOMP -DSTDC_HEADERS=1 GTK_INCLUDES= \ -I$(PREFIX)/include/gtk-2.0 \ @@ -45,7 +45,7 @@ actionscript.o nsis.o objc.o \ haskell.o haxe.o html.o python.o lregex.o rest.o sh.o ctags.o entry.o get.o keyword.o nestlevel.o \ options.o \ parse.o basic.o read.o sort.o strlist.o latex.o markdown.o matlab.o docbook.o tcl.o ruby.o asm.o sql.o txt2tags.o css.o \ -vstring.o regex.o tm_workspace.o tm_work_object.o tm_source_file.o tm_project.o tm_tag.o \ +vstring.o tm_workspace.o tm_work_object.o tm_source_file.o tm_project.o tm_tag.o \ tm_symbol.o tm_file_entry.o tm_tagmanager.o r.o $(AR) rc $@ $^ $(RANLIB) $@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 10 months

[geany/geany] 58164c: Remove static function utils_slist_remove_next()

by Nick Treleaven

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Thu, 26 Jan 2012 16:10:53 Commit: 58164c65f0bbc5bfd13c84aeabaca203befbb1a7 https://github.com/geany/geany/commit/58164c65f0bbc5bfd13c84aeabaca203befbb… Log Message: ----------- Remove static function utils_slist_remove_next() Modified Paths: -------------- src/utils.c Modified: src/utils.c 18 files changed, 5 insertions(+), 13 deletions(-) =================================================================== @@ -1978,17 +1978,6 @@ void utils_tidy_path(gchar *filename) } -static void utils_slist_remove_next(GSList *node) -{ - GSList *old = node->next; - - g_return_if_fail(old); - - node->next = old->next; - g_slist_free_1(old); -} - - /* Gets list of sorted filenames with no path and no duplicates from user and system config */ GSList *utils_get_config_files(const gchar *subdir) { @@ -2011,8 +2000,11 @@ static void utils_slist_remove_next(GSList *node) { if (node->next && utils_str_equal(node->next->data, node->data)) { - g_free(node->next->data); - utils_slist_remove_next(node); + GSList *old = node->next; + + g_free(old->data); + node->next = old->next; + g_slist_free1(old); } } g_free(path); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 10 months

[geany/geany] 7cc443: Don't append file truncation warning if file doesn't exist

by Nick Treleaven

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Thu, 26 Jan 2012 15:42:06 Commit: 7cc443e1420b77d041815a464fe5b20bc62412f4 https://github.com/geany/geany/commit/7cc443e1420b77d041815a464fe5b20bc6241… Log Message: ----------- Don't append file truncation warning if file doesn't exist This warning shown after a failed save is unnecessary when the filename is invalid. Modified Paths: -------------- src/document.c Modified: src/document.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1766,7 +1766,8 @@ gboolean document_save_file(GeanyDocument *doc, gboolean force) { ui_set_statusbar(TRUE, _("Error saving file (%s)."), errmsg); - if (!file_prefs.use_safe_file_saving) + if (!file_prefs.use_safe_file_saving && + g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR)) { SETPTR(errmsg, g_strdup_printf(_("%s\n\nThe file on disk may now be truncated!"), errmsg)); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 10 months

[geany/geany] 30ec6e: Fix plural setting

by Frank Lanitz

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 26 Jan 2012 10:42:24 Commit: 30ec6e6e2b06da5e04d3440d29b2329908b523d3 https://github.com/geany/geany/commit/30ec6e6e2b06da5e04d3440d29b2329908b52… Log Message: ----------- Fix plural setting Modified Paths: -------------- po/id.po Modified: po/id.po 12 files changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: geany 0.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-26 11:33+0100\n" +"POT-Creation-Date: 2012-01-26 11:41+0100\n" "PO-Revision-Date: 2012-01-24 11:53+0700\n" "Last-Translator: Fajar Wahyu <fajarwahyuabdillah(a)gmail.com>\n" "Language-Team: Indonesian <>\n" @@ -2432,7 +2432,7 @@ msgid "Do you really want to quit?" msgstr "Serius mau keluar?" #: ../src/callbacks.c:205 -#, c-format +#, fuzzy, c-format msgid "%d file saved." msgid_plural "%d files saved." msgstr[0] "%d file tersimpan." @@ -2933,7 +2933,7 @@ msgid "No matches found for \"%s\"." msgstr "Kesamaan tidak ditemukan untuk pencarian \"%s\"." #: ../src/document.c:2039 -#, c-format +#, fuzzy, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: menggantikan %d temuan dari \"%s\" menjadi \"%s\"." @@ -4381,7 +4381,7 @@ msgid "Other options to pass to Grep" msgstr "Opsi lain untuk diberikan pada Grep" #: ../src/search.c:1282 ../src/search.c:2088 ../src/search.c:2091 -#, c-format +#, fuzzy, c-format msgid "Found %d match for \"%s\"." msgid_plural "Found %d matches for \"%s\"." msgstr[0] "Ditemukan %d untuk \"%s\"." @@ -4426,7 +4426,7 @@ msgid "Search failed." msgstr "Pencarian gagal." #: ../src/search.c:1809 -#, c-format +#, fuzzy, c-format msgid "Search completed with %d match." msgid_plural "Search completed with %d matches." msgstr[0] "Pencarian selesai dimana ada %d yang ditemukan." @@ -5599,7 +5599,7 @@ msgid "Backup Copy: File could not be saved (%s)." msgstr "Copy-an Backup: File tidak bisa disimpan (%s)." #: ../plugins/saveactions.c:313 -#, c-format +#, fuzzy, c-format msgid "Autosave: Saved %d file automatically." msgid_plural "Autosave: Saved %d files automatically." msgstr[0] "Simpan Otomatis: Menyimpan file %d secara otomatis." -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 10 months

[geany/geany] ae0074: Added Indonesian translation provided by Fajar Wahyu

by Frank Lanitz

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Thu, 26 Jan 2012 10:36:09 Commit: ae00745f48278da42afcf35ee7a0865ec9f8e482 https://github.com/geany/geany/commit/ae00745f48278da42afcf35ee7a0865ec9f8e… Log Message: ----------- Added Indonesian translation provided by Fajar Wahyu Modified Paths: -------------- po/ChangeLog po/id.po Modified: po/ChangeLog 5 files changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,8 @@ +2012-01-26 Frank Lanitz <frlan(a)frank.uvena.de> + + * id.po: Added Indonesian translation, provided by Fajar Wahyu. + + 2011-12-30 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * sv.po: Update of Swedish translation. Thanks to Tony Mattsson for Modified: po/id.po 6572 files changed, 6572 insertions(+), 0 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 10 months

[geany/geany] b28755: Use 'SETPTR' instead of 'setptr'

by Nick Treleaven

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Wed, 25 Jan 2012 16:26:16 Commit: b287553e4aaf6065952d524541d9d37ca087742f https://github.com/geany/geany/commit/b287553e4aaf6065952d524541d9d37ca0877… Log Message: ----------- Use 'SETPTR' instead of 'setptr' This makes it clearer we're using a macro. Modified Paths: -------------- plugins/filebrowser.c plugins/saveactions.c src/build.c src/callbacks.c src/dialogs.c src/document.c src/editor.c src/encodings.c src/filetypes.c src/highlighting.c src/keybindings.c src/keyfile.c src/main.c src/msgwindow.c src/notebook.c src/prefs.c src/project.c src/search.c src/socket.c src/symbols.c src/templates.c src/toolbar.c src/ui_utils.c src/utils.c src/vte.c Modified: plugins/filebrowser.c 24 files changed, 12 insertions(+), 12 deletions(-) =================================================================== @@ -241,7 +241,7 @@ static void add_top_level_entry(void) return; /* ignore 'C:\' or '/' */ utf8_dir = g_path_get_dirname(current_dir); - setptr(utf8_dir, utils_get_utf8_from_locale(utf8_dir)); + SETPTR(utf8_dir, utils_get_utf8_from_locale(utf8_dir)); gtk_list_store_prepend(file_store, &iter); last_dir_iter = gtk_tree_iter_copy(&iter); @@ -305,7 +305,7 @@ static void refresh(void) static void on_go_home(void) { - setptr(current_dir, g_strdup(g_get_home_dir())); + SETPTR(current_dir, g_strdup(g_get_home_dir())); refresh(); } @@ -336,7 +336,7 @@ static void on_current_path(void) if (doc == NULL || doc->file_name == NULL || ! g_path_is_absolute(doc->file_name)) { - setptr(current_dir, get_default_dir()); + SETPTR(current_dir, get_default_dir()); refresh(); return; } @@ -345,7 +345,7 @@ static void on_current_path(void) dir = g_path_get_dirname(fname); g_free(fname); - setptr(current_dir, dir); + SETPTR(current_dir, dir); refresh(); } @@ -356,7 +356,7 @@ static void on_go_up(void) if (current_dir[len-1] == G_DIR_SEPARATOR) current_dir[len-1] = '\0'; /* remove the highest directory part (which becomes the basename of current_dir) */ - setptr(current_dir, g_path_get_dirname(current_dir)); + SETPTR(current_dir, g_path_get_dirname(current_dir)); refresh(); } @@ -512,7 +512,7 @@ static void open_folder(GtkTreePath *treepath) { gchar *fname = get_tree_path_filename(treepath); - setptr(current_dir, fname); + SETPTR(current_dir, fname); refresh(); } @@ -575,7 +575,7 @@ static void on_find_in_files(GtkMenuItem *menuitem, gpointer user_data) g_list_foreach(list, (GFunc) gtk_tree_path_free, NULL); g_list_free(list); - setptr(dir, utils_get_utf8_from_locale(dir)); + SETPTR(dir, utils_get_utf8_from_locale(dir)); search_show_find_in_files_dialog(dir); g_free(dir); } @@ -782,7 +782,7 @@ static void on_path_entry_activate(GtkEntry *entry, gpointer user_data) else new_dir = g_strdup(g_get_home_dir()); - setptr(current_dir, new_dir); + SETPTR(current_dir, new_dir); on_clear_filter(NULL, NULL); } @@ -1021,11 +1021,11 @@ static void project_change_cb(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile g_free(dir); } /* get it into locale encoding */ - setptr(new_dir, utils_get_locale_from_utf8(new_dir)); + SETPTR(new_dir, utils_get_locale_from_utf8(new_dir)); if (! utils_str_equal(current_dir, new_dir)) { - setptr(current_dir, new_dir); + SETPTR(current_dir, new_dir); refresh(); } else @@ -1046,11 +1046,11 @@ static void document_activate_cb(G_GNUC_UNUSED GObject *obj, GeanyDocument *doc, return; new_dir = g_path_get_dirname(doc->file_name); - setptr(new_dir, utils_get_locale_from_utf8(new_dir)); + SETPTR(new_dir, utils_get_locale_from_utf8(new_dir)); if (! utils_str_equal(current_dir, new_dir)) { - setptr(current_dir, new_dir); + SETPTR(current_dir, new_dir); refresh(); } else Modified: plugins/saveactions.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -107,7 +107,7 @@ static gboolean backupcopy_set_backup_dir(const gchar *utf8_dir) } /** TODO add utils_is_file_writeable() to the plugin API and make use of it **/ - setptr(backupcopy_backup_dir, tmp); + SETPTR(backupcopy_backup_dir, tmp); return TRUE; } @@ -259,7 +259,7 @@ static void instantsave_document_new_cb(GObject *obj, GeanyDocument *doc, gpoint if (ft != NULL) /* add the filetype's default extension to the new filename */ - setptr(new_filename, g_strconcat(new_filename, ".", ft->extension, NULL)); + SETPTR(new_filename, g_strconcat(new_filename, ".", ft->extension, NULL)); doc->file_name = new_filename; @@ -454,7 +454,7 @@ static void configure_response_cb(GtkDialog *dialog, gint response, G_GNUC_UNUSE g_key_file_set_integer(config, "backupcopy", "dir_levels", backupcopy_dir_levels); g_key_file_set_string(config, "backupcopy", "time_fmt", text_time); - setptr(backupcopy_time_fmt, g_strdup(text_time)); + SETPTR(backupcopy_time_fmt, g_strdup(text_time)); if (enable_backupcopy) { if (NZV(text_dir) && backupcopy_set_backup_dir(text_dir)) Modified: src/build.c 52 files changed, 26 insertions(+), 26 deletions(-) =================================================================== @@ -178,13 +178,13 @@ static void set_command(GeanyBuildCommand *bc, gint id, gchar *str) switch (id) { case GEANY_BC_LABEL: - setptr(bc->label, str); + SETPTR(bc->label, str); break; case GEANY_BC_COMMAND: - setptr(bc->command, str); + SETPTR(bc->command, str); break; case GEANY_BC_WORKING_DIR: - setptr(bc->working_dir, str); + SETPTR(bc->working_dir, str); break; default: g_assert(0); @@ -701,7 +701,7 @@ static GPid build_spawn_cmd(GeanyDocument *doc, const gchar *cmd, const gchar *d } clear_all_errors(); - setptr(current_dir_entered, NULL); + SETPTR(current_dir_entered, NULL); cmd_string = g_strdup(cmd); @@ -874,7 +874,7 @@ static GPid build_run_cmd(GeanyDocument *doc, guint cmdindex) if (vc->skip_run_script) { - setptr(vte_cmd_nonscript, utils_get_utf8_from_locale(vte_cmd_nonscript)); + SETPTR(vte_cmd_nonscript, utils_get_utf8_from_locale(vte_cmd_nonscript)); vte_cmd = g_strconcat(vte_cmd_nonscript, "\n", NULL); g_free(vte_cmd_nonscript); } @@ -1005,7 +1005,7 @@ static void process_build_output_line(const gchar *str, gint color) if (build_parse_make_dir(msg, &tmp)) { - setptr(current_dir_entered, tmp); + SETPTR(current_dir_entered, tmp); } msgwin_parse_compiler_error_line(msg, current_dir_entered, &filename, &line); @@ -1257,7 +1257,7 @@ static void on_make_custom_input_response(const gchar *input) { GeanyDocument *doc = document_get_current(); - setptr(build_info.custom_target, g_strdup(input)); + SETPTR(build_info.custom_target, g_strdup(input)); build_command(doc, GBO_TO_GBG(GEANY_GBO_CUSTOM), GBO_TO_CMD(GEANY_GBO_CUSTOM), build_info.custom_target); } @@ -2182,7 +2182,7 @@ static gboolean read_regex(GtkWidget *regexentry, gchar **src, gchar **dst) { if (dst != NULL) { - setptr(*dst, g_strdup(reg)); + SETPTR(*dst, g_strdup(reg)); changed = TRUE; } } @@ -2338,12 +2338,12 @@ static void build_load_menu_grp(GKeyFile *config, GeanyBuildCommand **dst, gint if (label != NULL) { dstcmd[cmd].exists = TRUE; - setptr(dstcmd[cmd].label, label); + SETPTR(dstcmd[cmd].label, label); set_key_fld(key,"CM"); - setptr(dstcmd[cmd].command, + SETPTR(dstcmd[cmd].command, g_key_file_get_string(config, build_grp_name, key, NULL)); set_key_fld(key,"WD"); - setptr(dstcmd[cmd].working_dir, + SETPTR(dstcmd[cmd].working_dir, g_key_file_get_string(config, build_grp_name, key, NULL)); } else dstcmd[cmd].exists = FALSE; @@ -2373,7 +2373,7 @@ void build_load_menu(GKeyFile *config, GeanyBuildSource src, gpointer p) build_load_menu_grp(config, &(ft->filecmds), GEANY_GBG_FT, NULL, TRUE); build_load_menu_grp(config, &(ft->ftdefcmds), GEANY_GBG_NON_FT, NULL, TRUE); build_load_menu_grp(config, &(ft->execcmds), GEANY_GBG_EXEC, NULL, TRUE); - setptr(ft->error_regex_string, + SETPTR(ft->error_regex_string, g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); break; case GEANY_BCS_HOME_FT: @@ -2382,18 +2382,18 @@ void build_load_menu(GKeyFile *config, GeanyBuildSource src, gpointer p) return; build_load_menu_grp(config, &(ft->homefilecmds), GEANY_GBG_FT, NULL, FALSE); build_load_menu_grp(config, &(ft->homeexeccmds), GEANY_GBG_EXEC, NULL, FALSE); - setptr(ft->homeerror_regex_string, + SETPTR(ft->homeerror_regex_string, g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); break; case GEANY_BCS_PREF: build_load_menu_grp(config, &non_ft_pref, GEANY_GBG_NON_FT, NULL, FALSE); build_load_menu_grp(config, &exec_pref, GEANY_GBG_EXEC, NULL, FALSE); - setptr(regex_pref, g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); + SETPTR(regex_pref, g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); break; case GEANY_BCS_PROJ: build_load_menu_grp(config, &non_ft_proj, GEANY_GBG_NON_FT, NULL, FALSE); build_load_menu_grp(config, &exec_proj, GEANY_GBG_EXEC, NULL, FALSE); - setptr(regex_proj, g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); + SETPTR(regex_proj, g_key_file_get_string(config, build_grp_name, "error_regex", NULL)); pj = (GeanyProject*)p; if (p == NULL) return; @@ -2411,7 +2411,7 @@ void build_load_menu(GKeyFile *config, GeanyBuildSource src, gpointer p) { gchar *regkey = g_strdup_printf("%serror_regex", *ftname); g_ptr_array_add(pj->build_filetypes_list, ft); - setptr(ft->projerror_regex_string, + SETPTR(ft->projerror_regex_string, g_key_file_get_string(config, build_grp_name, regkey, NULL)); g_free(regkey); build_load_menu_grp(config, &(ft->projfilecmds), GEANY_GBG_FT, *ftname, FALSE); @@ -2433,9 +2433,9 @@ void build_load_menu(GKeyFile *config, GeanyBuildSource src, gpointer p) #define ASSIGNIF(type, id, string, value) \ if (NZV(value) && ! type[GBO_TO_CMD(id)].exists) { \ type[GBO_TO_CMD(id)].exists = TRUE; \ - setptr(type[GBO_TO_CMD(id)].label, g_strdup(string)); \ - setptr(type[GBO_TO_CMD(id)].command, (value)); \ - setptr(type[GBO_TO_CMD(id)].working_dir, NULL); \ + SETPTR(type[GBO_TO_CMD(id)].label, g_strdup(string)); \ + SETPTR(type[GBO_TO_CMD(id)].command, (value)); \ + SETPTR(type[GBO_TO_CMD(id)].working_dir, NULL); \ type[GBO_TO_CMD(id)].old = TRUE; \ } else \ g_free(value); @@ -2480,11 +2480,11 @@ void build_load_menu(GKeyFile *config, GeanyBuildSource src, gpointer p) else makebasedir = g_strdup("%d"); if (non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_ALL)].old) - setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_ALL)].working_dir, g_strdup(makebasedir)); + SETPTR(non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_ALL)].working_dir, g_strdup(makebasedir)); if (non_ft_pref[GBO_TO_CMD(GEANY_GBO_CUSTOM)].old) - setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_CUSTOM)].working_dir, g_strdup(makebasedir)); + SETPTR(non_ft_pref[GBO_TO_CMD(GEANY_GBO_CUSTOM)].working_dir, g_strdup(makebasedir)); if (non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)].old) - setptr(non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)].working_dir, g_strdup("%d")); + SETPTR(non_ft_pref[GBO_TO_CMD(GEANY_GBO_MAKE_OBJECT)].working_dir, g_strdup("%d")); value = g_key_file_get_string(config, "project", "run_cmd", NULL); if (NZV(value)) { @@ -2493,9 +2493,9 @@ void build_load_menu(GKeyFile *config, GeanyBuildSource src, gpointer p) if (! exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].exists) { exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].exists = TRUE; - setptr(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].label, g_strdup(_("_Execute"))); - setptr(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].command, value); - setptr(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].working_dir, g_strdup(basedir)); + SETPTR(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].label, g_strdup(_("_Execute"))); + SETPTR(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].command, value); + SETPTR(exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].working_dir, g_strdup(basedir)); exec_proj[GBO_TO_CMD(GEANY_GBO_EXEC)].old = TRUE; } } @@ -2675,7 +2675,7 @@ guint build_get_group_count(GeanyBuildGroup grp) static void on_project_close(void) { /* remove project regexen */ - setptr(regex_proj, NULL); + SETPTR(regex_proj, NULL); } Modified: src/callbacks.c 22 files changed, 11 insertions(+), 11 deletions(-) =================================================================== @@ -468,8 +468,8 @@ G_MODULE_EXPORT void on_toolbutton_save_clicked(GtkAction *action, gpointer user /* store text, clear search flags so we can use Search->Find Next/Previous */ static void setup_find(const gchar *text, gboolean backwards) { - setptr(search_data.text, g_strdup(text)); - setptr(search_data.original_text, g_strdup(text)); + SETPTR(search_data.text, g_strdup(text)); + SETPTR(search_data.original_text, g_strdup(text)); search_data.flags = 0; search_data.backwards = backwards; search_data.search_bar = TRUE; @@ -1287,7 +1287,7 @@ G_MODULE_EXPORT void on_insert_date_activate(GtkMenuItem *menuitem, gpointer use "You can use any conversion specifiers which can be used with the ANSI C strftime function."), ui_prefs.custom_date_format); if (str) - setptr(ui_prefs.custom_date_format, str); + SETPTR(ui_prefs.custom_date_format, str); return; } @@ -1603,7 +1603,7 @@ G_MODULE_EXPORT void on_menu_open_selected_file1_activate(GtkMenuItem *menuitem, g_return_if_fail(doc != NULL); sel = editor_get_default_selection(doc->editor, TRUE, wc); - setptr(sel, utils_get_locale_from_utf8(sel)); + SETPTR(sel, utils_get_locale_from_utf8(sel)); if (sel != NULL) { @@ -1616,7 +1616,7 @@ G_MODULE_EXPORT void on_menu_open_selected_file1_activate(GtkMenuItem *menuitem, gchar *path; path = utils_get_current_file_dir_utf8(); - setptr(path, utils_get_locale_from_utf8(path)); + SETPTR(path, utils_get_locale_from_utf8(path)); if (!path) path = g_get_current_dir(); @@ -1626,17 +1626,17 @@ G_MODULE_EXPORT void on_menu_open_selected_file1_activate(GtkMenuItem *menuitem, app->project != NULL && NZV(app->project->base_path)) { /* try the project's base path */ - setptr(path, project_get_base_path()); - setptr(path, utils_get_locale_from_utf8(path)); - setptr(filename, g_build_path(G_DIR_SEPARATOR_S, path, sel, NULL)); + SETPTR(path, project_get_base_path()); + SETPTR(path, utils_get_locale_from_utf8(path)); + SETPTR(filename, g_build_path(G_DIR_SEPARATOR_S, path, sel, NULL)); } g_free(path); #ifdef G_OS_UNIX if (! g_file_test(filename, G_FILE_TEST_EXISTS)) - setptr(filename, g_build_path(G_DIR_SEPARATOR_S, "/usr/local/include", sel, NULL)); + SETPTR(filename, g_build_path(G_DIR_SEPARATOR_S, "/usr/local/include", sel, NULL)); if (! g_file_test(filename, G_FILE_TEST_EXISTS)) - setptr(filename, g_build_path(G_DIR_SEPARATOR_S, "/usr/include", sel, NULL)); + SETPTR(filename, g_build_path(G_DIR_SEPARATOR_S, "/usr/include", sel, NULL)); #endif } @@ -1644,7 +1644,7 @@ G_MODULE_EXPORT void on_menu_open_selected_file1_activate(GtkMenuItem *menuitem, document_open_file(filename, FALSE, NULL, NULL); else { - setptr(sel, utils_get_utf8_from_locale(sel)); + SETPTR(sel, utils_get_utf8_from_locale(sel)); ui_set_statusbar(TRUE, _("Could not open file %s (File not found)"), sel); } Modified: src/dialogs.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -459,7 +459,7 @@ void dialogs_show_open_file(void) if (! initdir) initdir = g_strdup(utils_get_default_dir_utf8()); - setptr(initdir, utils_get_locale_from_utf8(initdir)); + SETPTR(initdir, utils_get_locale_from_utf8(initdir)); #ifdef G_OS_WIN32 if (interface_prefs.use_native_windows_dialogs) Modified: src/document.c 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -1136,7 +1136,7 @@ void document_show_tab(GeanyDocument *doc) g_return_val_if_fail(doc != NULL, NULL); /* really should not happen */ /* file exists on disk, set real_path */ - setptr(doc->real_path, tm_get_real_path(locale_filename)); + SETPTR(doc->real_path, tm_get_real_path(locale_filename)); doc->priv->is_remote = utils_is_remote_path(locale_filename); monitor_file_setup(doc); @@ -1446,10 +1446,10 @@ gboolean document_save_file_as(GeanyDocument *doc, const gchar *utf8_fname) g_return_val_if_fail(doc != NULL, FALSE); if (utf8_fname != NULL) - setptr(doc->file_name, g_strdup(utf8_fname)); + SETPTR(doc->file_name, g_strdup(utf8_fname)); /* reset real path, it's retrieved again in document_save() */ - setptr(doc->real_path, NULL); + SETPTR(doc->real_path, NULL); /* detect filetype */ if (doc->file_type->id == GEANY_FILETYPES_NONE) @@ -1768,7 +1768,7 @@ gboolean document_save_file(GeanyDocument *doc, gboolean force) if (!file_prefs.use_safe_file_saving) { - setptr(errmsg, + SETPTR(errmsg, g_strdup_printf(_("%s\n\nThe file on disk may now be truncated!"), errmsg)); } dialogs_show_msgbox_with_secondary(GTK_MESSAGE_ERROR, _("Error saving file."), errmsg); @@ -2872,7 +2872,7 @@ static gboolean monitor_resave_missing_file(GeanyDocument *doc) /* file is missing - set unsaved state */ document_set_text_changed(doc, TRUE); /* don't prompt more than once */ - setptr(doc->real_path, NULL); + SETPTR(doc->real_path, NULL); } return want_reload; Modified: src/editor.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -271,7 +271,7 @@ void editor_snippets_init(void) /* check for old autocomplete.conf files (backwards compatibility) */ if (! g_file_test(userconfigfile, G_FILE_TEST_IS_REGULAR)) - setptr(userconfigfile, + SETPTR(userconfigfile, g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "autocomplete.conf", NULL)); /* load the actual config files */ @@ -2288,7 +2288,7 @@ static void fix_indentation(GeanyEditor *editor, GString *buf) gchar *str; /* for tabs+spaces mode we want the real tab width, not indent width */ - setptr(whitespace, g_strnfill(sci_get_tab_width(editor->sci), ' ')); + SETPTR(whitespace, g_strnfill(sci_get_tab_width(editor->sci), ' ')); str = g_strdup_printf("^\t*(%s)", whitespace); regex = g_regex_new(str, cflags, 0, NULL); @@ -2355,7 +2355,7 @@ void editor_insert_text_block(GeanyEditor *editor, const gchar *text, gint inser gchar *whitespace; whitespace = g_strnfill(newline_indent_size, ' '); - setptr(whitespace, g_strconcat(nl, whitespace, NULL)); + SETPTR(whitespace, g_strconcat(nl, whitespace, NULL)); utils_string_replace_all(buf, nl, whitespace); g_free(whitespace); } Modified: src/encodings.c 10 files changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -346,7 +346,7 @@ void encodings_select_radio_item(const gchar *charset) encoding = g_match_info_fetch(minfo, 1); geany_debug("Detected encoding by regex search: %s", encoding); - setptr(encoding, g_utf8_strup(encoding, -1)); + SETPTR(encoding, g_utf8_strup(encoding, -1)); } g_match_info_free(minfo); return encoding; @@ -783,7 +783,7 @@ gboolean encodings_is_unicode_charset(const gchar *string) } else { - setptr(buffer->data, converted_text); + SETPTR(buffer->data, converted_text); buffer->len = strlen(converted_text); } } @@ -821,13 +821,13 @@ gboolean encodings_is_unicode_charset(const gchar *string) buffer->data, buffer->size, buffer->enc, FALSE); if (converted_text != NULL) { - setptr(buffer->data, converted_text); + SETPTR(buffer->data, converted_text); buffer->len = strlen(converted_text); } else { /* there was a problem converting data from BOM encoding type */ - setptr(buffer->enc, NULL); + SETPTR(buffer->enc, NULL); buffer->bom = FALSE; } } @@ -855,7 +855,7 @@ gboolean encodings_is_unicode_charset(const gchar *string) g_free(regex_charset); return FALSE; } - setptr(buffer->data, converted_text); + SETPTR(buffer->data, converted_text); buffer->len = strlen(converted_text); } g_free(regex_charset); Modified: src/filetypes.c 26 files changed, 13 insertions(+), 13 deletions(-) =================================================================== @@ -689,7 +689,7 @@ static void setup_config_file_menus(void) f = utils_build_path(app->configdir, "filetype_extensions.conf", NULL); ui_add_config_file_menu_item(f, NULL, NULL); - setptr(f, utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.common", NULL)); + SETPTR(f, utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.common", NULL)); ui_add_config_file_menu_item(f, NULL, NULL); g_free(f); @@ -806,13 +806,13 @@ static gboolean match_basename(gconstpointer pft, gconstpointer user_data) #else lfn = g_strdup(utf8_filename); #endif - setptr(lfn, utils_get_locale_from_utf8(lfn)); + SETPTR(lfn, utils_get_locale_from_utf8(lfn)); path = utils_build_path(app->configdir, GEANY_FILEDEFS_SUBDIR, "filetypes.", NULL); if (g_str_has_prefix(lfn, path)) found = TRUE; - setptr(path, utils_build_path(app->datadir, "filetypes.", NULL)); + SETPTR(path, utils_build_path(app->datadir, "filetypes.", NULL)); if (g_str_has_prefix(lfn, path)) found = TRUE; @@ -837,7 +837,7 @@ static gboolean match_basename(gconstpointer pft, gconstpointer user_data) base_filename = g_path_get_basename(utf8_filename); #ifdef G_OS_WIN32 /* use lower case basename */ - setptr(base_filename, g_utf8_strdown(base_filename, -1)); + SETPTR(base_filename, g_utf8_strdown(base_filename, -1)); #endif ft = filetypes_find(match_basename, base_filename); @@ -1183,31 +1183,31 @@ static void load_settings(guint ft_id, GKeyFile *config, GKeyFile *configh) result = utils_get_setting(string, configh, config, "settings", "extension", NULL); if (result != NULL) { - setptr(filetypes[ft_id]->extension, result); + SETPTR(filetypes[ft_id]->extension, result); } /* read comment notes */ result = utils_get_setting(string, configh, config, "settings", "comment_open", NULL); if (result != NULL) { - setptr(filetypes[ft_id]->comment_open, result); + SETPTR(filetypes[ft_id]->comment_open, result); } result = utils_get_setting(string, configh, config, "settings", "comment_close", NULL); if (result != NULL) { - setptr(filetypes[ft_id]->comment_close, result); + SETPTR(filetypes[ft_id]->comment_close, result); } result = utils_get_setting(string, configh, config, "settings", "comment_single", NULL); if (result != NULL) { - setptr(filetypes[ft_id]->comment_single, result); + SETPTR(filetypes[ft_id]->comment_single, result); } /* import correctly filetypes that use old-style single comments */ else if (! NZV(filetypes[ft_id]->comment_close)) { - setptr(filetypes[ft_id]->comment_single, filetypes[ft_id]->comment_open); + SETPTR(filetypes[ft_id]->comment_single, filetypes[ft_id]->comment_open); filetypes[ft_id]->comment_open = NULL; } @@ -1218,7 +1218,7 @@ static void load_settings(guint ft_id, GKeyFile *config, GKeyFile *configh) result = utils_get_setting(string, configh, config, "settings", "context_action_cmd", NULL); if (result != NULL) { - setptr(filetypes[ft_id]->context_action_cmd, result); + SETPTR(filetypes[ft_id]->context_action_cmd, result); } result = utils_get_setting(string, configh, config, "settings", "tag_parser", NULL); @@ -1393,7 +1393,7 @@ void filetypes_load_config(guint ft_id, gboolean reload) f = filetypes_get_filename(ft, FALSE); load_system_keyfile(config, f, G_KEY_FILE_KEEP_COMMENTS, ft); - setptr(f, filetypes_get_filename(ft, TRUE)); + SETPTR(f, filetypes_get_filename(ft, TRUE)); g_key_file_load_from_file(config_home, f, G_KEY_FILE_KEEP_COMMENTS, NULL); g_free(f); } @@ -1621,7 +1621,7 @@ static void convert_filetype_extensions_to_lower_case(gchar **patterns, gsize le guint i; for (i = 0; i < len; i++) { - setptr(patterns[i], g_ascii_strdown(patterns[i], -1)); + SETPTR(patterns[i], g_ascii_strdown(patterns[i], -1)); } } #endif @@ -1668,7 +1668,7 @@ static void read_group(GKeyFile *config, const gchar *group_name, gint group_id) if (ft->priv->custom && (group_id == GEANY_FILETYPE_GROUP_COMPILED || group_id == GEANY_FILETYPE_GROUP_SCRIPT)) { - setptr(ft->title, NULL); + SETPTR(ft->title, NULL); filetype_make_title(ft, TITLE_SOURCE_FILE); } } Modified: src/highlighting.c 12 files changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -922,7 +922,7 @@ static void get_key_values(GKeyFile *config, const gchar *group, gchar **keys, g gchar *str = g_key_file_get_string(config, group, *keys, NULL); if (str) - setptr(*values, str); + SETPTR(*values, str); keys++; values++; @@ -1179,12 +1179,12 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) /* check if default item */ if (!user_data) { - setptr(editor_prefs.color_scheme, NULL); + SETPTR(editor_prefs.color_scheme, NULL); filetypes_reload(); return; } fname = g_strdup(g_object_get_data(G_OBJECT(menuitem), "colorscheme_file")); - setptr(fname, utils_get_locale_from_utf8(fname)); + SETPTR(fname, utils_get_locale_from_utf8(fname)); /* fname is just the basename from the menu item, so prepend the custom files path */ path = g_build_path(G_DIR_SEPARATOR_S, app->configdir, GEANY_COLORSCHEMES_SUBDIR, fname, NULL); @@ -1196,13 +1196,13 @@ void highlighting_set_styles(ScintillaObject *sci, GeanyFiletype *ft) } if (g_file_test(path, G_FILE_TEST_EXISTS)) { - setptr(editor_prefs.color_scheme, fname); + SETPTR(editor_prefs.color_scheme, fname); fname = NULL; filetypes_reload(); } else { - setptr(fname, utils_get_utf8_from_locale(fname)); + SETPTR(fname, utils_get_utf8_from_locale(fname)); ui_set_statusbar(TRUE, _("Could not find file '%s'."), fname); } g_free(path); @@ -1236,7 +1236,7 @@ static void add_color_scheme_item(GtkWidget *menu, const gchar *fname) path = utils_build_path(app->configdir, GEANY_COLORSCHEMES_SUBDIR, fname, NULL); hkeyfile = utils_key_file_new(path); - setptr(path, utils_build_path(app->datadir, GEANY_COLORSCHEMES_SUBDIR, fname, NULL)); + SETPTR(path, utils_build_path(app->datadir, GEANY_COLORSCHEMES_SUBDIR, fname, NULL)); skeyfile = utils_key_file_new(path); theme_name = utils_get_setting(locale_string, hkeyfile, skeyfile, "theme_info", "name", theme_fn); Modified: src/keybindings.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -156,8 +156,8 @@ if (group->plugin) { /* some plugins e.g. GeanyLua need these fields duplicated */ - setptr(kb->name, g_strdup(kf_name)); - setptr(kb->label, g_strdup(label)); + SETPTR(kb->name, g_strdup(kf_name)); + SETPTR(kb->label, g_strdup(label)); } else { Modified: src/keyfile.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -998,7 +998,7 @@ gboolean configuration_load(void) { /* config file does not (yet) exist, so try to load a global config file which may be */ /* created by distributors */ geany_debug("No user config file found, trying to use global configuration."); - setptr(configfile, utils_build_path(app->datadir, "geany.conf", NULL)); + SETPTR(configfile, utils_build_path(app->datadir, "geany.conf", NULL)); } g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, NULL); g_free(configfile); Modified: src/main.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -721,7 +721,7 @@ static gint setup_config_dir(void) gint mkdir_result = 0; /* convert configdir to locale encoding to avoid troubles */ - setptr(app->configdir, utils_get_locale_from_utf8(app->configdir)); + SETPTR(app->configdir, utils_get_locale_from_utf8(app->configdir)); mkdir_result = create_config_dir(); if (mkdir_result != 0) @@ -736,7 +736,7 @@ static gint setup_config_dir(void) } /* make configdir a real path */ if (g_file_test(app->configdir, G_FILE_TEST_EXISTS)) - setptr(app->configdir, tm_get_real_path(app->configdir)); + SETPTR(app->configdir, tm_get_real_path(app->configdir)); return mkdir_result; } @@ -816,7 +816,7 @@ static gboolean open_cl_files(gint argc, gchar **argv) #ifdef G_OS_WIN32 /* It seems argv elements are encoded in CP1252 on a German Windows */ - setptr(filename, g_locale_to_utf8(filename, -1, NULL, NULL, NULL)); + SETPTR(filename, g_locale_to_utf8(filename, -1, NULL, NULL, NULL)); #endif if (filename && ! main_handle_filename(filename)) { Modified: src/msgwindow.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -641,9 +641,9 @@ static gboolean goto_compiler_file_line(const gchar *filename, gint line, gboole if (cur_dir) { /* we let the user know we couldn't find the parsed filename from the message window */ - setptr(cur_dir, utils_get_locale_from_utf8(cur_dir)); + SETPTR(cur_dir, utils_get_locale_from_utf8(cur_dir)); name = g_path_get_basename(filename); - setptr(name, g_build_path(G_DIR_SEPARATOR_S, cur_dir, name, NULL)); + SETPTR(name, g_build_path(G_DIR_SEPARATOR_S, cur_dir, name, NULL)); g_free(cur_dir); if (g_file_test(name, G_FILE_TEST_EXISTS)) @@ -744,7 +744,7 @@ static void make_absolute(gchar **filename, const gchar *dir) /* add directory */ if (! utils_is_absolute_path(*filename)) - setptr(*filename, g_strconcat(dir, G_DIR_SEPARATOR_S, + SETPTR(*filename, g_strconcat(dir, G_DIR_SEPARATOR_S, *filename + skip_dot_slash, NULL)); } @@ -1049,7 +1049,7 @@ static void msgwin_parse_generic_line(const gchar *string, gchar **filename, gin /* if we aren't sure we got a supposedly correct filename, check it */ if (incertain && ! g_file_test(*filename, G_FILE_TEST_EXISTS)) { - setptr(*filename, NULL); + SETPTR(*filename, NULL); *line = -1; } } Modified: src/notebook.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -238,8 +238,8 @@ static void update_filename_label(void) } else { - setptr(basename, g_markup_printf_escaped ("\n%s", basename)); - setptr(msg, g_strconcat(msg, basename, NULL)); + SETPTR(basename, g_markup_printf_escaped ("\n%s", basename)); + SETPTR(msg, g_strconcat(msg, basename, NULL)); } g_free(basename); } Modified: src/prefs.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -991,7 +991,7 @@ static void kb_update(void) /* Editor settings */ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_toggle_mark"); - setptr(editor_prefs.comment_toggle_mark, + SETPTR(editor_prefs.comment_toggle_mark, gtk_editable_get_chars(GTK_EDITABLE(widget), 0, -1)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_long_line"); @@ -1262,7 +1262,7 @@ static void on_color_button_choose_cb(GtkColorButton *widget, gpointer user_data GdkColor color; gtk_color_button_get_color(widget, &color); - setptr(editor_prefs.long_line_color, utils_get_hex_from_color(&color)); + SETPTR(editor_prefs.long_line_color, utils_get_hex_from_color(&color)); } @@ -1278,7 +1278,7 @@ static void on_prefs_font_choosed(GtkFontButton *widget, gpointer user_data) if (strcmp(fontbtn, interface_prefs.tagbar_font) == 0) break; - setptr(interface_prefs.tagbar_font, g_strdup(fontbtn)); + SETPTR(interface_prefs.tagbar_font, g_strdup(fontbtn)); for (i = 0; i < documents_array->len; i++) { GeanyDocument *doc = documents[i]; @@ -1296,7 +1296,7 @@ static void on_prefs_font_choosed(GtkFontButton *widget, gpointer user_data) { if (strcmp(fontbtn, interface_prefs.msgwin_font) == 0) break; - setptr(interface_prefs.msgwin_font, g_strdup(fontbtn)); + SETPTR(interface_prefs.msgwin_font, g_strdup(fontbtn)); ui_widget_modify_font_from_string(msgwindow.tree_compiler, interface_prefs.msgwin_font); ui_widget_modify_font_from_string(msgwindow.tree_msg, interface_prefs.msgwin_font); ui_widget_modify_font_from_string(msgwindow.tree_status, interface_prefs.msgwin_font); Modified: src/project.c 18 files changed, 9 insertions(+), 9 deletions(-) =================================================================== @@ -333,9 +333,9 @@ static void remove_foreach_project_filetype(gpointer data, gpointer user_data) GeanyFiletype *ft = data; if (ft != NULL) { - setptr(ft->projfilecmds, NULL); - setptr(ft->projexeccmds, NULL); - setptr(ft->projerror_regex_string, NULL); + SETPTR(ft->projfilecmds, NULL); + SETPTR(ft->projexeccmds, NULL); + SETPTR(ft->projerror_regex_string, NULL); ft->project_list_entry = -1; } } @@ -674,7 +674,7 @@ static gboolean update_config(const PropertyDialogElements *e, gboolean new_proj if (! g_path_is_absolute(locale_path)) { /* relative base path, so add base dir of project file name */ gchar *dir = g_path_get_dirname(locale_filename); - setptr(locale_path, g_strconcat(dir, G_DIR_SEPARATOR_S, locale_path, NULL)); + SETPTR(locale_path, g_strconcat(dir, G_DIR_SEPARATOR_S, locale_path, NULL)); g_free(dir); } @@ -720,10 +720,10 @@ static gboolean update_config(const PropertyDialogElements *e, gboolean new_proj } p = app->project; - setptr(p->name, g_strdup(name)); - setptr(p->file_name, g_strdup(file_name)); + SETPTR(p->name, g_strdup(name)); + SETPTR(p->file_name, g_strdup(file_name)); /* use "." if base_path is empty */ - setptr(p->base_path, g_strdup(NZV(base_path) ? base_path : "./")); + SETPTR(p->base_path, g_strdup(NZV(base_path) ? base_path : "./")); if (! new_project) /* save properties specific fields */ { @@ -741,7 +741,7 @@ static gboolean update_config(const PropertyDialogElements *e, gboolean new_proj buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->description)); gtk_text_buffer_get_start_iter(buffer, &start); gtk_text_buffer_get_end_iter(buffer, &end); - setptr(p->description, g_strdup(gtk_text_buffer_get_text(buffer, &start, &end, FALSE))); + SETPTR(p->description, g_strdup(gtk_text_buffer_get_text(buffer, &start, &end, FALSE))); foreach_slist(node, stash_groups) stash_group_update(node->data, e->dialog); @@ -1166,7 +1166,7 @@ void project_apply_prefs(void) const gchar *str; str = gtk_entry_get_text(GTK_ENTRY(path_entry)); - setptr(local_prefs.project_file_path, g_strdup(str)); + SETPTR(local_prefs.project_file_path, g_strdup(str)); } Modified: src/search.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1877,7 +1877,7 @@ static gint find_regex(ScintillaObject *sci, guint pos, GRegex *regex) g_return_val_if_fail(pos <= (guint)sci_get_length(sci), FALSE); /* clear old match */ - setptr(regex_match_text, NULL); + SETPTR(regex_match_text, NULL); /* Warning: any SCI calls will invalidate 'text' after calling SCI_GETCHARACTERPOINTER */ text = (void*)scintilla_send_message(sci, SCI_GETCHARACTERPOINTER, 0, 0); Modified: src/socket.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -415,7 +415,7 @@ static gint socket_fd_open_unix(const gchar *path) { /* if real_path is not writable for us, fall back to ~/.config/geany/geany_socket_*_* */ /* instead of creating a symlink and print a warning */ g_warning("Socket %s could not be written, using %s as fallback.", real_path, path); - setptr(real_path, g_strdup(path)); + SETPTR(real_path, g_strdup(path)); } /* create a symlink in e.g. ~/.config/geany/geany_socket_hostname__0 to /tmp/geany_socket.499602d2 */ else if (symlink(real_path, path) != 0) Modified: src/symbols.c 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1068,12 +1068,12 @@ static void hide_empty_rows(GtkTreeStore *store) ! utils_str_equal(doc->encoding, "UTF-8") && ! utils_str_equal(doc->encoding, "None")) { - setptr(utf8_name, + SETPTR(utf8_name, encodings_convert_to_utf8_from_charset(utf8_name, -1, doc->encoding, TRUE)); } if (utf8_name != NULL) - setptr(utf8_name, g_markup_escape_text(utf8_name, -1)); + SETPTR(utf8_name, g_markup_escape_text(utf8_name, -1)); return utf8_name; } @@ -1740,7 +1740,7 @@ void symbols_show_load_tags_dialog(void) } file_list = utils_get_file_list_full(dir, TRUE, TRUE, NULL); - setptr(dir, utils_build_path(app->datadir, "tags", NULL)); + SETPTR(dir, utils_build_path(app->datadir, "tags", NULL)); list = utils_get_file_list_full(dir, TRUE, TRUE, NULL); g_free(dir); Modified: src/templates.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -94,7 +94,7 @@ static void read_template(const gchar *name, gint id) /* try system if user template doesn't exist */ if (!g_file_test(fname, G_FILE_TEST_EXISTS)) - setptr(fname, g_build_path(G_DIR_SEPARATOR_S, app->datadir, + SETPTR(fname, g_build_path(G_DIR_SEPARATOR_S, app->datadir, GEANY_TEMPLATES_SUBDIR, name, NULL)); templates[id] = read_file(fname); @@ -199,7 +199,7 @@ void templates_replace_common(GString *template, const gchar *fname, gchar *path; ft = filetypes_detect_from_extension(fname); - setptr(fname, utils_get_locale_from_utf8(fname)); + SETPTR(fname, utils_get_locale_from_utf8(fname)); /* fname is just the basename from the menu item, so prepend the custom files path */ path = g_build_path(G_DIR_SEPARATOR_S, app->configdir, GEANY_TEMPLATES_SUBDIR, @@ -220,7 +220,7 @@ void templates_replace_common(GString *template, const gchar *fname, } else { - setptr(fname, utils_get_utf8_from_locale(fname)); + SETPTR(fname, utils_get_utf8_from_locale(fname)); ui_set_statusbar(TRUE, _("Could not find file '%s'."), fname); } g_free(template); @@ -391,7 +391,7 @@ static void make_comment_block(GString *comment_text, gint filetype_idx, guint i if (NZV(frame_start) && frame_start[1] == '*') { /* prefix the string with a space */ - setptr(frame_end, g_strconcat(" ", frame_end, NULL)); + SETPTR(frame_end, g_strconcat(" ", frame_end, NULL)); line_prefix = " *"; } Modified: src/toolbar.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -224,7 +224,7 @@ void toolbar_item_ref(GtkToolItem *item) g_error_free(error); error = NULL; - setptr(filename, utils_build_path(app->datadir, "ui_toolbar.xml", NULL)); + SETPTR(filename, utils_build_path(app->datadir, "ui_toolbar.xml", NULL)); merge_id = gtk_ui_manager_add_ui_from_file(uim, filename, &error); } g_free(filename); Modified: src/ui_utils.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -960,7 +960,7 @@ static gboolean have_tango_icon_theme(void) gchar *theme_name; g_object_get(G_OBJECT(gtk_settings_get_default()), "gtk-icon-theme-name", &theme_name, NULL); - setptr(theme_name, g_utf8_strdown(theme_name, -1)); + SETPTR(theme_name, g_utf8_strdown(theme_name, -1)); result = (strstr(theme_name, "tango") != NULL); checked = TRUE; Modified: src/utils.c 8 files changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -92,7 +92,7 @@ void utils_open_browser(const gchar *uri) if (new_cmd == NULL) /* user canceled */ again = FALSE; else - setptr(tool_prefs.browser_cmd, new_cmd); + SETPTR(tool_prefs.browser_cmd, new_cmd); } g_free(cmdline); } @@ -454,7 +454,7 @@ gdouble utils_scale_round(gdouble val, gdouble factor) { down = g_locale_to_utf8(str, -1, NULL, NULL, NULL); if (down) - setptr(down, g_utf8_strdown(down, -1)); + SETPTR(down, g_utf8_strdown(down, -1)); } return down; @@ -2000,7 +2000,7 @@ static void utils_slist_remove_next(GSList *node) { utils_mkdir(path, FALSE); } - setptr(path, g_build_path(G_DIR_SEPARATOR_S, app->datadir, subdir, NULL)); + SETPTR(path, g_build_path(G_DIR_SEPARATOR_S, app->datadir, subdir, NULL)); syslist = utils_get_file_list_full(path, FALSE, FALSE, NULL); /* merge lists */ list = g_slist_concat(list, syslist); @@ -2044,7 +2044,7 @@ static void utils_slist_remove_next(GSList *node) if (suffix != NULL) { - setptr(uri, g_strconcat(uri, suffix, NULL)); + SETPTR(uri, g_strconcat(uri, suffix, NULL)); } return uri; Modified: src/vte.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -712,7 +712,7 @@ G_MODULE_EXPORT void on_term_font_set(GtkFontButton *widget, gpointer user_data) if (! utils_str_equal(fontbtn, vc->font)) { - setptr(vc->font, g_strdup(gtk_font_button_get_font_name(widget))); + SETPTR(vc->font, g_strdup(gtk_font_button_get_font_name(widget))); vte_apply_user_settings(); } } @@ -803,7 +803,7 @@ void vte_send_selection_to_vte(void) this is disabled by default as it could cause all sorts of damage. */ if (text[len-1] != '\n' && text[len-1] != '\r') { - setptr(text, g_strconcat(text, "\n", NULL)); + SETPTR(text, g_strconcat(text, "\n", NULL)); len++; } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 10 months

[geany/geany] ed66c2: Remove LW() macro

by Nick Treleaven

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Wed, 25 Jan 2012 13:46:31 Commit: ed66c2b29336d1edbaad4e7adaf4cf0737d02ccf https://github.com/geany/geany/commit/ed66c2b29336d1edbaad4e7adaf4cf0737d02… Log Message: ----------- Remove LW() macro Modified Paths: -------------- src/keybindings.c Modified: src/keybindings.c 424 files changed, 216 insertions(+), 208 deletions(-) =================================================================== @@ -197,9 +197,17 @@ static void add_kb_group(GeanyKeyGroup *group, } -/* Lookup a widget in the main window */ -#define LW(widget_name) \ - ui_lookup_widget(main_widgets.window, G_STRINGIFY(widget_name)) +static void add_kb(GeanyKeyGroup *group, gsize key_id, + GeanyKeyCallback callback, guint key, GdkModifierType mod, + const gchar *kf_name, const gchar *label, const gchar *widget_name) +{ + GtkWidget *widget = widget_name ? + ui_lookup_widget(main_widgets.window, widget_name) : NULL; + + keybindings_set_item(group, key_id, callback, + key, mod, kf_name, label, widget); +} + #define ADD_KB_GROUP(group_id, label, callback) \ add_kb_group(keybindings_get_core_group(group_id),\ @@ -234,365 +242,365 @@ static void init_default_kb(void) group = keybindings_get_core_group(GEANY_KEY_GROUP_FILE); - keybindings_set_item(group, GEANY_KEYS_FILE_NEW, NULL, + add_kb(group, GEANY_KEYS_FILE_NEW, NULL, GDK_n, GDK_CONTROL_MASK, "menu_new", _("New"), NULL); - keybindings_set_item(group, GEANY_KEYS_FILE_OPEN, NULL, + add_kb(group, GEANY_KEYS_FILE_OPEN, NULL, GDK_o, GDK_CONTROL_MASK, "menu_open", _("Open"), NULL); - keybindings_set_item(group, GEANY_KEYS_FILE_OPENSELECTED, NULL, + add_kb(group, GEANY_KEYS_FILE_OPENSELECTED, NULL, GDK_o, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "menu_open_selected", - _("Open selected file"), LW(menu_open_selected_file1)); - keybindings_set_item(group, GEANY_KEYS_FILE_SAVE, NULL, + _("Open selected file"), "menu_open_selected_file1"); + add_kb(group, GEANY_KEYS_FILE_SAVE, NULL, GDK_s, GDK_CONTROL_MASK, "menu_save", _("Save"), NULL); - keybindings_set_item(group, GEANY_KEYS_FILE_SAVEAS, NULL, - 0, 0, "menu_saveas", _("Save as"), LW(menu_save_as1)); - keybindings_set_item(group, GEANY_KEYS_FILE_SAVEALL, NULL, + add_kb(group, GEANY_KEYS_FILE_SAVEAS, NULL, + 0, 0, "menu_saveas", _("Save as"), "menu_save_as1"); + add_kb(group, GEANY_KEYS_FILE_SAVEALL, NULL, GDK_S, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "menu_saveall", _("Save all"), - LW(menu_save_all1)); - keybindings_set_item(group, GEANY_KEYS_FILE_PRINT, NULL, - GDK_p, GDK_CONTROL_MASK, "menu_print", _("Print"), LW(print1)); - keybindings_set_item(group, GEANY_KEYS_FILE_CLOSE, NULL, - GDK_w, GDK_CONTROL_MASK, "menu_close", _("Close"), LW(menu_close1)); - keybindings_set_item(group, GEANY_KEYS_FILE_CLOSEALL, NULL, + "menu_save_all1"); + add_kb(group, GEANY_KEYS_FILE_PRINT, NULL, + GDK_p, GDK_CONTROL_MASK, "menu_print", _("Print"), "print1"); + add_kb(group, GEANY_KEYS_FILE_CLOSE, NULL, + GDK_w, GDK_CONTROL_MASK, "menu_close", _("Close"), "menu_close1"); + add_kb(group, GEANY_KEYS_FILE_CLOSEALL, NULL, GDK_w, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_closeall", _("Close all"), - LW(menu_close_all1)); - keybindings_set_item(group, GEANY_KEYS_FILE_RELOAD, NULL, - GDK_r, GDK_CONTROL_MASK, "menu_reloadfile", _("Reload file"), LW(menu_reload1)); - keybindings_set_item(group, GEANY_KEYS_FILE_OPENLASTTAB, NULL, + "menu_close_all1"); + add_kb(group, GEANY_KEYS_FILE_RELOAD, NULL, + GDK_r, GDK_CONTROL_MASK, "menu_reloadfile", _("Reload file"), "menu_reload1"); + add_kb(group, GEANY_KEYS_FILE_OPENLASTTAB, NULL, 0, 0, "file_openlasttab", _("Re-open last closed tab"), NULL); group = keybindings_get_core_group(GEANY_KEY_GROUP_PROJECT); - keybindings_set_item(group, GEANY_KEYS_PROJECT_NEW, NULL, - 0, 0, "project_new", _("New"), LW(project_new1)); - keybindings_set_item(group, GEANY_KEYS_PROJECT_OPEN, NULL, - 0, 0, "project_open", _("Open"), LW(project_open1)); - keybindings_set_item(group, GEANY_KEYS_PROJECT_PROPERTIES, NULL, + add_kb(group, GEANY_KEYS_PROJECT_NEW, NULL, + 0, 0, "project_new", _("New"), "project_new1"); + add_kb(group, GEANY_KEYS_PROJECT_OPEN, NULL, + 0, 0, "project_open", _("Open"), "project_open1"); + add_kb(group, GEANY_KEYS_PROJECT_PROPERTIES, NULL, 0, 0, "project_properties", - ui_lookup_stock_label(GTK_STOCK_PROPERTIES), LW(project_properties1)); - keybindings_set_item(group, GEANY_KEYS_PROJECT_CLOSE, NULL, - 0, 0, "project_close", _("Close"), LW(project_close1)); + ui_lookup_stock_label(GTK_STOCK_PROPERTIES), "project_properties1"); + add_kb(group, GEANY_KEYS_PROJECT_CLOSE, NULL, + 0, 0, "project_close", _("Close"), "project_close1"); group = keybindings_get_core_group(GEANY_KEY_GROUP_EDITOR); - keybindings_set_item(group, GEANY_KEYS_EDITOR_UNDO, NULL, - GDK_z, GDK_CONTROL_MASK, "menu_undo", _("Undo"), LW(menu_undo2)); - keybindings_set_item(group, GEANY_KEYS_EDITOR_REDO, NULL, - GDK_y, GDK_CONTROL_MASK, "menu_redo", _("Redo"), LW(menu_redo2)); - keybindings_set_item(group, GEANY_KEYS_EDITOR_DUPLICATELINE, NULL, + add_kb(group, GEANY_KEYS_EDITOR_UNDO, NULL, + GDK_z, GDK_CONTROL_MASK, "menu_undo", _("Undo"), "menu_undo2"); + add_kb(group, GEANY_KEYS_EDITOR_REDO, NULL, + GDK_y, GDK_CONTROL_MASK, "menu_redo", _("Redo"), "menu_redo2"); + add_kb(group, GEANY_KEYS_EDITOR_DUPLICATELINE, NULL, GDK_d, GDK_CONTROL_MASK, "edit_duplicateline", _("_Duplicate Line or Selection"), - LW(duplicate_line_or_selection1)); - keybindings_set_item(group, GEANY_KEYS_EDITOR_DELETELINE, NULL, + "duplicate_line_or_selection1"); + add_kb(group, GEANY_KEYS_EDITOR_DELETELINE, NULL, GDK_k, GDK_CONTROL_MASK, "edit_deleteline", _("_Delete Current Line(s)"), - LW(delete_current_lines1)); - keybindings_set_item(group, GEANY_KEYS_EDITOR_DELETELINETOEND, NULL, + "delete_current_lines1"); + add_kb(group, GEANY_KEYS_EDITOR_DELETELINETOEND, NULL, GDK_Delete, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_deletelinetoend", _("Delete to line end"), NULL); /* transpose may fit better in format group */ - keybindings_set_item(group, GEANY_KEYS_EDITOR_TRANSPOSELINE, NULL, + add_kb(group, GEANY_KEYS_EDITOR_TRANSPOSELINE, NULL, 0, 0, "edit_transposeline", _("_Transpose Current Line"), - LW(transpose_current_line1)); - keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLTOLINE, NULL, + "transpose_current_line1"); + add_kb(group, GEANY_KEYS_EDITOR_SCROLLTOLINE, NULL, GDK_l, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "edit_scrolltoline", _("Scroll to current line"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLLINEUP, NULL, + add_kb(group, GEANY_KEYS_EDITOR_SCROLLLINEUP, NULL, GDK_Up, GDK_MOD1_MASK, "edit_scrolllineup", _("Scroll up the view by one line"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_SCROLLLINEDOWN, NULL, + add_kb(group, GEANY_KEYS_EDITOR_SCROLLLINEDOWN, NULL, GDK_Down, GDK_MOD1_MASK, "edit_scrolllinedown", _("Scroll down the view by one line"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_COMPLETESNIPPET, NULL, + add_kb(group, GEANY_KEYS_EDITOR_COMPLETESNIPPET, NULL, GDK_Tab, 0, "edit_completesnippet", _("Complete snippet"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_SNIPPETNEXTCURSOR, NULL, + add_kb(group, GEANY_KEYS_EDITOR_SNIPPETNEXTCURSOR, NULL, 0, 0, "move_snippetnextcursor", _("Move cursor in snippet"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_SUPPRESSSNIPPETCOMPLETION, NULL, + add_kb(group, GEANY_KEYS_EDITOR_SUPPRESSSNIPPETCOMPLETION, NULL, 0, 0, "edit_suppresssnippetcompletion", _("Suppress snippet completion"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_CONTEXTACTION, NULL, + add_kb(group, GEANY_KEYS_EDITOR_CONTEXTACTION, NULL, 0, 0, "popup_contextaction", _("Context Action"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_AUTOCOMPLETE, NULL, + add_kb(group, GEANY_KEYS_EDITOR_AUTOCOMPLETE, NULL, GDK_space, GDK_CONTROL_MASK, "edit_autocomplete", _("Complete word"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_CALLTIP, NULL, + add_kb(group, GEANY_KEYS_EDITOR_CALLTIP, NULL, GDK_space, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_calltip", _("Show calltip"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_MACROLIST, NULL, + add_kb(group, GEANY_KEYS_EDITOR_MACROLIST, NULL, GDK_Return, GDK_CONTROL_MASK, "edit_macrolist", _("Show macro list"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_WORDPARTCOMPLETION, NULL, + add_kb(group, GEANY_KEYS_EDITOR_WORDPARTCOMPLETION, NULL, GDK_Tab, 0, "edit_wordpartcompletion", _("Word part completion"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_MOVELINEUP, NULL, + add_kb(group, GEANY_KEYS_EDITOR_MOVELINEUP, NULL, GDK_Page_Up, GDK_MOD1_MASK, "edit_movelineup", _("Move line(s) up"), NULL); - keybindings_set_item(group, GEANY_KEYS_EDITOR_MOVELINEDOWN, NULL, + add_kb(group, GEANY_KEYS_EDITOR_MOVELINEDOWN, NULL, GDK_Page_Down, GDK_MOD1_MASK, "edit_movelinedown", _("Move line(s) down"), NULL); group = keybindings_get_core_group(GEANY_KEY_GROUP_CLIPBOARD); - keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_CUT, NULL, + add_kb(group, GEANY_KEYS_CLIPBOARD_CUT, NULL, GDK_x, GDK_CONTROL_MASK, "menu_cut", _("Cut"), NULL); - keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_COPY, NULL, + add_kb(group, GEANY_KEYS_CLIPBOARD_COPY, NULL, GDK_c, GDK_CONTROL_MASK, "menu_copy", _("Copy"), NULL); - keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_PASTE, NULL, + add_kb(group, GEANY_KEYS_CLIPBOARD_PASTE, NULL, GDK_v, GDK_CONTROL_MASK, "menu_paste", _("Paste"), NULL); - keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_COPYLINE, NULL, + add_kb(group, GEANY_KEYS_CLIPBOARD_COPYLINE, NULL, GDK_c, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_copyline", _("_Copy Current Line(s)"), - LW(copy_current_lines1)); - keybindings_set_item(group, GEANY_KEYS_CLIPBOARD_CUTLINE, NULL, + "copy_current_lines1"); + add_kb(group, GEANY_KEYS_CLIPBOARD_CUTLINE, NULL, GDK_x, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "edit_cutline", _("_Cut Current Line(s)"), - LW(cut_current_lines1)); + "cut_current_lines1"); group = keybindings_get_core_group(GEANY_KEY_GROUP_SELECT); - keybindings_set_item(group, GEANY_KEYS_SELECT_ALL, NULL, - GDK_a, GDK_CONTROL_MASK, "menu_selectall", _("Select All"), LW(menu_select_all1)); - keybindings_set_item(group, GEANY_KEYS_SELECT_WORD, NULL, + add_kb(group, GEANY_KEYS_SELECT_ALL, NULL, + GDK_a, GDK_CONTROL_MASK, "menu_selectall", _("Select All"), "menu_select_all1"); + add_kb(group, GEANY_KEYS_SELECT_WORD, NULL, GDK_w, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectword", _("Select current word"), NULL); - keybindings_set_item(group, GEANY_KEYS_SELECT_LINE, NULL, + add_kb(group, GEANY_KEYS_SELECT_LINE, NULL, GDK_l, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectline", _("_Select Current Line(s)"), - LW(select_current_lines1)); - keybindings_set_item(group, GEANY_KEYS_SELECT_PARAGRAPH, NULL, + "select_current_lines1"); + add_kb(group, GEANY_KEYS_SELECT_PARAGRAPH, NULL, GDK_p, GDK_SHIFT_MASK | GDK_MOD1_MASK, "edit_selectparagraph", _("_Select Current Paragraph"), - LW(select_current_paragraph1)); - keybindings_set_item(group, GEANY_KEYS_SELECT_WORDPARTLEFT, NULL, + "select_current_paragraph1"); + add_kb(group, GEANY_KEYS_SELECT_WORDPARTLEFT, NULL, 0, 0, "edit_selectwordpartleft", _("Select to previous word part"), NULL); - keybindings_set_item(group, GEANY_KEYS_SELECT_WORDPARTRIGHT, NULL, + add_kb(group, GEANY_KEYS_SELECT_WORDPARTRIGHT, NULL, 0, 0, "edit_selectwordpartright", _("Select to next word part"), NULL); group = keybindings_get_core_group(GEANY_KEY_GROUP_FORMAT); - keybindings_set_item(group, GEANY_KEYS_FORMAT_TOGGLECASE, NULL, + add_kb(group, GEANY_KEYS_FORMAT_TOGGLECASE, NULL, GDK_u, GDK_CONTROL_MASK | GDK_MOD1_MASK, "edit_togglecase", - _("T_oggle Case of Selection"), LW(menu_toggle_case2)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_COMMENTLINETOGGLE, NULL, + _("T_oggle Case of Selection"), "menu_toggle_case2"); + add_kb(group, GEANY_KEYS_FORMAT_COMMENTLINETOGGLE, NULL, GDK_e, GDK_CONTROL_MASK, "edit_commentlinetoggle", _("Toggle line commentation"), - LW(menu_toggle_line_commentation1)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_COMMENTLINE, NULL, - 0, 0, "edit_commentline", _("Comment line(s)"), LW(menu_comment_line1)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_UNCOMMENTLINE, NULL, - 0, 0, "edit_uncommentline", _("Uncomment line(s)"), LW(menu_uncomment_line1)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_INCREASEINDENT, NULL, + "menu_toggle_line_commentation1"); + add_kb(group, GEANY_KEYS_FORMAT_COMMENTLINE, NULL, + 0, 0, "edit_commentline", _("Comment line(s)"), "menu_comment_line1"); + add_kb(group, GEANY_KEYS_FORMAT_UNCOMMENTLINE, NULL, + 0, 0, "edit_uncommentline", _("Uncomment line(s)"), "menu_uncomment_line1"); + add_kb(group, GEANY_KEYS_FORMAT_INCREASEINDENT, NULL, GDK_i, GDK_CONTROL_MASK, "edit_increaseindent", _("Increase indent"), - LW(menu_increase_indent1)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_DECREASEINDENT, NULL, + "menu_increase_indent1"); + add_kb(group, GEANY_KEYS_FORMAT_DECREASEINDENT, NULL, GDK_u, GDK_CONTROL_MASK, "edit_decreaseindent", _("Decrease indent"), - LW(menu_decrease_indent1)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_INCREASEINDENTBYSPACE, NULL, + "menu_decrease_indent1"); + add_kb(group, GEANY_KEYS_FORMAT_INCREASEINDENTBYSPACE, NULL, 0, 0, "edit_increaseindentbyspace", _("Increase indent by one space"), NULL); - keybindings_set_item(group, GEANY_KEYS_FORMAT_DECREASEINDENTBYSPACE, NULL, + add_kb(group, GEANY_KEYS_FORMAT_DECREASEINDENTBYSPACE, NULL, 0, 0, "edit_decreaseindentbyspace", _("Decrease indent by one space"), NULL); - keybindings_set_item(group, GEANY_KEYS_FORMAT_AUTOINDENT, NULL, - 0, 0, "edit_autoindent", _("_Smart Line Indent"), LW(smart_line_indent1)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD1, NULL, + add_kb(group, GEANY_KEYS_FORMAT_AUTOINDENT, NULL, + 0, 0, "edit_autoindent", _("_Smart Line Indent"), "smart_line_indent1"); + add_kb(group, GEANY_KEYS_FORMAT_SENDTOCMD1, NULL, GDK_1, GDK_CONTROL_MASK, "edit_sendtocmd1", _("Send to Custom Command 1"), NULL); - keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD2, NULL, + add_kb(group, GEANY_KEYS_FORMAT_SENDTOCMD2, NULL, GDK_2, GDK_CONTROL_MASK, "edit_sendtocmd2", _("Send to Custom Command 2"), NULL); - keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOCMD3, NULL, + add_kb(group, GEANY_KEYS_FORMAT_SENDTOCMD3, NULL, GDK_3, GDK_CONTROL_MASK, "edit_sendtocmd3", _("Send to Custom Command 3"), NULL); /* may fit better in editor group */ - keybindings_set_item(group, GEANY_KEYS_FORMAT_SENDTOVTE, NULL, - 0, 0, "edit_sendtovte", _("_Send Selection to Terminal"), LW(send_selection_to_vte1)); - keybindings_set_item(group, GEANY_KEYS_FORMAT_REFLOWPARAGRAPH, NULL, + add_kb(group, GEANY_KEYS_FORMAT_SENDTOVTE, NULL, + 0, 0, "edit_sendtovte", _("_Send Selection to Terminal"), "send_selection_to_vte1"); + add_kb(group, GEANY_KEYS_FORMAT_REFLOWPARAGRAPH, NULL, GDK_j, GDK_CONTROL_MASK, "format_reflowparagraph", _("_Reflow Lines/Block"), - LW(reflow_lines_block1)); + "reflow_lines_block1"); group = keybindings_get_core_group(GEANY_KEY_GROUP_INSERT); - keybindings_set_item(group, GEANY_KEYS_INSERT_DATE, NULL, + add_kb(group, GEANY_KEYS_INSERT_DATE, NULL, GDK_d, GDK_SHIFT_MASK | GDK_MOD1_MASK, "menu_insert_date", _("Insert date"), - LW(insert_date_custom1)); - keybindings_set_item(group, GEANY_KEYS_INSERT_ALTWHITESPACE, NULL, + "insert_date_custom1"); + add_kb(group, GEANY_KEYS_INSERT_ALTWHITESPACE, NULL, 0, 0, "edit_insertwhitespace", _("_Insert Alternative White Space"), - LW(insert_alternative_white_space1)); - keybindings_set_item(group, GEANY_KEYS_INSERT_LINEBEFORE, NULL, + "insert_alternative_white_space1"); + add_kb(group, GEANY_KEYS_INSERT_LINEBEFORE, NULL, 0, 0, "edit_insertlinebefore", _("Insert New Line Before Current"), NULL); - keybindings_set_item(group, GEANY_KEYS_INSERT_LINEAFTER, NULL, + add_kb(group, GEANY_KEYS_INSERT_LINEAFTER, NULL, 0, 0, "edit_insertlineafter", _("Insert New Line After Current"), NULL); group = keybindings_get_core_group(GEANY_KEY_GROUP_SETTINGS); - keybindings_set_item(group, GEANY_KEYS_SETTINGS_PREFERENCES, cb_func_menu_preferences, + add_kb(group, GEANY_KEYS_SETTINGS_PREFERENCES, cb_func_menu_preferences, GDK_p, GDK_CONTROL_MASK | GDK_MOD1_MASK, "menu_preferences", _("Preferences"), - LW(preferences1)); - keybindings_set_item(group, GEANY_KEYS_SETTINGS_PLUGINPREFERENCES, cb_func_menu_preferences, - 0, 0, "menu_pluginpreferences", _("P_lugin Preferences"), LW(plugin_preferences1)); + "preferences1"); + add_kb(group, GEANY_KEYS_SETTINGS_PLUGINPREFERENCES, cb_func_menu_preferences, + 0, 0, "menu_pluginpreferences", _("P_lugin Preferences"), "plugin_preferences1"); group = keybindings_get_core_group(GEANY_KEY_GROUP_SEARCH); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FIND, NULL, - GDK_f, GDK_CONTROL_MASK, "menu_find", _("Find"), LW(find1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDNEXT, NULL, - GDK_g, GDK_CONTROL_MASK, "menu_findnext", _("Find Next"), LW(find_next1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDPREVIOUS, NULL, + add_kb(group, GEANY_KEYS_SEARCH_FIND, NULL, + GDK_f, GDK_CONTROL_MASK, "menu_find", _("Find"), "find1"); + add_kb(group, GEANY_KEYS_SEARCH_FINDNEXT, NULL, + GDK_g, GDK_CONTROL_MASK, "menu_findnext", _("Find Next"), "find_next1"); + add_kb(group, GEANY_KEYS_SEARCH_FINDPREVIOUS, NULL, GDK_g, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_findprevious", _("Find Previous"), - LW(find_previous1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDNEXTSEL, NULL, - 0, 0, "menu_findnextsel", _("Find Next _Selection"), LW(find_nextsel1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDPREVSEL, NULL, - 0, 0, "menu_findprevsel", _("Find Pre_vious Selection"), LW(find_prevsel1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_REPLACE, NULL, - GDK_h, GDK_CONTROL_MASK, "menu_replace", _("Replace"), LW(replace1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDINFILES, NULL, GDK_f, + "find_previous1"); + add_kb(group, GEANY_KEYS_SEARCH_FINDNEXTSEL, NULL, + 0, 0, "menu_findnextsel", _("Find Next _Selection"), "find_nextsel1"); + add_kb(group, GEANY_KEYS_SEARCH_FINDPREVSEL, NULL, + 0, 0, "menu_findprevsel", _("Find Pre_vious Selection"), "find_prevsel1"); + add_kb(group, GEANY_KEYS_SEARCH_REPLACE, NULL, + GDK_h, GDK_CONTROL_MASK, "menu_replace", _("Replace"), "replace1"); + add_kb(group, GEANY_KEYS_SEARCH_FINDINFILES, NULL, GDK_f, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "menu_findinfiles", _("Find in Files"), - LW(find_in_files1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_NEXTMESSAGE, NULL, - 0, 0, "menu_nextmessage", _("Next Message"), LW(next_message1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_PREVIOUSMESSAGE, NULL, - 0, 0, "menu_previousmessage", _("Previous Message"), LW(previous_message1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDUSAGE, NULL, + "find_in_files1"); + add_kb(group, GEANY_KEYS_SEARCH_NEXTMESSAGE, NULL, + 0, 0, "menu_nextmessage", _("Next Message"), "next_message1"); + add_kb(group, GEANY_KEYS_SEARCH_PREVIOUSMESSAGE, NULL, + 0, 0, "menu_previousmessage", _("Previous Message"), "previous_message1"); + add_kb(group, GEANY_KEYS_SEARCH_FINDUSAGE, NULL, GDK_e, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "popup_findusage", - _("Find Usage"), LW(find_usage1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, NULL, + _("Find Usage"), "find_usage1"); + add_kb(group, GEANY_KEYS_SEARCH_FINDDOCUMENTUSAGE, NULL, GDK_d, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "popup_finddocumentusage", - _("Find Document Usage"), LW(find_document_usage1)); - keybindings_set_item(group, GEANY_KEYS_SEARCH_MARKALL, NULL, - GDK_m, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "find_markall", _("_Mark All"), LW(mark_all1)); + _("Find Document Usage"), "find_document_usage1"); + add_kb(group, GEANY_KEYS_SEARCH_MARKALL, NULL, + GDK_m, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "find_markall", _("_Mark All"), "mark_all1"); group = keybindings_get_core_group(GEANY_KEY_GROUP_GOTO); - keybindings_set_item(group, GEANY_KEYS_GOTO_BACK, NULL, + add_kb(group, GEANY_KEYS_GOTO_BACK, NULL, GDK_Left, GDK_MOD1_MASK, "nav_back", _("Navigate back a location"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_FORWARD, NULL, + add_kb(group, GEANY_KEYS_GOTO_FORWARD, NULL, GDK_Right, GDK_MOD1_MASK, "nav_forward", _("Navigate forward a location"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_LINE, NULL, - GDK_l, GDK_CONTROL_MASK, "menu_gotoline", _("Go to Line"), LW(go_to_line1)); - keybindings_set_item(group, GEANY_KEYS_GOTO_MATCHINGBRACE, NULL, + add_kb(group, GEANY_KEYS_GOTO_LINE, NULL, + GDK_l, GDK_CONTROL_MASK, "menu_gotoline", _("Go to Line"), "go_to_line1"); + add_kb(group, GEANY_KEYS_GOTO_MATCHINGBRACE, NULL, GDK_b, GDK_CONTROL_MASK, "edit_gotomatchingbrace", _("Go to matching brace"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_TOGGLEMARKER, NULL, + add_kb(group, GEANY_KEYS_GOTO_TOGGLEMARKER, NULL, GDK_m, GDK_CONTROL_MASK, "edit_togglemarker", _("Toggle marker"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_NEXTMARKER, NULL, + add_kb(group, GEANY_KEYS_GOTO_NEXTMARKER, NULL, GDK_period, GDK_CONTROL_MASK, "edit_gotonextmarker", - _("_Go to Next Marker"), LW(go_to_next_marker1)); - keybindings_set_item(group, GEANY_KEYS_GOTO_PREVIOUSMARKER, NULL, + _("_Go to Next Marker"), "go_to_next_marker1"); + add_kb(group, GEANY_KEYS_GOTO_PREVIOUSMARKER, NULL, GDK_comma, GDK_CONTROL_MASK, "edit_gotopreviousmarker", - _("_Go to Previous Marker"), LW(go_to_previous_marker1)); - keybindings_set_item(group, GEANY_KEYS_GOTO_TAGDEFINITION, NULL, + _("_Go to Previous Marker"), "go_to_previous_marker1"); + add_kb(group, GEANY_KEYS_GOTO_TAGDEFINITION, NULL, GDK_t, GDK_CONTROL_MASK, "popup_gototagdefinition", - _("Go to Tag Definition"), LW(goto_tag_definition1)); - keybindings_set_item(group, GEANY_KEYS_GOTO_TAGDECLARATION, NULL, + _("Go to Tag Definition"), "goto_tag_definition1"); + add_kb(group, GEANY_KEYS_GOTO_TAGDECLARATION, NULL, GDK_t, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "popup_gototagdeclaration", - _("Go to Tag Declaration"), LW(goto_tag_declaration1)); - keybindings_set_item(group, GEANY_KEYS_GOTO_LINESTART, NULL, + _("Go to Tag Declaration"), "goto_tag_declaration1"); + add_kb(group, GEANY_KEYS_GOTO_LINESTART, NULL, GDK_Home, 0, "edit_gotolinestart", _("Go to Start of Line"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_LINEEND, NULL, + add_kb(group, GEANY_KEYS_GOTO_LINEEND, NULL, GDK_End, 0, "edit_gotolineend", _("Go to End of Line"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_LINEENDVISUAL, NULL, + add_kb(group, GEANY_KEYS_GOTO_LINEENDVISUAL, NULL, GDK_End, GDK_MOD1_MASK, "edit_gotolineendvisual", _("Go to End of Display Line"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_PREVWORDPART, NULL, + add_kb(group, GEANY_KEYS_GOTO_PREVWORDPART, NULL, GDK_slash, GDK_CONTROL_MASK, "edit_prevwordstart", _("Go to Previous Word Part"), NULL); - keybindings_set_item(group, GEANY_KEYS_GOTO_NEXTWORDPART, NULL, + add_kb(group, GEANY_KEYS_GOTO_NEXTWORDPART, NULL, GDK_backslash, GDK_CONTROL_MASK, "edit_nextwordstart", _("Go to Next Word Part"), NULL); group = keybindings_get_core_group(GEANY_KEY_GROUP_VIEW); - keybindings_set_item(group, GEANY_KEYS_VIEW_TOGGLEALL, NULL, + add_kb(group, GEANY_KEYS_VIEW_TOGGLEALL, NULL, 0, 0, "menu_toggleall", _("Toggle All Additional Widgets"), - LW(menu_toggle_all_additional_widgets1)); - keybindings_set_item(group, GEANY_KEYS_VIEW_FULLSCREEN, cb_func_menu_fullscreen, - GDK_F11, 0, "menu_fullscreen", _("Fullscreen"), LW(menu_fullscreen1)); - keybindings_set_item(group, GEANY_KEYS_VIEW_MESSAGEWINDOW, cb_func_menu_messagewindow, + "menu_toggle_all_additional_widgets1"); + add_kb(group, GEANY_KEYS_VIEW_FULLSCREEN, cb_func_menu_fullscreen, + GDK_F11, 0, "menu_fullscreen", _("Fullscreen"), "menu_fullscreen1"); + add_kb(group, GEANY_KEYS_VIEW_MESSAGEWINDOW, cb_func_menu_messagewindow, 0, 0, "menu_messagewindow", _("Toggle Messages Window"), - LW(menu_show_messages_window1)); - keybindings_set_item(group, GEANY_KEYS_VIEW_SIDEBAR, NULL, - 0, 0, "toggle_sidebar", _("Toggle Sidebar"), LW(menu_show_sidebar1)); - keybindings_set_item(group, GEANY_KEYS_VIEW_ZOOMIN, NULL, - GDK_plus, GDK_CONTROL_MASK, "menu_zoomin", _("Zoom In"), LW(menu_zoom_in1)); - keybindings_set_item(group, GEANY_KEYS_VIEW_ZOOMOUT, NULL, - GDK_minus, GDK_CONTROL_MASK, "menu_zoomout", _("Zoom Out"), LW(menu_zoom_out1)); - keybindings_set_item(group, GEANY_KEYS_VIEW_ZOOMRESET, NULL, - GDK_0, GDK_CONTROL_MASK, "normal_size", _("Zoom Reset"), LW(normal_size1)); + "menu_show_messages_window1"); + add_kb(group, GEANY_KEYS_VIEW_SIDEBAR, NULL, + 0, 0, "toggle_sidebar", _("Toggle Sidebar"), "menu_show_sidebar1"); + add_kb(group, GEANY_KEYS_VIEW_ZOOMIN, NULL, + GDK_plus, GDK_CONTROL_MASK, "menu_zoomin", _("Zoom In"), "menu_zoom_in1"); + add_kb(group, GEANY_KEYS_VIEW_ZOOMOUT, NULL, + GDK_minus, GDK_CONTROL_MASK, "menu_zoomout", _("Zoom Out"), "menu_zoom_out1"); + add_kb(group, GEANY_KEYS_VIEW_ZOOMRESET, NULL, + GDK_0, GDK_CONTROL_MASK, "normal_size", _("Zoom Reset"), "normal_size1"); group = keybindings_get_core_group(GEANY_KEY_GROUP_FOCUS); - keybindings_set_item(group, GEANY_KEYS_FOCUS_EDITOR, NULL, + add_kb(group, GEANY_KEYS_FOCUS_EDITOR, NULL, GDK_F2, 0, "switch_editor", _("Switch to Editor"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_SEARCHBAR, NULL, + add_kb(group, GEANY_KEYS_FOCUS_SEARCHBAR, NULL, GDK_F7, 0, "switch_search_bar", _("Switch to Search Bar"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_MESSAGE_WINDOW, NULL, + add_kb(group, GEANY_KEYS_FOCUS_MESSAGE_WINDOW, NULL, 0, 0, "switch_message_window", _("Switch to Message Window"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_COMPILER, NULL, + add_kb(group, GEANY_KEYS_FOCUS_COMPILER, NULL, 0, 0, "switch_compiler", _("Switch to Compiler"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_MESSAGES, NULL, + add_kb(group, GEANY_KEYS_FOCUS_MESSAGES, NULL, 0, 0, "switch_messages", _("Switch to Messages"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_SCRIBBLE, NULL, + add_kb(group, GEANY_KEYS_FOCUS_SCRIBBLE, NULL, GDK_F6, 0, "switch_scribble", _("Switch to Scribble"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_VTE, NULL, + add_kb(group, GEANY_KEYS_FOCUS_VTE, NULL, GDK_F4, 0, "switch_vte", _("Switch to VTE"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_SIDEBAR, NULL, + add_kb(group, GEANY_KEYS_FOCUS_SIDEBAR, NULL, 0, 0, "switch_sidebar", _("Switch to Sidebar"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_SIDEBAR_SYMBOL_LIST, NULL, + add_kb(group, GEANY_KEYS_FOCUS_SIDEBAR_SYMBOL_LIST, NULL, 0, 0, "switch_sidebar_symbol_list", _("Switch to Sidebar Symbol List"), NULL); - keybindings_set_item(group, GEANY_KEYS_FOCUS_SIDEBAR_DOCUMENT_LIST, NULL, + add_kb(group, GEANY_KEYS_FOCUS_SIDEBAR_DOCUMENT_LIST, NULL, 0, 0, "switch_sidebar_doc_list", _("Switch to Sidebar Document List"), NULL); group = keybindings_get_core_group(GEANY_KEY_GROUP_NOTEBOOK); - keybindings_set_item(group, GEANY_KEYS_NOTEBOOK_SWITCHTABLEFT, cb_func_switch_tableft, + add_kb(group, GEANY_KEYS_NOTEBOOK_SWITCHTABLEFT, cb_func_switch_tableft, GDK_Page_Up, GDK_CONTROL_MASK, "switch_tableft", _("Switch to left document"), NULL); - keybindings_set_item(group, GEANY_KEYS_NOTEBOOK_SWITCHTABRIGHT, cb_func_switch_tabright, + add_kb(group, GEANY_KEYS_NOTEBOOK_SWITCHTABRIGHT, cb_func_switch_tabright, GDK_Page_Down, GDK_CONTROL_MASK, "switch_tabright", _("Switch to right document"), NULL); - keybindings_set_item(group, GEANY_KEYS_NOTEBOOK_SWITCHTABLASTUSED, cb_func_switch_tablastused, + add_kb(group, GEANY_KEYS_NOTEBOOK_SWITCHTABLASTUSED, cb_func_switch_tablastused, GDK_Tab, GDK_CONTROL_MASK, "switch_tablastused", _("Switch to last used document"), NULL); - keybindings_set_item(group, GEANY_KEYS_NOTEBOOK_MOVETABLEFT, cb_func_move_tab, + add_kb(group, GEANY_KEYS_NOTEBOOK_MOVETABLEFT, cb_func_move_tab, GDK_Page_Up, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "move_tableft", _("Move document left"), NULL); - keybindings_set_item(group, GEANY_KEYS_NOTEBOOK_MOVETABRIGHT, cb_func_move_tab, + add_kb(group, GEANY_KEYS_NOTEBOOK_MOVETABRIGHT, cb_func_move_tab, GDK_Page_Down, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "move_tabright", _("Move document right"), NULL); - keybindings_set_item(group, GEANY_KEYS_NOTEBOOK_MOVETABFIRST, cb_func_move_tab, + add_kb(group, GEANY_KEYS_NOTEBOOK_MOVETABFIRST, cb_func_move_tab, 0, 0, "move_tabfirst", _("Move document first"), NULL); - keybindings_set_item(group, GEANY_KEYS_NOTEBOOK_MOVETABLAST, cb_func_move_tab, + add_kb(group, GEANY_KEYS_NOTEBOOK_MOVETABLAST, cb_func_move_tab, 0, 0, "move_tablast", _("Move document last"), NULL); group = keybindings_get_core_group(GEANY_KEY_GROUP_DOCUMENT); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_LINEWRAP, NULL, - 0, 0, "menu_linewrap", _("Toggle Line wrapping"), LW(menu_line_wrapping1)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_LINEBREAK, NULL, - 0, 0, "menu_linebreak", _("Toggle Line breaking"), LW(line_breaking1)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_REPLACETABS, NULL, - 0, 0, "menu_replacetabs", _("Replace tabs by space"), LW(menu_replace_tabs)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_REPLACESPACES, NULL, - 0, 0, "menu_replacespaces", _("Replace spaces by tabs"), LW(menu_replace_spaces)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_TOGGLEFOLD, NULL, + add_kb(group, GEANY_KEYS_DOCUMENT_LINEWRAP, NULL, + 0, 0, "menu_linewrap", _("Toggle Line wrapping"), "menu_line_wrapping1"); + add_kb(group, GEANY_KEYS_DOCUMENT_LINEBREAK, NULL, + 0, 0, "menu_linebreak", _("Toggle Line breaking"), "line_breaking1"); + add_kb(group, GEANY_KEYS_DOCUMENT_REPLACETABS, NULL, + 0, 0, "menu_replacetabs", _("Replace tabs by space"), "menu_replace_tabs"); + add_kb(group, GEANY_KEYS_DOCUMENT_REPLACESPACES, NULL, + 0, 0, "menu_replacespaces", _("Replace spaces by tabs"), "menu_replace_spaces"); + add_kb(group, GEANY_KEYS_DOCUMENT_TOGGLEFOLD, NULL, 0, 0, "menu_togglefold", _("Toggle current fold"), NULL); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_FOLDALL, NULL, - 0, 0, "menu_foldall", _("Fold all"), LW(menu_fold_all1)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_UNFOLDALL, NULL, - 0, 0, "menu_unfoldall", _("Unfold all"), LW(menu_unfold_all1)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_RELOADTAGLIST, NULL, + add_kb(group, GEANY_KEYS_DOCUMENT_FOLDALL, NULL, + 0, 0, "menu_foldall", _("Fold all"), "menu_fold_all1"); + add_kb(group, GEANY_KEYS_DOCUMENT_UNFOLDALL, NULL, + 0, 0, "menu_unfoldall", _("Unfold all"), "menu_unfold_all1"); + add_kb(group, GEANY_KEYS_DOCUMENT_RELOADTAGLIST, NULL, GDK_r, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "reloadtaglist", _("Reload symbol list"), NULL); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_REMOVE_MARKERS, NULL, - 0, 0, "remove_markers", _("Remove Markers"), LW(remove_markers1)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_REMOVE_ERROR_INDICATORS, NULL, - 0, 0, "remove_error_indicators", _("Remove Error Indicators"), LW(menu_remove_indicators1)); - keybindings_set_item(group, GEANY_KEYS_DOCUMENT_REMOVE_MARKERS_INDICATORS, NULL, + add_kb(group, GEANY_KEYS_DOCUMENT_REMOVE_MARKERS, NULL, + 0, 0, "remove_markers", _("Remove Markers"), "remove_markers1"); + add_kb(group, GEANY_KEYS_DOCUMENT_REMOVE_ERROR_INDICATORS, NULL, + 0, 0, "remove_error_indicators", _("Remove Error Indicators"), "menu_remove_indicators1"); + add_kb(group, GEANY_KEYS_DOCUMENT_REMOVE_MARKERS_INDICATORS, NULL, 0, 0, "remove_markers_and_indicators", _("Remove Markers and Error Indicators"), NULL); group = keybindings_get_core_group(GEANY_KEY_GROUP_BUILD); - keybindings_set_item(group, GEANY_KEYS_BUILD_COMPILE, NULL, + add_kb(group, GEANY_KEYS_BUILD_COMPILE, NULL, GDK_F8, 0, "build_compile", _("Compile"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_LINK, NULL, + add_kb(group, GEANY_KEYS_BUILD_LINK, NULL, GDK_F9, 0, "build_link", _("Build"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_MAKE, NULL, + add_kb(group, GEANY_KEYS_BUILD_MAKE, NULL, GDK_F9, GDK_SHIFT_MASK, "build_make", _("Make all"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_MAKEOWNTARGET, NULL, + add_kb(group, GEANY_KEYS_BUILD_MAKEOWNTARGET, NULL, GDK_F9, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "build_makeowntarget", _("Make custom target"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_MAKEOBJECT, NULL, + add_kb(group, GEANY_KEYS_BUILD_MAKEOBJECT, NULL, GDK_F8, GDK_SHIFT_MASK, "build_makeobject", _("Make object"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_NEXTERROR, NULL, + add_kb(group, GEANY_KEYS_BUILD_NEXTERROR, NULL, 0, 0, "build_nexterror", _("Next error"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_PREVIOUSERROR, NULL, + add_kb(group, GEANY_KEYS_BUILD_PREVIOUSERROR, NULL, 0, 0, "build_previouserror", _("Previous error"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_RUN, NULL, + add_kb(group, GEANY_KEYS_BUILD_RUN, NULL, GDK_F5, 0, "build_run", _("Run"), NULL); - keybindings_set_item(group, GEANY_KEYS_BUILD_OPTIONS, NULL, + add_kb(group, GEANY_KEYS_BUILD_OPTIONS, NULL, 0, 0, "build_options", _("Build options"), NULL); group = keybindings_get_core_group(GEANY_KEY_GROUP_TOOLS); - keybindings_set_item(group, GEANY_KEYS_TOOLS_OPENCOLORCHOOSER, cb_func_menu_opencolorchooser, - 0, 0, "menu_opencolorchooser", _("Show Color Chooser"), LW(menu_choose_color1)); + add_kb(group, GEANY_KEYS_TOOLS_OPENCOLORCHOOSER, cb_func_menu_opencolorchooser, + 0, 0, "menu_opencolorchooser", _("Show Color Chooser"), "menu_choose_color1"); group = keybindings_get_core_group(GEANY_KEY_GROUP_HELP); - keybindings_set_item(group, GEANY_KEYS_HELP_HELP, cb_func_menu_help, - GDK_F1, 0, "menu_help", _("Help"), LW(help1)); + add_kb(group, GEANY_KEYS_HELP_HELP, cb_func_menu_help, + GDK_F1, 0, "menu_help", _("Help"), "help1"); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

11 years, 10 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2012