Plugins-Commits June 2015

plugins-commits@lists.geany.org

1 participants
65 discussions

[geany/geany-plugins] a1fd7a: Use lowercase header names
by Enrico Tröger 30 Jun '15

30 Jun '15

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Tue, 30 Jun 2015 20:55:13 UTC Commit: a1fd7a570c0ab890a1413cdc3ff477a3d3eb3a88 https://github.com/geany/geany-plugins/commit/a1fd7a570c0ab890a1413cdc3ff47… Log Message: ----------- Use lowercase header names This fixes Windows cross-compilation on non-Windows systems with case-sensitive file systems. Modified Paths: -------------- geanyvc/src/externdiff.c Modified: geanyvc/src/externdiff.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -23,7 +23,7 @@ #include "geanyvc.h" #ifdef G_OS_WIN32 -#include <Shlobj.h> +#include <shlobj.h> #endif extern GeanyFunctions *geany_functions; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] cd86f9: fix double "_" entree in GEANY_WORDCHARS
by glitsj16 30 Jun '15

30 Jun '15

Branch: refs/heads/master Author: glitsj16 <glitsj16(a)users.noreply.github.com> Committer: glitsj16 <glitsj16(a)users.noreply.github.com> Date: Tue, 30 Jun 2015 20:32:50 UTC Commit: cd86f9108e33ac5fca4b9e70e09be410a61a04ba https://github.com/geany/geany-plugins/commit/cd86f9108e33ac5fca4b9e70e09be… Log Message: ----------- fix double "_" entree in GEANY_WORDCHARS The double entree is indeed superfluous, took the added "_" out as recommended. Thanks for that. Modified Paths: -------------- addons/src/ao_openuri.c Modified: addons/src/ao_openuri.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -250,7 +250,7 @@ void ao_open_uri_update_menu(AoOpenUri *openuri, GeanyDocument *doc, gint pos) sci_get_selected_text(doc->editor->sci, text); } else - text = editor_get_word_at_pos(doc->editor, pos, GEANY_WORDCHARS"@.://-?&%#=~+_,;"); + text = editor_get_word_at_pos(doc->editor, pos, GEANY_WORDCHARS"@.://-?&%#=~+,;"); /* TODO be more restrictive when handling selections as there are too many hits by now */ if (text != NULL && (ao_uri_has_scheme(text) || ao_uri_is_link(text))) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] fed347: Update the README to mention `--enable-all-plugins`
by Colomban Wendling 30 Jun '15

30 Jun '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 30 Jun 2015 20:00:34 UTC Commit: fed34782e496082fa4b6a387936855e6fe9c5851 https://github.com/geany/geany-plugins/commit/fed34782e496082fa4b6a38793685… Log Message: ----------- Update the README to mention `--enable-all-plugins` Modified Paths: -------------- README Modified: README 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -82,6 +82,15 @@ Example: This will force force both geanylua and spellcheck plugins to be enabled even if some dependencies are missing. +You can also use the special option ``all-plugins`` to change the default for all +plugins. For example, using ``--enable-all-plugins`` will forcefully enable all +plugins as if you passed each plugin-specific ``--enable-<option>``. This can be +combined with specific plugin's ``--enable-<option>`` to only select a specific +subset of the plugins without listing them all. For example, you can use this +to easily enable one single plugin, using e.g. ``--disable-all-plugins +--enable-<option>``, or to forcefully enable all plugins but a few specific +ones, using e.g. ``--enable-all-plugins --enable-<option>=auto``. + Other tweaks ============ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 82986e: Merge pull request #261 from b4n/projectorganizer/leaks
by Jiří Techet 30 Jun '15

30 Jun '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 30 Jun 2015 19:19:33 UTC Commit: 82986ef49b79dd1cb7800e45c8bee56cd5c71705 https://github.com/geany/geany-plugins/commit/82986ef49b79dd1cb7800e45c8bee… Log Message: ----------- Merge pull request #261 from b4n/projectorganizer/leaks projectorganizer: Fix a few leaks reported by Valgrind Modified Paths: -------------- projectorganizer/src/prjorg-project.c projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-project.c 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -195,6 +195,9 @@ static gint prjorg_project_rescan_root(PrjOrgRoot *root) g_slist_foreach(ignored_dirs_list, (GFunc) g_pattern_spec_free, NULL); g_slist_free(ignored_dirs_list); + g_slist_foreach(ignored_file_list, (GFunc) g_pattern_spec_free, NULL); + g_slist_free(ignored_file_list); + return filenum; } Modified: projectorganizer/src/prjorg-sidebar.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1427,6 +1427,7 @@ void prjorg_sidebar_init(void) focus_chain = g_list_prepend(focus_chain, s_file_view); gtk_container_set_focus_chain(GTK_CONTAINER(s_file_view_vbox), focus_chain); + g_list_free(focus_chain); scrollwin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] b318bf: projectorganizer: Fix a few leaks reported by Valgrind
by Frank Lanitz 30 Jun '15

30 Jun '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 30 Jun 2015 17:50:52 UTC Commit: b318bfdd85e7877130c8350facbf23eb91e588c0 https://github.com/geany/geany-plugins/commit/b318bfdd85e7877130c8350facbf2… Log Message: ----------- projectorganizer: Fix a few leaks reported by Valgrind Modified Paths: -------------- projectorganizer/src/prjorg-project.c projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-project.c 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -195,6 +195,9 @@ static gint prjorg_project_rescan_root(PrjOrgRoot *root) g_slist_foreach(ignored_dirs_list, (GFunc) g_pattern_spec_free, NULL); g_slist_free(ignored_dirs_list); + g_slist_foreach(ignored_file_list, (GFunc) g_pattern_spec_free, NULL); + g_slist_free(ignored_file_list); + return filenum; } Modified: projectorganizer/src/prjorg-sidebar.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1427,6 +1427,7 @@ void prjorg_sidebar_init(void) focus_chain = g_list_prepend(focus_chain, s_file_view); gtk_container_set_focus_chain(GTK_CONTAINER(s_file_view_vbox), focus_chain); + g_list_free(focus_chain); scrollwin = gtk_scrolled_window_new(NULL, NULL); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] bbbb76: projectorganizer: fix (?) locale/utf8-ness
by Jiří Techet 30 Jun '15

30 Jun '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 30 Jun 2015 11:18:16 UTC Commit: bbbb769a3e7aa8cc00d76dde45fb21506efc5616 https://github.com/geany/geany-plugins/commit/bbbb769a3e7aa8cc00d76dde45fb2… Log Message: ----------- projectorganizer: fix (?) locale/utf8-ness Hopefully fix all (?) utf8/locale issues. Not really tested because I realized I don't know how to properly test this... Also fix some memory leaks on the way. Modified Paths: -------------- projectorganizer/src/prjorg-menu.c projectorganizer/src/prjorg-project.c projectorganizer/src/prjorg-project.h projectorganizer/src/prjorg-sidebar.c projectorganizer/src/prjorg-utils.c projectorganizer/src/prjorg-utils.h Modified: projectorganizer/src/prjorg-menu.c 88 lines changed, 51 insertions(+), 37 deletions(-) =================================================================== @@ -50,14 +50,14 @@ enum static GtkWidget *s_fif_item, *s_ff_item, *s_ft_item, *s_shs_item, *s_sep_item, *s_context_osf_item, *s_context_sep_item; -static gboolean try_swap_header_source(gchar *file_name, gboolean is_header, GSList *file_list, GSList *header_patterns, GSList *source_patterns) +static gboolean try_swap_header_source(gchar *utf8_file_name, gboolean is_header, GSList *file_list, GSList *header_patterns, GSList *source_patterns) { gchar *name_pattern; GSList *elem; GPatternSpec *pattern; gboolean found = FALSE; - name_pattern = g_path_get_basename(file_name); + name_pattern = g_path_get_basename(utf8_file_name); SETPTR(name_pattern, utils_remove_ext_from_filename(name_pattern)); SETPTR(name_pattern, g_strconcat(name_pattern, ".*", NULL)); pattern = g_pattern_spec_new(name_pattern); @@ -132,24 +132,26 @@ static void on_swap_header_source(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_U if (!swapped) { - gchar *doc_dir; + gchar *utf8_doc_dir; + gchar *locale_doc_dir; - doc_dir = g_path_get_dirname(doc->file_name); - SETPTR(doc_dir, utils_get_locale_from_utf8(doc_dir)); + utf8_doc_dir = g_path_get_dirname(doc->file_name); + locale_doc_dir = utils_get_locale_from_utf8(utf8_doc_dir); - list = utils_get_file_list(doc_dir, NULL, NULL); + list = utils_get_file_list(locale_doc_dir, NULL, NULL); foreach_list (elem, list) { gchar *full_name; - full_name = g_build_filename(doc_dir, elem->data, NULL); + full_name = g_build_filename(locale_doc_dir, elem->data, NULL); SETPTR(full_name, utils_get_utf8_from_locale(full_name)); SETPTR(elem->data, full_name); } swapped = try_swap_header_source(doc->file_name, is_header, list, header_patterns, source_patterns); g_slist_foreach(list, (GFunc) g_free, NULL); g_slist_free(list); - g_free(doc_dir); + g_free(utf8_doc_dir); + g_free(locale_doc_dir); list = NULL; } @@ -185,7 +187,12 @@ static void on_swap_header_source(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_U static void on_find_in_project(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data) { if (geany_data->app->project) - search_show_find_in_files_dialog(get_project_base_path()); + { + gchar *utf8_base_path = get_project_base_path(); + + search_show_find_in_files_dialog(utf8_base_path); + g_free(utf8_base_path); + } } @@ -227,22 +234,21 @@ static gboolean kb_callback(guint key_id) static void on_open_selected_file(GtkMenuItem *menuitem, gpointer user_data) { GeanyDocument *doc = document_get_current(); - gchar *sel = NULL; - gchar *filename = NULL; - gchar *path = NULL; + gchar *utf8_sel, *locale_sel; + gchar *filename = NULL; /* locale */ g_return_if_fail(doc != NULL); - sel = get_selection(); + utf8_sel = get_selection(); - if (!sel) + if (!utf8_sel) return; - SETPTR(sel, utils_get_locale_from_utf8(sel)); + locale_sel = utils_get_locale_from_utf8(utf8_sel); - if (g_path_is_absolute(sel)) + if (g_path_is_absolute(locale_sel)) { - filename = g_strdup(sel); + filename = g_strdup(locale_sel); if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { g_free(filename); @@ -252,44 +258,47 @@ static void on_open_selected_file(GtkMenuItem *menuitem, gpointer user_data) if (!filename) { + gchar *locale_path = NULL; + if (doc->file_name) { - path = g_path_get_dirname(doc->file_name); - SETPTR(path, utils_get_locale_from_utf8(path)); + locale_path = g_path_get_dirname(doc->file_name); + SETPTR(locale_path, utils_get_locale_from_utf8(locale_path)); } - if (!path) - path = g_get_current_dir(); + if (!locale_path) + locale_path = g_get_current_dir(); - filename = g_build_path(G_DIR_SEPARATOR_S, path, sel, NULL); + filename = g_build_path(G_DIR_SEPARATOR_S, locale_path, locale_sel, NULL); if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { g_free(filename); filename = NULL; } - g_free(path); + g_free(locale_path); } if (!filename && geany_data->app->project != NULL) { + gchar *utf8_path; gchar **pathv; gint i; - path = g_strdup(""); - pathv = g_strsplit_set(sel, "/\\", -1); + utf8_path = g_strdup(""); + pathv = g_strsplit_set(utf8_sel, "/\\", -1); for (i = g_strv_length(pathv) - 1; i >= 0; i--) { if (g_strcmp0(pathv[i], "..") == 0) break; - SETPTR(path, g_build_filename(G_DIR_SEPARATOR_S, pathv[i], path, NULL)); + SETPTR(utf8_path, g_build_filename(G_DIR_SEPARATOR_S, pathv[i], utf8_path, NULL)); } g_strfreev(pathv); - if (g_strcmp0(path, "") != 0) + if (g_strcmp0(utf8_path, "") != 0) { GSList *elem; - gchar *found_path = NULL; + const gchar *found_path = NULL; foreach_slist (elem, prj_org->roots) { @@ -301,9 +310,9 @@ static void on_open_selected_file(GtkMenuItem *menuitem, gpointer user_data) while (g_hash_table_iter_next(&iter, &key, &value)) { gchar *file_name = key; - gchar *pos = g_strrstr(file_name, path); + gchar *pos = g_strrstr(file_name, utf8_path); - if (pos && (pos - file_name + strlen(path) == strlen(file_name))) + if (pos && (pos - file_name + strlen(utf8_path) == strlen(file_name))) { found_path = file_name; break; @@ -316,8 +325,7 @@ static void on_open_selected_file(GtkMenuItem *menuitem, gpointer user_data) if (found_path) { - filename = g_strdup(found_path); - SETPTR(filename, utils_get_locale_from_utf8(filename)); + filename = utils_get_locale_from_utf8(found_path); if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { g_free(filename); @@ -325,13 +333,13 @@ static void on_open_selected_file(GtkMenuItem *menuitem, gpointer user_data) } } } - g_free(path); + g_free(utf8_path); } #ifdef G_OS_UNIX if (!filename) { - filename = g_build_path(G_DIR_SEPARATOR_S, "/usr/local/include", sel, NULL); + filename = g_build_path(G_DIR_SEPARATOR_S, "/usr/local/include", locale_sel, NULL); if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { g_free(filename); @@ -341,7 +349,7 @@ static void on_open_selected_file(GtkMenuItem *menuitem, gpointer user_data) if (!filename) { - filename = g_build_path(G_DIR_SEPARATOR_S, "/usr/include", sel, NULL); + filename = g_build_path(G_DIR_SEPARATOR_S, "/usr/include", locale_sel, NULL); if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { g_free(filename); @@ -351,10 +359,16 @@ static void on_open_selected_file(GtkMenuItem *menuitem, gpointer user_data) #endif if (filename) - open_file(filename); + { + gchar *utf8_filename = utils_get_utf8_from_locale(filename); + + open_file(utf8_filename); + g_free(utf8_filename); + } g_free(filename); - g_free(sel); + g_free(utf8_sel); + g_free(locale_sel); } Modified: projectorganizer/src/prjorg-project.c 192 lines changed, 112 insertions(+), 80 deletions(-) =================================================================== @@ -70,64 +70,76 @@ static void collect_source_files(gchar *filename, TMSourceFile *sf, gpointer use /* path - absolute path in locale, returned list in locale */ -static GSList *get_file_list(const gchar * path, GSList *patterns, GSList *ignored_dirs_patterns, GSList *ignored_file_patterns) +static GSList *get_file_list(const gchar *utf8_path, GSList *patterns, GSList *ignored_dirs_patterns, GSList *ignored_file_patterns) { GSList *list = NULL; GDir *dir; + gchar *locale_path = utils_get_locale_from_utf8(utf8_path); - dir = g_dir_open(path, 0, NULL); + dir = g_dir_open(locale_path, 0, NULL); if (!dir) + { + g_free(locale_path); return NULL; + } while (TRUE) { - const gchar *name; - gchar *filename; + const gchar *locale_name; + gchar *locale_filename, *utf8_filename, *utf8_name; - name = g_dir_read_name(dir); - if (!name) + locale_name = g_dir_read_name(dir); + if (!locale_name) break; - filename = g_build_filename(path, name, NULL); + utf8_name = utils_get_utf8_from_locale(locale_name); + locale_filename = g_build_filename(locale_path, locale_name, NULL); + utf8_filename = utils_get_utf8_from_locale(locale_filename); - if (g_file_test(filename, G_FILE_TEST_IS_DIR)) + if (g_file_test(locale_filename, G_FILE_TEST_IS_DIR)) { GSList *lst; - gchar *parent_realpath, *child_realpath, *relative; + gchar *relative, *locale_parent_realpath, *locale_child_realpath, + *utf8_parent_realpath, *utf8_child_realpath; /* symlink cycle avoidance - test if directory within parent directory */ - parent_realpath = tm_get_real_path(path); - child_realpath = tm_get_real_path(filename); - relative = get_relative_path(parent_realpath, child_realpath); - g_free(parent_realpath); - g_free(child_realpath); + locale_parent_realpath = tm_get_real_path(locale_path); + locale_child_realpath = tm_get_real_path(locale_filename); + utf8_parent_realpath = utils_get_utf8_from_locale(locale_parent_realpath); + utf8_child_realpath = utils_get_utf8_from_locale(locale_child_realpath); - if (!relative) - continue; + relative = get_relative_path(utf8_parent_realpath, utf8_child_realpath); - g_free(relative); + g_free(locale_parent_realpath); + g_free(locale_child_realpath); + g_free(utf8_parent_realpath); + g_free(utf8_child_realpath); - if (patterns_match(ignored_dirs_patterns, name)) + if (relative) { - g_free(filename); - continue; + g_free(relative); + + if (!patterns_match(ignored_dirs_patterns, utf8_name)) + { + lst = get_file_list(utf8_filename, patterns, ignored_dirs_patterns, ignored_file_patterns); + if (lst) + list = g_slist_concat(list, lst); + } } - - lst = get_file_list(filename, patterns, ignored_dirs_patterns, ignored_file_patterns); - if (lst) - list = g_slist_concat(list, lst); - g_free(filename); } - else if (g_file_test(filename, G_FILE_TEST_IS_REGULAR)) + else if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR)) { - if (patterns_match(patterns, name) && !patterns_match(ignored_file_patterns, name)) - list = g_slist_prepend(list, filename); - else - g_free(filename); + if (patterns_match(patterns, utf8_name) && !patterns_match(ignored_file_patterns, utf8_name)) + list = g_slist_prepend(list, g_strdup(utf8_filename)); } + + g_free(utf8_filename); + g_free(locale_filename); + g_free(utf8_name); } g_dir_close(dir); + g_free(locale_path); return list; } @@ -165,12 +177,11 @@ static gint prjorg_project_rescan_root(PrjOrgRoot *root) foreach_slist(elem, lst) { - char *path = g_strdup(elem->data); + char *path = elem->data; if (path) { - SETPTR(path, utils_get_utf8_from_locale(path)); - g_hash_table_insert(root->file_table, path, NULL); + g_hash_table_insert(root->file_table, g_strdup(path), NULL); filenum++; } } @@ -191,7 +202,7 @@ static gint prjorg_project_rescan_root(PrjOrgRoot *root) static gboolean match_basename(gconstpointer pft, gconstpointer user_data) { const GeanyFiletype *ft = pft; - const gchar *base_filename = user_data; + const gchar *utf8_base_filename = user_data; gint j; gboolean ret = FALSE; @@ -202,7 +213,7 @@ static gboolean match_basename(gconstpointer pft, gconstpointer user_data) { GPatternSpec *pattern = g_pattern_spec_new(ft->pattern[j]); - if (g_pattern_match_string(pattern, base_filename)) + if (g_pattern_match_string(pattern, utf8_base_filename)) { ret = TRUE; g_pattern_spec_free(pattern); @@ -220,36 +231,44 @@ static gboolean match_basename(gconstpointer pft, gconstpointer user_data) * extension and only if this fails, look at the shebang */ static GeanyFiletype *filetypes_detect(const gchar *utf8_filename) { - guint i; struct stat s; - gchar *base_filename; GeanyFiletype *ft = NULL; + gchar *locale_filename; - if (g_stat(utf8_filename, &s) != 0 || s.st_size > 10*1024*1024) - return filetypes[GEANY_FILETYPES_NONE]; + locale_filename = utils_get_locale_from_utf8(utf8_filename); + if (g_stat(locale_filename, &s) != 0 || s.st_size > 10*1024*1024) + ft = filetypes[GEANY_FILETYPES_NONE]; + else + { + guint i; + gchar *utf8_base_filename; - /* to match against the basename of the file (because of Makefile*) */ - base_filename = g_path_get_basename(utf8_filename); + /* to match against the basename of the file (because of Makefile*) */ + utf8_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)); + /* use lower case basename */ + SETPTR(utf8_base_filename, g_utf8_strdown(utf8_base_filename, -1)); #endif - for (i = 0; i < geany_data->filetypes_array->len; i++) - { - GeanyFiletype *ftype = filetypes[i]; - - if (match_basename(ftype, base_filename)) + for (i = 0; i < geany_data->filetypes_array->len; i++) { - ft = ftype; - break; + GeanyFiletype *ftype = filetypes[i]; + + if (match_basename(ftype, utf8_base_filename)) + { + ft = ftype; + break; + } } + + if (ft == NULL) + ft = filetypes_detect_from_file(utf8_filename); + + g_free(utf8_base_filename); } - - if (ft == NULL) - ft = filetypes_detect_from_file(utf8_filename); - g_free(base_filename); + g_free(locale_filename); + return ft; } @@ -267,13 +286,15 @@ static void regenerate_tags(PrjOrgRoot *root, gpointer user_data) while (g_hash_table_iter_next(&iter, &key, &value)) { TMSourceFile *sf; - gchar *path = key; + gchar *utf8_path = key; + gchar *locale_path = utils_get_locale_from_utf8(utf8_path); - sf = tm_source_file_new(path, filetypes_detect(path)->name); - if (sf && !document_find_by_filename(path)) + sf = tm_source_file_new(locale_path, filetypes_detect(utf8_path)->name); + if (sf && !document_find_by_filename(utf8_path)) g_ptr_array_add(source_files, sf); - g_hash_table_insert(file_table, g_strdup(path), sf); + g_hash_table_insert(file_table, g_strdup(utf8_path), sf); + g_free(locale_path); } g_hash_table_destroy(root->file_table); root->file_table = file_table; @@ -361,10 +382,10 @@ void prjorg_project_save(GKeyFile * key_file) } -static PrjOrgRoot *create_root(const gchar *base_dir) +static PrjOrgRoot *create_root(const gchar *utf8_base_dir) { PrjOrgRoot *root = (PrjOrgRoot *) g_new0(PrjOrgRoot, 1); - root->base_dir = g_strdup(base_dir); + root->base_dir = g_strdup(utf8_base_dir); root->file_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GFreeFunc)tm_source_file_free); return root; } @@ -387,21 +408,28 @@ static void close_root(PrjOrgRoot *root, gpointer user_data) static gint root_comparator(PrjOrgRoot *a, PrjOrgRoot *b) { - gchar *a_realpath, *b_realpath; + gchar *a_realpath, *b_realpath, *a_locale_base_dir, *b_locale_base_dir; gint res; - a_realpath = tm_get_real_path(a->base_dir); - b_realpath = tm_get_real_path(b->base_dir); + a_locale_base_dir = utils_get_locale_from_utf8(a->base_dir); + b_locale_base_dir = utils_get_locale_from_utf8(b->base_dir); + a_realpath = tm_get_real_path(a_locale_base_dir); + b_realpath = tm_get_real_path(b_locale_base_dir); + res = g_strcmp0(a_realpath, b_realpath); + g_free(a_realpath); g_free(b_realpath); + g_free(a_locale_base_dir); + g_free(b_locale_base_dir); + return res; } -void prjorg_project_add_external_dir(const gchar *dirname) +void prjorg_project_add_external_dir(const gchar *utf8_dirname) { - PrjOrgRoot *new_root = create_root(dirname); + PrjOrgRoot *new_root = create_root(utf8_dirname); if (g_slist_find_custom (prj_org->roots, new_root, (GCompareFunc)root_comparator) != NULL) { close_root(new_root, NULL); @@ -417,9 +445,9 @@ void prjorg_project_add_external_dir(const gchar *dirname) } -void prjorg_project_remove_external_dir(const gchar *dirname) +void prjorg_project_remove_external_dir(const gchar *utf8_dirname) { - PrjOrgRoot *test_root = create_root(dirname); + PrjOrgRoot *test_root = create_root(utf8_dirname); GSList *found = g_slist_find_custom (prj_org->roots, test_root, (GCompareFunc)root_comparator); if (found != NULL) { @@ -438,6 +466,7 @@ void prjorg_project_open(GKeyFile * key_file) gchar **source_patterns, **header_patterns, **ignored_dirs_patterns, **ignored_file_patterns, **external_dirs, **dir_ptr, *last_name; gint generate_tag_prefs; GSList *elem, *ext_list = NULL; + gchar *utf8_base_path; if (prj_org != NULL) prjorg_project_close(); @@ -476,8 +505,11 @@ void prjorg_project_open(GKeyFile * key_file) last_name = elem->data; } g_slist_free(ext_list); + /* the project directory is always first */ - prj_org->roots = g_slist_prepend(prj_org->roots, create_root(get_project_base_path())); + utf8_base_path = get_project_base_path(); + prj_org->roots = g_slist_prepend(prj_org->roots, create_root(utf8_base_path)); + g_free(utf8_base_path); update_project( source_patterns, @@ -650,17 +682,17 @@ void prjorg_project_close(void) } -gboolean prjorg_project_is_in_project(const gchar * filename) +gboolean prjorg_project_is_in_project(const gchar *utf8_filename) { GSList *elem; - if (!filename || !prj_org || !geany_data->app->project || !prj_org->roots) + if (!utf8_filename || !prj_org || !geany_data->app->project || !prj_org->roots) return FALSE; foreach_slist (elem, prj_org->roots) { PrjOrgRoot *root = elem->data; - if (g_hash_table_lookup_extended (root->file_table, filename, NULL, NULL)) + if (g_hash_table_lookup_extended (root->file_table, utf8_filename, NULL, NULL)) return TRUE; } @@ -678,14 +710,14 @@ static gboolean add_tm_idle(gpointer foo) foreach_slist (elem2, s_idle_add_funcs) { GSList *elem; - gchar *fname = elem2->data; + gchar *utf8_fname = elem2->data; foreach_slist (elem, prj_org->roots) { PrjOrgRoot *root = elem->data; - TMSourceFile *sf = g_hash_table_lookup(root->file_table, fname); + TMSourceFile *sf = g_hash_table_lookup(root->file_table, utf8_fname); - if (sf != NULL && !document_find_by_filename(fname)) + if (sf != NULL && !document_find_by_filename(utf8_fname)) { tm_workspace_add_source_file(sf); break; /* single file representation in TM is enough */ @@ -706,12 +738,12 @@ static gboolean add_tm_idle(gpointer foo) * Additional problem: The tag removal in Geany happens after this function is called. * To be sure, perform on idle after this happens (even though from my knowledge of TM * this shouldn't probably matter). */ -void prjorg_project_add_single_tm_file(gchar *filename) +void prjorg_project_add_single_tm_file(gchar *utf8_filename) { if (s_idle_add_funcs == NULL) plugin_idle_add(geany_plugin, (GSourceFunc)add_tm_idle, NULL); - s_idle_add_funcs = g_slist_prepend(s_idle_add_funcs, g_strdup(filename)); + s_idle_add_funcs = g_slist_prepend(s_idle_add_funcs, g_strdup(utf8_filename)); } @@ -725,12 +757,12 @@ static gboolean remove_tm_idle(gpointer foo) foreach_slist (elem2, s_idle_remove_funcs) { GSList *elem; - gchar *fname = elem2->data; + gchar *utf8_fname = elem2->data; foreach_slist (elem, prj_org->roots) { PrjOrgRoot *root = elem->data; - TMSourceFile *sf = g_hash_table_lookup(root->file_table, fname); + TMSourceFile *sf = g_hash_table_lookup(root->file_table, utf8_fname); if (sf != NULL) tm_workspace_remove_source_file(sf); @@ -755,10 +787,10 @@ static gboolean remove_tm_idle(gpointer foo) * when this function is called and if we remove the TmSourceFile now, line * number for the searched tag won't be found. For this reason delay the tag * TmSourceFile removal until idle */ -void prjorg_project_remove_single_tm_file(gchar *filename) +void prjorg_project_remove_single_tm_file(gchar *utf8_filename) { if (s_idle_remove_funcs == NULL) plugin_idle_add(geany_plugin, (GSourceFunc)remove_tm_idle, NULL); - s_idle_remove_funcs = g_slist_prepend(s_idle_remove_funcs, g_strdup(filename)); + s_idle_remove_funcs = g_slist_prepend(s_idle_remove_funcs, g_strdup(utf8_filename)); } Modified: projectorganizer/src/prjorg-project.h 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -55,12 +55,12 @@ void prjorg_project_save(GKeyFile * key_file); void prjorg_project_read_properties_tab(void); void prjorg_project_rescan(void); -void prjorg_project_add_external_dir(const gchar *dirname); -void prjorg_project_remove_external_dir(const gchar *dirname); +void prjorg_project_add_external_dir(const gchar *utf8_dirname); +void prjorg_project_remove_external_dir(const gchar *utf8_dirname); -void prjorg_project_add_single_tm_file(gchar *filename); -void prjorg_project_remove_single_tm_file(gchar *filename); +void prjorg_project_add_single_tm_file(gchar *utf8_filename); +void prjorg_project_remove_single_tm_file(gchar *utf8_filename); -gboolean prjorg_project_is_in_project(const gchar * filename); +gboolean prjorg_project_is_in_project(const gchar *utf8_filename); #endif Modified: projectorganizer/src/prjorg-sidebar.c 151 lines changed, 89 insertions(+), 62 deletions(-) =================================================================== @@ -102,7 +102,7 @@ static struct } s_popup_menu; -static gint show_dialog_find_file(gchar *path, gchar **pattern, gboolean *case_sensitive, gboolean *full_path) +static gint show_dialog_find_file(gchar *utf8_path, gchar **pattern, gboolean *case_sensitive, gboolean *is_full_path) { gint res; GtkWidget *entry; @@ -164,8 +164,8 @@ static gint show_dialog_find_file(gchar *path, gchar **pattern, gboolean *case_s gtk_widget_show_all(vbox); } - if (path) - gtk_label_set_text(GTK_LABEL(s_fif_dialog.dir_label), path); + if (utf8_path) + gtk_label_set_text(GTK_LABEL(s_fif_dialog.dir_label), utf8_path); else gtk_label_set_text(GTK_LABEL(s_fif_dialog.dir_label), _("project or external directory")); entry = gtk_bin_get_child(GTK_BIN(s_fif_dialog.combo)); @@ -184,7 +184,7 @@ static gint show_dialog_find_file(gchar *path, gchar **pattern, gboolean *case_s str = gtk_entry_get_text(GTK_ENTRY(entry)); *pattern = g_strconcat("*", str, "*", NULL); *case_sensitive = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(s_fif_dialog.case_sensitive)); - *full_path = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(s_fif_dialog.full_path)); + *is_full_path = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(s_fif_dialog.full_path)); ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(s_fif_dialog.combo), str, 0); } @@ -210,6 +210,7 @@ static gboolean topmost_selected(GtkTreeModel *model, GtkTreeIter *iter, gboolea } +/* utf8 */ static gchar *build_path(GtkTreeIter *iter) { GtkTreeIter node; @@ -219,7 +220,7 @@ static gchar *build_path(GtkTreeIter *iter) gchar *name; if (!iter) - return g_strdup(get_project_base_path()); + return get_project_base_path(); node = *iter; model = GTK_TREE_MODEL(s_file_store); @@ -237,7 +238,12 @@ static gchar *build_path(GtkTreeIter *iter) } if (topmost_selected(model, &node, TRUE)) - SETPTR(path, g_build_filename(get_project_base_path(), path, NULL)); + { + gchar *utf8_base_path = get_project_base_path(); + + SETPTR(path, g_build_filename(utf8_base_path, path, NULL)); + g_free(utf8_base_path); + } else { gtk_tree_model_get(model, &node, FILEVIEW_COLUMN_NAME, &name, -1); @@ -285,26 +291,33 @@ static void on_follow_active(GtkToggleToolButton *button, G_GNUC_UNUSED gpointer static void on_add_external(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer user_data) { + gchar *utf8_base_path = get_project_base_path(); + gchar *locale_path = utils_get_locale_from_utf8(utf8_base_path); GtkWidget *dialog; dialog = gtk_file_chooser_dialog_new(_("Add External Directory"), GTK_WINDOW(geany->main_widgets->window), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, _("_Cancel"), GTK_RESPONSE_CANCEL, _("Add"), GTK_RESPONSE_ACCEPT, NULL); - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), get_project_base_path()); + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), locale_path); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - gchar *filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + gchar *locale_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + gchar *utf8_filename = utils_get_utf8_from_locale(locale_filename); - prjorg_project_add_external_dir(filename); + prjorg_project_add_external_dir(utf8_filename); prjorg_sidebar_update(TRUE); project_write_config(); - g_free (filename); + g_free(utf8_filename); + g_free(locale_filename); } gtk_widget_destroy(dialog); + + g_free(utf8_base_path); + g_free(locale_path); } @@ -348,37 +361,41 @@ static void find_file_recursive(GtkTreeIter *iter, gboolean case_sensitive, gboo } else { - gchar *name; + gchar *utf8_name; if (iter == NULL) return; if (full_path) { - gchar *path; + gchar *utf8_path, *utf8_base_path; - path = build_path(iter); - name = get_relative_path(get_project_base_path(), path); - g_free(path); + utf8_path = build_path(iter); + utf8_base_path = get_project_base_path(); + utf8_name = get_relative_path(utf8_base_path, utf8_path); + g_free(utf8_path); + g_free(utf8_base_path); } else - gtk_tree_model_get(GTK_TREE_MODEL(model), iter, FILEVIEW_COLUMN_NAME, &name, -1); + gtk_tree_model_get(GTK_TREE_MODEL(model), iter, FILEVIEW_COLUMN_NAME, &utf8_name, -1); if (!case_sensitive) - SETPTR(name, g_utf8_strdown(name, -1)); + SETPTR(utf8_name, g_utf8_strdown(utf8_name, -1)); - if (g_pattern_match_string(pattern, name)) + if (g_pattern_match_string(pattern, utf8_name)) { - gchar *path, *rel_path; + gchar *utf8_base_path = get_project_base_path(); + gchar *utf8_path, *rel_path; - path = build_path(iter); - rel_path = get_relative_path(get_project_base_path(), path); - msgwin_msg_add(COLOR_BLACK, -1, NULL, "%s", rel_path ? rel_path : path); - g_free(path); + utf8_path = build_path(iter); + rel_path = get_relative_path(utf8_base_path, utf8_path); + msgwin_msg_add(COLOR_BLACK, -1, NULL, "%s", rel_path ? rel_path : utf8_path); + g_free(utf8_path); g_free(rel_path); + g_free(utf8_base_path); } - g_free(name); + g_free(utf8_name); } } @@ -386,13 +403,13 @@ static void find_file_recursive(GtkTreeIter *iter, gboolean case_sensitive, gboo static void find_file(GtkTreeIter *iter) { gchar *pattern_str = NULL; - gboolean case_sensitive, full_path; - gchar *path; + gboolean case_sensitive, is_full_path; + gchar *utf8_path = build_path(iter); - path = build_path(iter); - - if (show_dialog_find_file(iter ? path : NULL, &pattern_str, &case_sensitive, &full_path) == GTK_RESPONSE_ACCEPT) + if (show_dialog_find_file(iter ? utf8_path : NULL, &pattern_str, &case_sensitive, &is_full_path) == GTK_RESPONSE_ACCEPT) { + gchar *utf8_base_path = get_project_base_path(); + gchar *locale_base_path = utils_get_locale_from_utf8(utf8_base_path); GPatternSpec *pattern; if (!case_sensitive) @@ -401,13 +418,15 @@ static void find_file(GtkTreeIter *iter) pattern = g_pattern_spec_new(pattern_str); msgwin_clear_tab(MSG_MESSAGE); - msgwin_set_messages_dir(get_project_base_path()); - find_file_recursive(iter, case_sensitive, full_path, pattern); + msgwin_set_messages_dir(locale_base_path); + find_file_recursive(iter, case_sensitive, is_full_path, pattern); msgwin_switch_tab(MSG_MESSAGE, TRUE); + g_free(utf8_base_path); + g_free(locale_base_path); } g_free(pattern_str); - g_free(path); + g_free(utf8_path); } @@ -521,7 +540,7 @@ static const char *tm_tag_type_name(const TMTag *tag) static gboolean match(TMTag *tag, const gchar *name, gboolean declaration, gboolean case_sensitive, - MatchType match_type, GPatternSpec *pspec, gchar *path) + MatchType match_type, GPatternSpec *pspec, gchar *utf8_path) { const gint forward_types = tm_tag_prototype_t | tm_tag_externvar_t; gboolean matches = FALSE; @@ -554,21 +573,25 @@ static gboolean match(TMTag *tag, const gchar *name, gboolean declaration, gbool g_free(name_case); } - if (matches && path) + if (matches && utf8_path) { + gchar *utf8_file_name = utils_get_utf8_from_locale(tag->file->file_name); gchar *relpath; - relpath = get_relative_path(path, tag->file->file_name); + relpath = get_relative_path(utf8_path, utf8_file_name); matches = relpath != NULL; g_free(relpath); + g_free(utf8_file_name); } return matches; } -static void find_tags(const gchar *name, gboolean declaration, gboolean case_sensitive, MatchType match_type, gchar *path) +static void find_tags(const gchar *name, gboolean declaration, gboolean case_sensitive, MatchType match_type, gchar *utf8_path) { + gchar *utf8_base_path = get_project_base_path(); + gchar *locale_base_path = utils_get_locale_from_utf8(utf8_base_path); GPtrArray *tags_array = geany_data->app->tm_workspace->tags_array; guint i; gchar *name_case; @@ -581,44 +604,48 @@ static void find_tags(const gchar *name, gboolean declaration, gboolean case_sen pspec = g_pattern_spec_new(name_case); - msgwin_set_messages_dir(get_project_base_path()); + msgwin_set_messages_dir(locale_base_path); msgwin_clear_tab(MSG_MESSAGE); for (i = 0; i < tags_array->len; i++) /* TODO: binary search */ { TMTag *tag = tags_array->pdata[i]; - if (match(tag, name_case, declaration, case_sensitive, match_type, pspec, path)) + if (match(tag, name_case, declaration, case_sensitive, match_type, pspec, utf8_path)) { gchar *scopestr = tag->scope ? g_strconcat(tag->scope, "::", NULL) : g_strdup(""); + gchar *utf8_fname = utils_get_utf8_from_locale(tag->file->file_name); gchar *relpath; - relpath = get_relative_path(get_project_base_path(), tag->file->file_name); + relpath = get_relative_path(utf8_base_path, utf8_fname); msgwin_msg_add(COLOR_BLACK, -1, NULL, "%s:%lu:\n\t[%s]\t %s%s%s", relpath, tag->line, tm_tag_type_name(tag), scopestr, tag->name, tag->arglist ? tag->arglist : ""); g_free(scopestr); g_free(relpath); + g_free(utf8_fname); } } msgwin_switch_tab(MSG_MESSAGE, TRUE); g_free(name_case); g_free(pspec); + g_free(utf8_base_path); + g_free(locale_base_path); } static void find_tag(GtkTreeIter *iter) { gchar *selection; - gchar *path; + gchar *utf8_path; GtkWidget *entry; create_dialog_find_tag(); entry = gtk_bin_get_child(GTK_BIN(s_ft_dialog.combo)); - path = build_path(iter); + utf8_path = build_path(iter); if (iter) - gtk_label_set_text(GTK_LABEL(s_ft_dialog.dir_label), path); + gtk_label_set_text(GTK_LABEL(s_ft_dialog.dir_label), utf8_path); else gtk_label_set_text(GTK_LABEL(s_ft_dialog.dir_label), _("project or external directory")); @@ -642,10 +669,10 @@ static void find_tag(GtkTreeIter *iter) ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(s_ft_dialog.combo), name, 0); - find_tags(name, declaration, case_sensitive, match_type, iter?path:NULL); + find_tags(name, declaration, case_sensitive, match_type, iter ? utf8_path : NULL); } - g_free(path); + g_free(utf8_path); gtk_widget_hide(s_ft_dialog.widget); } @@ -727,7 +754,7 @@ static void on_open_clicked(void) } else { - gchar *name; + gchar *utf8_path; GIcon *icon; gtk_tree_model_get(model, &iter, FILEVIEW_COLUMN_ICON, &icon, -1); @@ -738,9 +765,9 @@ static void on_open_clicked(void) return; } - name = build_path(&iter); - open_file(name); - g_free(name); + utf8_path = build_path(&iter); + open_file(utf8_path); + g_free(utf8_path); g_object_unref(icon); } } @@ -822,7 +849,7 @@ static void on_find_in_files(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED GtkTreeSelection *treesel; GtkTreeIter iter, parent; GtkTreeModel *model; - gchar *path; + gchar *utf8_path; treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(s_file_view)); @@ -832,15 +859,15 @@ static void on_find_in_files(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED if (!gtk_tree_model_iter_has_child(model, &iter)) { if (gtk_tree_model_iter_parent(model, &parent, &iter)) - path = build_path(&parent); + utf8_path = build_path(&parent); else - path = build_path(NULL); + utf8_path = build_path(NULL); } else - path = build_path(&iter); + utf8_path = build_path(&iter); - search_show_find_in_files_dialog(path); - g_free(path); + search_show_find_in_files_dialog(utf8_path); + g_free(utf8_path); } @@ -1132,7 +1159,7 @@ static gboolean find_in_tree(GtkTreeIter *parent, gchar **path_split, gint level static gboolean follow_editor_on_idle(gpointer foo) { GtkTreeIter root_iter, found_iter; - gchar *path = NULL; + gchar *utf8_path = NULL; gchar **path_split; GeanyDocument *doc; GSList *elem; @@ -1149,20 +1176,20 @@ static gboolean follow_editor_on_idle(gpointer foo) { PrjOrgRoot *root = elem->data; - path = get_relative_path(root->base_dir, doc->file_name); - if (path) + utf8_path = get_relative_path(root->base_dir, doc->file_name); + if (utf8_path) break; - g_free(path); - path = NULL; + g_free(utf8_path); + utf8_path = NULL; if (!gtk_tree_model_iter_next(model, &root_iter)) break; } - if (!path) + if (!utf8_path) return FALSE; - path_split = g_strsplit_set(path, "/\\", 0); + path_split = g_strsplit_set(utf8_path, "/\\", 0); if (find_in_tree(&root_iter, path_split, 0, &found_iter)) { @@ -1180,7 +1207,7 @@ static gboolean follow_editor_on_idle(gpointer foo) gtk_tree_path_free(tree_path); } - g_free(path); + g_free(utf8_path); g_strfreev(path_split); return FALSE; Modified: projectorganizer/src/prjorg-utils.c 21 lines changed, 15 insertions(+), 6 deletions(-) =================================================================== @@ -27,20 +27,28 @@ extern GeanyData *geany_data; extern GeanyFunctions *geany_functions; -gchar *get_relative_path(const gchar *parent, const gchar *descendant) +/* utf8 */ +gchar *get_relative_path(const gchar *utf8_parent, const gchar *utf8_descendant) { GFile *gf_parent, *gf_descendant; - gchar *ret; + gchar *locale_parent, *locale_descendant; + gchar *locale_ret, *utf8_ret; - gf_parent = g_file_new_for_path(parent); - gf_descendant = g_file_new_for_path(descendant); + locale_parent = utils_get_locale_from_utf8(utf8_parent); + locale_descendant = utils_get_locale_from_utf8(utf8_descendant); + gf_parent = g_file_new_for_path(locale_parent); + gf_descendant = g_file_new_for_path(locale_descendant); - ret = g_file_get_relative_path(gf_parent, gf_descendant); + locale_ret = g_file_get_relative_path(gf_parent, gf_descendant); + utf8_ret = utils_get_utf8_from_locale(locale_ret); g_object_unref(gf_parent); g_object_unref(gf_descendant); + g_free(locale_parent); + g_free(locale_descendant); + g_free(locale_ret); - return ret; + return utf8_ret; } @@ -118,6 +126,7 @@ gchar *get_selection(void) } +/* utf8 */ gchar *get_project_base_path(void) { GeanyProject *project = geany_data->app->project; Modified: projectorganizer/src/prjorg-utils.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -19,7 +19,7 @@ #ifndef __PRJORG_UTILS_H__ #define __PRJORG_UTILS_H__ -gchar *get_relative_path(const gchar *parent, const gchar *descendant); +gchar *get_relative_path(const gchar *utf8_parent, const gchar *utf8_descendant); gboolean patterns_match(GSList *patterns, const gchar *str); GSList *get_precompiled_patterns(gchar **patterns); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] faa0e4: projectorganizer: properly release pattern spec
by Jiří Techet 30 Jun '15

30 Jun '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 30 Jun 2015 11:18:16 UTC Commit: faa0e4abacf50fa3ef11ec37207645b4f0c8a7d1 https://github.com/geany/geany-plugins/commit/faa0e4abacf50fa3ef11ec3720764… Log Message: ----------- projectorganizer: properly release pattern spec Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -423,6 +423,7 @@ static void find_file(GtkTreeIter *iter) msgwin_switch_tab(MSG_MESSAGE, TRUE); g_free(utf8_base_path); g_free(locale_base_path); + g_pattern_spec_free(pattern); } g_free(pattern_str); @@ -627,7 +628,7 @@ static void find_tags(const gchar *name, gboolean declaration, gboolean case_sen msgwin_switch_tab(MSG_MESSAGE, TRUE); g_free(name_case); - g_free(pspec); + g_pattern_spec_free(pspec); g_free(utf8_base_path); g_free(locale_base_path); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 153775: projectorganizer: remove trailing spaces
by Jiří Techet 30 Jun '15

30 Jun '15

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 30 Jun 2015 11:18:16 UTC Commit: 153775585a4161522dddcdad71e5b944735576f0 https://github.com/geany/geany-plugins/commit/153775585a4161522dddcdad71e5b… Log Message: ----------- projectorganizer: remove trailing spaces Modified Paths: -------------- projectorganizer/src/prjorg-main.c projectorganizer/src/prjorg-menu.c projectorganizer/src/prjorg-project.c projectorganizer/src/prjorg-project.h projectorganizer/src/prjorg-sidebar.c projectorganizer/src/prjorg-utils.c Modified: projectorganizer/src/prjorg-main.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -73,7 +73,7 @@ static void on_doc_close(G_GNUC_UNUSED GObject * obj, GeanyDocument * doc, if (doc->file_name == NULL) return; - /* tags of open files managed by geany - when the file gets closed, + /* tags of open files managed by geany - when the file gets closed, * we should take care of it */ if (prjorg_project_is_in_project(doc->file_name)) prjorg_project_add_single_tm_file(doc->file_name); Modified: projectorganizer/src/prjorg-menu.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -162,7 +162,7 @@ static void on_swap_header_source(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_U GHashTableIter iter; gpointer key, value; PrjOrgRoot *root = elem->data; - + list = NULL; g_hash_table_iter_init(&iter, root->file_table); while (g_hash_table_iter_next(&iter, &key, &value)) @@ -305,20 +305,20 @@ static void on_open_selected_file(GtkMenuItem *menuitem, gpointer user_data) PrjOrgRoot *root = elem->data; gpointer key, value; GHashTableIter iter; - + g_hash_table_iter_init(&iter, root->file_table); while (g_hash_table_iter_next(&iter, &key, &value)) { gchar *file_name = key; gchar *pos = g_strrstr(file_name, utf8_path); - + if (pos && (pos - file_name + strlen(utf8_path) == strlen(file_name))) { found_path = file_name; break; } } - + if (found_path) break; } Modified: projectorganizer/src/prjorg-project.c 58 lines changed, 29 insertions(+), 29 deletions(-) =================================================================== @@ -63,7 +63,7 @@ static void clear_idle_queue(GSList **queue) static void collect_source_files(gchar *filename, TMSourceFile *sf, gpointer user_data) { GPtrArray *array = user_data; - + if (sf != NULL) g_ptr_array_add(array, sf); } @@ -174,7 +174,7 @@ static gint prjorg_project_rescan_root(PrjOrgRoot *root) ignored_file_list = get_precompiled_patterns(prj_org->ignored_file_patterns); lst = get_file_list(root->base_dir, pattern_list, ignored_dirs_list, ignored_file_list); - + foreach_slist(elem, lst) { char *path = elem->data; @@ -194,7 +194,7 @@ static gint prjorg_project_rescan_root(PrjOrgRoot *root) g_slist_foreach(ignored_dirs_list, (GFunc) g_pattern_spec_free, NULL); g_slist_free(ignored_dirs_list); - + return filenum; } @@ -288,11 +288,11 @@ static void regenerate_tags(PrjOrgRoot *root, gpointer user_data) TMSourceFile *sf; gchar *utf8_path = key; gchar *locale_path = utils_get_locale_from_utf8(utf8_path); - + sf = tm_source_file_new(locale_path, filetypes_detect(utf8_path)->name); if (sf && !document_find_by_filename(utf8_path)) g_ptr_array_add(source_files, sf); - + g_hash_table_insert(file_table, g_strdup(utf8_path), sf); g_free(locale_path); } @@ -308,16 +308,16 @@ void prjorg_project_rescan(void) { GSList *elem; gint filenum = 0; - + if (!prj_org) return; clear_idle_queue(&s_idle_add_funcs); clear_idle_queue(&s_idle_remove_funcs); - + foreach_slist(elem, prj_org->roots) filenum += prjorg_project_rescan_root(elem->data); - + if (prj_org->generate_tag_prefs == PrjOrgTagYes || (prj_org->generate_tag_prefs == PrjOrgTagAuto && filenum < 300)) g_slist_foreach(prj_org->roots, (GFunc)regenerate_tags, NULL); } @@ -356,7 +356,7 @@ void prjorg_project_save(GKeyFile * key_file) { GPtrArray *array; GSList *elem, *lst; - + if (!prj_org) return; @@ -369,7 +369,7 @@ void prjorg_project_save(GKeyFile * key_file) g_key_file_set_string_list(key_file, "prjorg", "ignored_file_patterns", (const gchar**) prj_org->ignored_file_patterns, g_strv_length(prj_org->ignored_file_patterns)); g_key_file_set_integer(key_file, "prjorg", "generate_tag_prefs", prj_org->generate_tag_prefs); - + array = g_ptr_array_new(); lst = prj_org->roots->next; foreach_slist (elem, lst) @@ -394,12 +394,12 @@ static PrjOrgRoot *create_root(const gchar *utf8_base_dir) static void close_root(PrjOrgRoot *root, gpointer user_data) { GPtrArray *source_files; - + source_files = g_ptr_array_new(); g_hash_table_foreach(root->file_table, (GHFunc)collect_source_files, source_files); tm_workspace_remove_source_files(source_files); g_ptr_array_free(source_files, TRUE); - + g_hash_table_destroy(root->file_table); g_free(root->base_dir); g_free(root); @@ -435,12 +435,12 @@ void prjorg_project_add_external_dir(const gchar *utf8_dirname) close_root(new_root, NULL); return; } - + GSList *lst = prj_org->roots->next; lst = g_slist_prepend(lst, new_root); lst = g_slist_sort(lst, (GCompareFunc)root_comparator); prj_org->roots->next = lst; - + prjorg_project_rescan(); } @@ -452,7 +452,7 @@ void prjorg_project_remove_external_dir(const gchar *utf8_dirname) if (found != NULL) { PrjOrgRoot *found_root = found->data; - + prj_org->roots = g_slist_remove(prj_org->roots, found_root); close_root(found_root, NULL); prjorg_project_rescan(); @@ -685,10 +685,10 @@ void prjorg_project_close(void) gboolean prjorg_project_is_in_project(const gchar *utf8_filename) { GSList *elem; - + if (!utf8_filename || !prj_org || !geany_data->app->project || !prj_org->roots) return FALSE; - + foreach_slist (elem, prj_org->roots) { PrjOrgRoot *root = elem->data; @@ -703,7 +703,7 @@ gboolean prjorg_project_is_in_project(const gchar *utf8_filename) static gboolean add_tm_idle(gpointer foo) { GSList *elem2; - + if (!prj_org || !s_idle_add_funcs) return FALSE; @@ -711,12 +711,12 @@ static gboolean add_tm_idle(gpointer foo) { GSList *elem; gchar *utf8_fname = elem2->data; - + foreach_slist (elem, prj_org->roots) { PrjOrgRoot *root = elem->data; TMSourceFile *sf = g_hash_table_lookup(root->file_table, utf8_fname); - + if (sf != NULL && !document_find_by_filename(utf8_fname)) { tm_workspace_add_source_file(sf); @@ -724,7 +724,7 @@ static gboolean add_tm_idle(gpointer foo) } } } - + clear_idle_queue(&s_idle_add_funcs); return FALSE; @@ -734,15 +734,15 @@ static gboolean add_tm_idle(gpointer foo) /* This function gets called when document is being closed by Geany and we need * to add the TMSourceFile from the tag manager because Geany removes it on * document close. - * - * Additional problem: The tag removal in Geany happens after this function is called. + * + * Additional problem: The tag removal in Geany happens after this function is called. * To be sure, perform on idle after this happens (even though from my knowledge of TM * this shouldn't probably matter). */ void prjorg_project_add_single_tm_file(gchar *utf8_filename) { if (s_idle_add_funcs == NULL) plugin_idle_add(geany_plugin, (GSourceFunc)add_tm_idle, NULL); - + s_idle_add_funcs = g_slist_prepend(s_idle_add_funcs, g_strdup(utf8_filename)); } @@ -750,7 +750,7 @@ void prjorg_project_add_single_tm_file(gchar *utf8_filename) static gboolean remove_tm_idle(gpointer foo) { GSList *elem2; - + if (!prj_org || !s_idle_remove_funcs) return FALSE; @@ -763,12 +763,12 @@ static gboolean remove_tm_idle(gpointer foo) { PrjOrgRoot *root = elem->data; TMSourceFile *sf = g_hash_table_lookup(root->file_table, utf8_fname); - + if (sf != NULL) tm_workspace_remove_source_file(sf); } } - + clear_idle_queue(&s_idle_remove_funcs); return FALSE; @@ -781,7 +781,7 @@ static gboolean remove_tm_idle(gpointer foo) * files, the file inserted by the plugin isn't updated automatically in TM * so any changes wouldn't be reflected in the tags array (e.g. removed function * from source file would still be found in TM) - * + * * Additional problem: The document being opened may be caused * by going to tag definition/declaration - tag processing is in progress * when this function is called and if we remove the TmSourceFile now, line @@ -791,6 +791,6 @@ void prjorg_project_remove_single_tm_file(gchar *utf8_filename) { if (s_idle_remove_funcs == NULL) plugin_idle_add(geany_plugin, (GSourceFunc)remove_tm_idle, NULL); - + s_idle_remove_funcs = g_slist_prepend(s_idle_remove_funcs, g_strdup(utf8_filename)); } Modified: projectorganizer/src/prjorg-project.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -39,7 +39,7 @@ typedef struct gchar **ignored_dirs_patterns; gchar **ignored_file_patterns; PrjOrgTagPrefs generate_tag_prefs; - + GSList *roots; /* list of PrjOrgRoot; the project root is always the first followed by external dirs roots */ } PrjOrg; Modified: projectorganizer/src/prjorg-sidebar.c 78 lines changed, 39 insertions(+), 39 deletions(-) =================================================================== @@ -198,10 +198,10 @@ static gboolean topmost_selected(GtkTreeModel *model, GtkTreeIter *iter, gboolea { GtkTreePath *path, *first_path; gboolean ret, is_first; - + first_path = gtk_tree_path_new_first(); path = gtk_tree_model_get_path(model, iter); - + is_first = gtk_tree_path_compare(first_path, path) == 0; ret = gtk_tree_path_get_depth(path) == 1 && ((is_first && first) || (!is_first && !first)); gtk_tree_path_free(first_path); @@ -265,9 +265,9 @@ static void collapse(void) GtkTreeIter iter; GtkTreePath *tree_path; GtkTreeModel *model = GTK_TREE_MODEL(s_file_store); - + gtk_tree_view_collapse_all(GTK_TREE_VIEW(s_file_view)); - + /* expand the project folder */ gtk_tree_model_iter_children(model, &iter, NULL); tree_path = gtk_tree_model_get_path (model, &iter); @@ -305,11 +305,11 @@ static void on_add_external(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED { gchar *locale_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); gchar *utf8_filename = utils_get_utf8_from_locale(locale_filename); - + prjorg_project_add_external_dir(utf8_filename); prjorg_sidebar_update(TRUE); project_write_config(); - + g_free(utf8_filename); g_free(locale_filename); } @@ -327,19 +327,19 @@ static void on_remove_external_dir(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_U GtkTreeModel *model; GtkTreeIter iter, parent; gchar *name; - + treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(s_file_view)); if (!gtk_tree_selection_get_selected(treesel, &model, &iter)) return; if (gtk_tree_model_iter_parent(model, &parent, &iter)) return; - + gtk_tree_model_get(model, &iter, FILEVIEW_COLUMN_NAME, &name, -1); prjorg_project_remove_external_dir(name); prjorg_sidebar_update(TRUE); project_write_config(); - + g_free(name); } @@ -539,20 +539,20 @@ static const char *tm_tag_type_name(const TMTag *tag) } -static gboolean match(TMTag *tag, const gchar *name, gboolean declaration, gboolean case_sensitive, +static gboolean match(TMTag *tag, const gchar *name, gboolean declaration, gboolean case_sensitive, MatchType match_type, GPatternSpec *pspec, gchar *utf8_path) { const gint forward_types = tm_tag_prototype_t | tm_tag_externvar_t; gboolean matches = FALSE; gint type; - + type = declaration ? forward_types : tm_tag_max_t - forward_types; matches = tag->type & type; - + if (matches) { gchar *name_case; - + if (case_sensitive) name_case = g_strdup(tag->name); else @@ -560,7 +560,7 @@ static gboolean match(TMTag *tag, const gchar *name, gboolean declaration, gbool switch (match_type) { - case MATCH_FULL: + case MATCH_FULL: matches = g_strcmp0(name_case, name) == 0; break; case MATCH_PATTERN: @@ -572,18 +572,18 @@ static gboolean match(TMTag *tag, const gchar *name, gboolean declaration, gbool } g_free(name_case); } - + if (matches && utf8_path) { gchar *utf8_file_name = utils_get_utf8_from_locale(tag->file->file_name); gchar *relpath; - + relpath = get_relative_path(utf8_path, utf8_file_name); matches = relpath != NULL; g_free(relpath); g_free(utf8_file_name); } - + return matches; } @@ -596,12 +596,12 @@ static void find_tags(const gchar *name, gboolean declaration, gboolean case_sen guint i; gchar *name_case; GPatternSpec *pspec; - + if (case_sensitive) name_case = g_strdup(name); else name_case = g_utf8_strdown(name, -1); - + pspec = g_pattern_spec_new(name_case); msgwin_set_messages_dir(locale_base_path); @@ -615,7 +615,7 @@ static void find_tags(const gchar *name, gboolean declaration, gboolean case_sen gchar *scopestr = tag->scope ? g_strconcat(tag->scope, "::", NULL) : g_strdup(""); gchar *utf8_fname = utils_get_utf8_from_locale(tag->file->file_name); gchar *relpath; - + relpath = get_relative_path(utf8_base_path, utf8_fname); msgwin_msg_add(COLOR_BLACK, -1, NULL, "%s:%lu:\n\t[%s]\t %s%s%s", relpath, tag->line, tm_tag_type_name(tag), scopestr, tag->name, tag->arglist ? tag->arglist : ""); @@ -625,7 +625,7 @@ static void find_tags(const gchar *name, gboolean declaration, gboolean case_sen } } msgwin_switch_tab(MSG_MESSAGE, TRUE); - + g_free(name_case); g_free(pspec); g_free(utf8_base_path); @@ -671,7 +671,7 @@ static void find_tag(GtkTreeIter *iter) find_tags(name, declaration, case_sensitive, match_type, iter ? utf8_path : NULL); } - + g_free(utf8_path); gtk_widget_hide(s_ft_dialog.widget); } @@ -803,7 +803,7 @@ static gboolean on_button_release(G_GNUC_UNUSED GtkWidget * widget, GdkEventButt static gboolean on_button_press(G_GNUC_UNUSED GtkWidget * widget, GdkEventButton * event, G_GNUC_UNUSED gpointer user_data) { - if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) + if (event->button == 1 && event->type == GDK_2BUTTON_PRESS) { on_open_clicked(); return TRUE; @@ -898,7 +898,7 @@ static void create_branch(gint level, GSList *leaf_list, GtkTreeIter *parent, if (content_type) { icon = g_content_type_get_icon(content_type); - if (icon) + if (icon) { GtkIconInfo *icon_info; @@ -1060,7 +1060,7 @@ static void load_project_root(PrjOrgRoot *root, GtkTreeIter *parent, GSList *hea else set_intro_message(_("Set file patterns under Project->Properties")); } - + g_slist_foreach(lst, (GFunc) g_free, NULL); g_slist_free(lst); g_slist_foreach(path_list, (GFunc) g_strfreev, NULL); @@ -1074,7 +1074,7 @@ static void load_project(void) GtkTreeIter iter; gboolean first = TRUE; GIcon *icon_dir; - + gtk_tree_store_clear(s_file_store); if (!prj_org || !geany_data->app->project) @@ -1084,15 +1084,15 @@ static void load_project(void) header_patterns = get_precompiled_patterns(prj_org->header_patterns); source_patterns = get_precompiled_patterns(prj_org->source_patterns); - + /* reload on every refresh to update the color e.g. when the theme changes */ s_external_color = gtk_widget_get_style(s_toolbar)->bg[GTK_STATE_NORMAL]; - + foreach_slist (elem, prj_org->roots) { PrjOrgRoot *root = elem->data; gchar *name; - + if (first) name = g_strconcat("", geany_data->app->project->name, "", NULL); else @@ -1108,7 +1108,7 @@ static void load_project(void) first = FALSE; g_free(name); } - + collapse(); g_slist_foreach(header_patterns, (GFunc) g_pattern_spec_free, NULL); @@ -1175,17 +1175,17 @@ static gboolean follow_editor_on_idle(gpointer foo) foreach_slist (elem, prj_org->roots) { PrjOrgRoot *root = elem->data; - + utf8_path = get_relative_path(root->base_dir, doc->file_name); if (utf8_path) break; - + g_free(utf8_path); utf8_path = NULL; if (!gtk_tree_model_iter_next(model, &root_iter)) break; } - + if (!utf8_path) return FALSE; @@ -1201,15 +1201,15 @@ static gboolean follow_editor_on_idle(gpointer foo) gtk_tree_view_expand_to_path(GTK_TREE_VIEW(s_file_view), tree_path); gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(s_file_view), tree_path, NULL, FALSE, 0.0, 0.0); - + treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(s_file_view)); gtk_tree_selection_select_iter(treesel, &found_iter); gtk_tree_path_free(tree_path); } - + g_free(utf8_path); g_strfreev(path_split); - + return FALSE; } @@ -1218,14 +1218,14 @@ void prjorg_sidebar_update(gboolean reload) { if (reload) { - /* we get color information only after the sidebar is realized - + /* we get color information only after the sidebar is realized - * postpone reload if this is not the case yet */ if (gtk_widget_get_realized(s_toolbar)) load_project(); else s_pending_reload = TRUE; } - if (s_follow_editor) + if (s_follow_editor) /* perform on idle - avoids unnecessary jumps on project load */ plugin_idle_add(geany_plugin, (GSourceFunc)follow_editor_on_idle, NULL); } @@ -1326,7 +1326,7 @@ void prjorg_sidebar_init(void) gtk_tree_view_column_pack_start(column, renderer, FALSE); gtk_tree_view_column_add_attribute(column, renderer, "gicon", FILEVIEW_COLUMN_ICON); gtk_tree_view_column_add_attribute(column, renderer, "cell-background-gdk", FILEVIEW_COLUMN_COLOR); - + renderer = gtk_cell_renderer_text_new(); gtk_tree_view_column_pack_start(column, renderer, TRUE); gtk_tree_view_column_add_attribute(column, renderer, "markup", FILEVIEW_COLUMN_NAME); Modified: projectorganizer/src/prjorg-utils.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -97,7 +97,7 @@ void open_file(gchar *utf8_name) gtk_notebook_set_current_page(GTK_NOTEBOOK(geany->main_widgets->notebook), document_get_notebook_page(doc)); } - + if (doc) gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] cf962e: Update of German translation
by Frank Lanitz 29 Jun '15

29 Jun '15

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 29 Jun 2015 17:53:22 UTC Commit: cf962e83b2224f6b10d0780749c3edd23c3a0007 https://github.com/geany/geany-plugins/commit/cf962e83b2224f6b10d0780749c3e… Log Message: ----------- Update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 174 lines changed, 91 insertions(+), 83 deletions(-) =================================================================== @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: Geany-plugins 1.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-20 11:24+0200\n" +"POT-Creation-Date: 2015-06-29 19:21+0200\n" "PO-Revision-Date: 2015-04-20 20:17+0200\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" @@ -52,7 +52,7 @@ msgid "Bookmarks" msgstr "Lesezeichen" #. complete update -#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2351 +#: ../addons/src/ao_tasks.c:373 ../geanyvc/src/geanyvc.c:2352 msgid "_Update" msgstr "_Aktualisieren" @@ -114,20 +114,32 @@ msgstr "URI öffnen" msgid "Copy URI" msgstr "URI kopieren" -#: ../addons/src/ao_wrapwords.c:249 +#: ../addons/src/ao_wrapwords.c:253 msgid "Enclose Characters" msgstr "Begrenzungszeichen" -#: ../addons/src/ao_wrapwords.c:260 +#: ../addons/src/ao_wrapwords.c:254 +msgid "Accept" +msgstr "Akzeptieren" + +#: ../addons/src/ao_wrapwords.c:255 ../geanymacro/src/geanymacro.c:1064 +msgid "Cancel" +msgstr "Abbrechen" + +#: ../addons/src/ao_wrapwords.c:255 +msgid "OK" +msgstr "OK" + +#: ../addons/src/ao_wrapwords.c:264 #, c-format msgid "Enclose combo %d" msgstr "Begrenzungspaar %d" -#: ../addons/src/ao_wrapwords.c:276 +#: ../addons/src/ao_wrapwords.c:280 msgid "Opening Character" msgstr "Startzeichen" -#: ../addons/src/ao_wrapwords.c:283 +#: ../addons/src/ao_wrapwords.c:287 msgid "Closing Character" msgstr "Stopzeichen" @@ -169,8 +181,8 @@ msgstr "XML-Tagging ausführen" #: ../addons/src/addons.c:417 ../autoclose/src/autoclose.c:885 #: ../codenav/src/codenavigation.c:293 ../geanylatex/src/geanylatex.c:241 -#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:123 -#: ../geanysendmail/src/geanysendmail.c:291 ../geanyvc/src/geanyvc.c:1854 +#: ../geanyprj/src/geanyprj.c:174 ../geanysendmail/src/geanysendmail.c:125 +#: ../geanysendmail/src/geanysendmail.c:290 ../geanyvc/src/geanyvc.c:1854 #: ../geniuspaste/src/geniuspaste.c:140 ../spellcheck/src/scplugin.c:153 #: ../treebrowser/src/treebrowser.c:1938 #: ../updatechecker/src/updatechecker.c:267 @@ -3753,10 +3765,6 @@ msgstr "Makro aufnehmen" msgid "Record" msgstr "Aufnehmen" -#: ../geanymacro/src/geanymacro.c:1064 -msgid "Cancel" -msgstr "Abbrechen" - #: ../geanymacro/src/geanymacro.c:1071 msgid "Macro Trigger:" msgstr "Auslöser für das Makro" @@ -4646,13 +4654,13 @@ msgstr "E-Mail-Adresse des Empfängers" msgid "Enter the recipient's e-mail address:" msgstr "E-Mail-Adresse des Empfängers:" -#: ../geanysendmail/src/geanysendmail.c:138 +#: ../geanysendmail/src/geanysendmail.c:140 msgid "Filename placeholder not found. The executed command might have failed." msgstr "" "Konnte den Platzhalter für den Dateinamen nicht finden. Der angegebene " "Befehl könnte nicht korrekt ausgeführt worden sein." -#: ../geanysendmail/src/geanysendmail.c:144 +#: ../geanysendmail/src/geanysendmail.c:146 msgid "" "Recipient address placeholder not found. The executed command might have " "failed." @@ -4660,34 +4668,34 @@ msgstr "" "Konnte den Platzhalter für den E-Mail-Empfänger nicht finden. Der angegebene " "Befehl könnte nicht korrekt ausgeführt worden sein." -#: ../geanysendmail/src/geanysendmail.c:159 +#: ../geanysendmail/src/geanysendmail.c:160 msgid "Could not execute mailer. Please check your configuration." msgstr "" "Konnte das E-Mail-Programm nicht aufrufen. Bitte überprüfen Sie Ihre " "Einstellungen." -#: ../geanysendmail/src/geanysendmail.c:168 +#: ../geanysendmail/src/geanysendmail.c:169 msgid "Please define a mail client first." msgstr "Bitte ein E-Mail-Programm angeben!" -#: ../geanysendmail/src/geanysendmail.c:173 +#: ../geanysendmail/src/geanysendmail.c:174 msgid "File has to be saved before sending." msgstr "Die Datei muss vor dem Senden gespeichert werden." -#: ../geanysendmail/src/geanysendmail.c:191 +#: ../geanysendmail/src/geanysendmail.c:190 msgid "Mail" msgstr "E-Mail" -#: ../geanysendmail/src/geanysendmail.c:222 +#: ../geanysendmail/src/geanysendmail.c:221 msgid "Send by mail" msgstr "Per E-Mail senden" #. add a label and a text entry to the dialog -#: ../geanysendmail/src/geanysendmail.c:312 +#: ../geanysendmail/src/geanysendmail.c:311 msgid "Path and options for the mail client:" msgstr "Pfad und Optionen für das E-Mail-Programm:" -#: ../geanysendmail/src/geanysendmail.c:320 +#: ../geanysendmail/src/geanysendmail.c:319 msgid "" "Note: \n" "\t%f will be replaced by your file.\n" @@ -4705,32 +4713,32 @@ msgstr "" "\tsylpheed --attach \"%f\" --compose \"%r\"\n" "\tmutt -s \"Sending %b'\" -a \"%f\" \"%r\"" -#: ../geanysendmail/src/geanysendmail.c:330 +#: ../geanysendmail/src/geanysendmail.c:329 msgid "Show toolbar icon" msgstr "Werkzeugleistensymbol anzeigen" -#: ../geanysendmail/src/geanysendmail.c:332 +#: ../geanysendmail/src/geanysendmail.c:331 msgid "Shows a icon in the toolbar to send file more easy." msgstr "" "Zeigt ein Symbol in der Werkzeugleiste an, sodass eine Datei einfacher " "versendet werden kann." -#: ../geanysendmail/src/geanysendmail.c:338 +#: ../geanysendmail/src/geanysendmail.c:337 msgid "Use dialog for entering email address of recipients" msgstr "" "Dialog zum Eingeben der E-Mail-Adresse des Empfängers der zu sendenden Datei " "anzeigen" -#: ../geanysendmail/src/geanysendmail.c:360 +#: ../geanysendmail/src/geanysendmail.c:359 msgid "Send file by mail" msgstr "Per Mail senden" #. Build up menu entry -#: ../geanysendmail/src/geanysendmail.c:383 +#: ../geanysendmail/src/geanysendmail.c:382 msgid "_Mail document" msgstr "_Dokument versenden" -#: ../geanysendmail/src/geanysendmail.c:386 +#: ../geanysendmail/src/geanysendmail.c:385 msgid "" "Sends the opened file as unzipped attachment by any mailer from your $PATH" msgstr "" @@ -5094,33 +5102,33 @@ msgstr "Alle Änderungen verwerfen" msgid "Update file" msgstr "Datei aktualisieren" -#: ../geanyvc/src/geanyvc.c:2316 +#: ../geanyvc/src/geanyvc.c:2317 msgid "_VC" msgstr "_VC" -#: ../geanyvc/src/geanyvc.c:2322 +#: ../geanyvc/src/geanyvc.c:2323 msgid "_Version Control" msgstr "_Versionskontrolle" #. Status of basedir -#: ../geanyvc/src/geanyvc.c:2344 +#: ../geanyvc/src/geanyvc.c:2345 msgid "_Status" msgstr "_Status" -#: ../geanyvc/src/geanyvc.c:2346 +#: ../geanyvc/src/geanyvc.c:2347 msgid "Show status." msgstr "Zeigt den Status der Arbeitskopie." -#: ../geanyvc/src/geanyvc.c:2353 +#: ../geanyvc/src/geanyvc.c:2354 msgid "Update from remote repository." msgstr "Aus dem Repositorium aktualisieren" #. Commit all changes -#: ../geanyvc/src/geanyvc.c:2358 +#: ../geanyvc/src/geanyvc.c:2359 msgid "_Commit" msgstr "Über_tragen" -#: ../geanyvc/src/geanyvc.c:2360 +#: ../geanyvc/src/geanyvc.c:2361 msgid "Commit changes." msgstr "Änderungen übertragen." @@ -5230,30 +5238,30 @@ msgstr "" "Hebt noch nicht committete Änderungen an in einem git-Repository verwaltete " "Dateien hervor." -#: ../git-changebar/src/gcb-plugin.c:1108 ../pohelper/src/gph-plugin.c:1577 +#: ../git-changebar/src/gcb-plugin.c:1116 ../pohelper/src/gph-plugin.c:1577 #, c-format msgid "Failed to load configuration file: %s" msgstr "Konnte Konfiguration nicht laden: %s" -#: ../git-changebar/src/gcb-plugin.c:1133 ../pohelper/src/gph-plugin.c:1602 +#: ../git-changebar/src/gcb-plugin.c:1141 ../pohelper/src/gph-plugin.c:1602 #, c-format msgid "Failed to create configuration directory \"%s\": %s" msgstr "Konnte das Konfigurationsverzeichnis »%s« nicht anlegen: %s" -#: ../git-changebar/src/gcb-plugin.c:1136 ../pohelper/src/gph-plugin.c:1605 +#: ../git-changebar/src/gcb-plugin.c:1144 ../pohelper/src/gph-plugin.c:1605 #, c-format msgid "Failed to save configuration file: %s" msgstr "Konnte Konfiguration nicht speichern: %s" -#: ../git-changebar/src/gcb-plugin.c:1214 +#: ../git-changebar/src/gcb-plugin.c:1223 msgid "Go to the previous hunk" msgstr "Zur vorherigen Block mit Änderungen springen" -#: ../git-changebar/src/gcb-plugin.c:1216 +#: ../git-changebar/src/gcb-plugin.c:1225 msgid "Go to the next hunk" msgstr "Zur nächsten Block mit Änderungen springen" -#: ../git-changebar/src/gcb-plugin.c:1341 ../pohelper/src/gph-plugin.c:1373 +#: ../git-changebar/src/gcb-plugin.c:1350 ../pohelper/src/gph-plugin.c:1373 #: ../pohelper/src/gph-plugin.c:1706 #, c-format msgid "" @@ -5337,10 +5345,9 @@ msgstr "Überblick anzeigen" msgid "" "The amount to zoom the overview sidebar. This should probably negative if " "you want the sidebar zoomed out." -msgstr "" +msgstr "Legt fest, wie stark die Seitenleiste von »Overview« vergrößert/verkleinert werden soll. Negative Werte sorgen für eine größere Übersicht." #: ../overview/data/prefs.ui.h:2 -#, fuzzy msgid "Zoom Level:" msgstr "Zoom-Stufe:" @@ -5355,53 +5362,51 @@ msgstr "Breite:" #: ../overview/data/prefs.ui.h:5 msgid "" "The number of lines to scroll at a time when scrolling the overview sidebar." -msgstr "" +msgstr "Legt die Anzahl der Zeilen fest, die beim Scrollen in der Seitenleiste zurückgelegt werden sollen." #: ../overview/data/prefs.ui.h:6 msgid "Scroll Lines:" -msgstr "" +msgstr "Scrollgeschwindigkeit:" #: ../overview/data/prefs.ui.h:7 -#, fuzzy msgid "Position on left" -msgstr "Positionsname" +msgstr "Links positionieren" #: ../overview/data/prefs.ui.h:8 msgid "" "Position the overview bar on the left rather than the right (requires Geany " "1.25 or greater)." -msgstr "" +msgstr "Diese Option positioniert die Seitenleiste des Plugins an der linken Seite von Geany. Dies funktioniert nur in Geany-Versionen >= 1.25." #: ../overview/data/prefs.ui.h:9 -#, fuzzy msgid "Hide tooltip" -msgstr "Tooltips anzeigen." +msgstr "Tooltips verstecken." #: ../overview/data/prefs.ui.h:10 msgid "" "Hide the tooltip that is displayed when mousing over the overview that shows " "line, column and position information." -msgstr "" +msgstr "Versteckt die zusätzlichen Informationen, die beim mit der Maus überstreichen angezeigt werden (Zeile, Spalte etc.)" #: ../overview/data/prefs.ui.h:11 msgid "Hide editor scrollbar" -msgstr "" +msgstr "Normale Bildlaufleiste verstecken" #: ../overview/data/prefs.ui.h:12 msgid "" "Whether to hide Geany's regular editor scrollbar while the overview bar is " "visible." -msgstr "" +msgstr "Mit dieser Option kann Geanys normale Bildlaufleiste versteckt werden, so dass, wenn das Plugin aktiv ist, allein über die Vorschau im Dokument navigiert werden kann." #: ../overview/data/prefs.ui.h:13 msgid "Disable overlay" -msgstr "" +msgstr "Bildausschnittsmarkierung deaktivieren" #: ../overview/data/prefs.ui.h:14 msgid "" "Turn off drawing overlay, which shows the region of the main editor view " "that is currently in view, ontop of the overview bar." -msgstr "" +msgstr "Diese Option legt fest, ob der aktuelle Bildschirmausschnitt aus dem normalen Editorfenster in der Vorschau angezeigt werden soll." #: ../overview/data/prefs.ui.h:15 ../scope/data/scope.glade.h:109 msgid "Options" @@ -5410,38 +5415,36 @@ msgstr "Optionen" #: ../overview/data/prefs.ui.h:16 msgid "" "The color and opacity of the overlay drawn ontop of the overlay sidebar." -msgstr "" +msgstr "Konfiguriert die Farbe und Sättigung der Bildausschnittsmarkierung in der Seitenleiste des Plugins." #: ../overview/data/prefs.ui.h:17 -#, fuzzy msgid "Color:" -msgstr "Farben:" +msgstr "Farbe:" #: ../overview/data/prefs.ui.h:18 msgid "" "The color and opacity of the border drawn around the revealed area in the " "overview sidebar. Set to the same as Overlay Color to disable." -msgstr "" +msgstr "Konfiguriert die Farbe und Sättigung rund um das aktive Gebiet des Dokumentes. Zum Deaktivieren einfach auf die gleiche Farbe wie die der Bildausschnittsmarkierung stellen" #: ../overview/data/prefs.ui.h:19 -#, fuzzy msgid "Outline Color:" -msgstr "Farbe auswählen" +msgstr "Farbe Außenlinie" #: ../overview/data/prefs.ui.h:20 msgid "Draw over visible area" -msgstr "" +msgstr "Über sichtbares Gebiet zeichnen" #: ../overview/data/prefs.ui.h:21 msgid "" "When checked it will draw the overlay ontop of the area that is visible in " "the main editor view, when unchecked, it will do the opposite and draw the " "overlay everywhere but the visible area, \"revealing\" the visible part." -msgstr "" +msgstr "Wenn diese Option aktiv ist, wird die Bildausschnittsmarkierung nur über den aktiven Bereich gelegt. Ist die Option deaktiviert, wird alles was nicht sichtbar ist mit einer Markierung versehen. " #: ../overview/data/prefs.ui.h:22 msgid "Overlay" -msgstr "" +msgstr "Überlagerung" #: ../pairtaghighlighter/src/pair_tag_highlighter.c:35 msgid "Pair Tag Highlighter" @@ -5603,7 +5606,6 @@ msgstr "Verbessert die Unterstützung für GetText-Übersetzungsdateien" # c-format #: ../pohelper/src/gph-plugin.c:1305 ../pohelper/src/gph-plugin.c:1322 -#, fuzzy, c-format msgid "Translated: %.3g%%" msgstr "Übersetzt: %,3g%%" @@ -5729,7 +5731,6 @@ msgid "Project Organizer" msgstr "Project Organizer" #: ../projectorganizer/src/prjorg-main.c:42 -#, fuzzy msgid "" "Project file tree, project-wide indexing and search, extra navigation " "options (was GProject)" @@ -5829,9 +5830,8 @@ msgid "Generate tags for all project files:" msgstr "Tags für alle Projektdateien erstellen" #: ../projectorganizer/src/prjorg-project.c:602 -#, fuzzy msgid "Auto (generate if less than 300 files)" -msgstr "Automatisch (bei weniger als 500 Dateien)" +msgstr "Automatisch (bei weniger als 300 Dateien)" #: ../projectorganizer/src/prjorg-project.c:603 msgid "Yes" @@ -5892,6 +5892,18 @@ msgstr "Externes Verzeichnis hinzufügen" msgid "Add" msgstr "Hinzufügen" +#: ../projectorganizer/src/prjorg-sidebar.c:457 +msgid "exact" +msgstr "exakt" + +#: ../projectorganizer/src/prjorg-sidebar.c:458 +msgid "prefix" +msgstr "Präfix" + +#: ../projectorganizer/src/prjorg-sidebar.c:459 +msgid "pattern" +msgstr "Muster" + #: ../projectorganizer/src/prjorg-sidebar.c:1034 msgid "Set file patterns under Project->Properties" msgstr "Dateimuster unter Projekt->Eigenschaften definieren" @@ -6289,24 +6301,24 @@ msgstr "Programm" #: ../scope/data/scope.glade.h:89 msgid "Open on" -msgstr "" +msgstr "Öffnen auf" #: ../scope/data/scope.glade.h:90 msgid "g_db load" -msgstr "" +msgstr "g_db laden" #: ../scope/data/scope.glade.h:91 msgid "p_rogram start" -msgstr "" +msgstr "P_rogramm starten" #: ../scope/data/scope.glade.h:92 #, fuzzy msgid "Update all _views" -msgstr "Aufgabenliste aktualisieren" +msgstr "Alle _Ansichten aktualisieren" #: ../scope/data/scope.glade.h:93 msgid "Panel" -msgstr "" +msgstr "Schaltfläche" #: ../scope/data/scope.glade.h:94 msgid "Default 8-bit text mode:" @@ -6317,9 +6329,8 @@ msgid "_7-bit \\nnn" msgstr "_7-bit \\nnn" #: ../scope/data/scope.glade.h:96 -#, fuzzy msgid "Display" -msgstr "In Seitenleiste zeigen" +msgstr "Anzeige" #: ../scope/data/scope.glade.h:97 msgid "_member" @@ -6342,9 +6353,8 @@ msgid "Values" msgstr "Werte" #: ../scope/data/scope.glade.h:102 -#, fuzzy msgid "E_xpand on apply" -msgstr "Alle ausklappen" +msgstr "_Beim Anwenden erweitern" #: ../scope/data/scope.glade.h:103 msgid "S_how" @@ -6360,10 +6370,9 @@ msgstr "Inspizieren" #: ../scope/data/scope.glade.h:106 msgid "Show =li_brary messages" -msgstr "" +msgstr "=li_brary-Meldunngen anzeigen" #: ../scope/data/scope.glade.h:107 -#, fuzzy msgid "Show _tooltips" msgstr "Tooltips anzeigen." @@ -6376,9 +6385,8 @@ msgid "_Import" msgstr "_Import" #: ../scope/data/scope.glade.h:111 -#, fuzzy msgid "Enter assignment expression:" -msgstr "Konnte Ausdruck nicht prüfen" +msgstr "Ausdruck für Zuweisung angeben" #: ../scope/data/scope.glade.h:112 #, fuzzy @@ -7020,18 +7028,18 @@ msgid "Convert selection to table" msgstr "Auswahl in Tabelle umwandeln" #. Build up menu entry for table_convert based on global file type -#: ../tableconvert/src/tableconvert_ui.c:36 +#: ../tableconvert/src/tableconvert_ui.c:40 msgid "_Convert to table" msgstr "In _Tabelle umwandeln" -#: ../tableconvert/src/tableconvert_ui.c:39 +#: ../tableconvert/src/tableconvert_ui.c:43 msgid "Converts current marked list to a table." msgstr "Wandelt die aktuell markierte Liste in eine Tabelle" #. Build up menu entries for table convert based on explicit choice #. * This is needed for e.g. different wiki-Syntax or differenz stiles #. * within a special file type -#: ../tableconvert/src/tableconvert_ui.c:48 +#: ../tableconvert/src/tableconvert_ui.c:52 msgid "_More TableConvert" msgstr "_Mehr TableConvert" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 87e1f9: geanyvc: search external diff tools in 'program files' locations for Windows
by Yury Siamashka 29 Jun '15

29 Jun '15

Branch: refs/heads/master Author: Yury Siamashka <yurand2(a)gmail.com> Committer: Yury Siamashka <yurand2(a)gmail.com> Date: Mon, 29 Jun 2015 13:02:08 UTC Commit: 87e1f9fb8ae77cbd1ff3fe5c9769d15272ef1171 https://github.com/geany/geany-plugins/commit/87e1f9fb8ae77cbd1ff3fe5c9769d… Log Message: ----------- geanyvc: search external diff tools in 'program files' locations for Windows Modified Paths: -------------- geanyvc/src/externdiff.c geanyvc/src/geanyvc.c geanyvc/src/geanyvc.h Modified: geanyvc/src/externdiff.c 69 lines changed, 57 insertions(+), 12 deletions(-) =================================================================== @@ -19,10 +19,13 @@ */ #include <string.h> - #include <geanyplugin.h> #include "geanyvc.h" +#ifdef G_OS_WIN32 +#include <Shlobj.h> +#endif + extern GeanyFunctions *geany_functions; @@ -38,27 +41,70 @@ enum }; -static const gchar *viewers[EXTERNAL_DIFF_COUNT] = { "meld", "kompare", "kdiff3", "diffuse", "tkdiff", "WinMergeU" }; +static const gchar *viewers[EXTERNAL_DIFF_COUNT] = { "Meld/meld", "kompare", "kdiff3", "diffuse", "tkdiff", "WinMerge/WinMergeU" }; static gchar *extern_diff_viewer = NULL; -const gchar * -get_external_diff_viewer(void) + +void external_diff_viewer_init(void) { gint i; - if (extern_diff_viewer) - return extern_diff_viewer; + for (i = 0; i < EXTERNAL_DIFF_COUNT; i++) + { + gchar *filename = g_path_get_basename(viewers[i]); + gchar *path = g_find_program_in_path(filename); + g_free(filename); + if (path) + { + extern_diff_viewer = path; + return; + } + } +#ifdef G_OS_WIN32 + TCHAR szPathProgramFiles[MAX_PATH]; + TCHAR szPathProgramFiles86[MAX_PATH]; + SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES, NULL, 0, szPathProgramFiles); + SHGetFolderPath(NULL, CSIDL_PROGRAM_FILESX86, NULL, 0, szPathProgramFiles86); for (i = 0; i < EXTERNAL_DIFF_COUNT; i++) { - gchar *path = g_find_program_in_path(viewers[i]); + gchar *filename = g_build_filename(szPathProgramFiles, viewers[i], NULL); + gchar *path = g_find_program_in_path(filename); + g_free(filename); if (path) { - g_free(path); - extern_diff_viewer = (gchar *) viewers[i]; - return viewers[i]; + extern_diff_viewer = path; + return; } } + for (i = 0; i < EXTERNAL_DIFF_COUNT; i++) + { + gchar *filename = g_build_filename(szPathProgramFiles86, viewers[i], NULL); + gchar *path = g_find_program_in_path(filename); + g_free(filename); + if (path) + { + extern_diff_viewer = path; + return; + } + } +#endif +} + +void external_diff_viewer_deinit(void) +{ + if (extern_diff_viewer) + { + g_free(extern_diff_viewer); + extern_diff_viewer = NULL; + } +} + +const gchar * +get_external_diff_viewer(void) +{ + if (extern_diff_viewer) + return extern_diff_viewer; return NULL; } @@ -67,7 +113,6 @@ void vc_external_diff(const gchar * src, const gchar * dest) { gchar *argv[4] = { NULL, NULL, NULL, NULL }; - const gchar *diff = get_external_diff_viewer(); if (!diff) return; @@ -76,7 +121,7 @@ vc_external_diff(const gchar * src, const gchar * dest) argv[1] = (gchar *) src; argv[2] = (gchar *) dest; - utils_spawn_sync(NULL, argv, NULL, + g_spawn_sync(NULL, argv, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, NULL, NULL, NULL, NULL); } Modified: geanyvc/src/geanyvc.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -2305,6 +2305,7 @@ plugin_init(G_GNUC_UNUSED GeanyData * data) load_config(); registrate(); + external_diff_viewer_init(); if (set_menubar_entry == TRUE) { @@ -2378,6 +2379,7 @@ plugin_init(G_GNUC_UNUSED GeanyData * data) void plugin_cleanup(void) { + external_diff_viewer_deinit(); remove_menuitems_from_editor_menu(); gtk_widget_destroy(menu_entry); g_slist_free(VC); Modified: geanyvc/src/geanyvc.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -135,6 +135,8 @@ GSList *get_commit_files_null(const gchar * dir); extern const gchar *NO_ENV[]; /* External diff viewer */ +void external_diff_viewer_init(void); +void external_diff_viewer_deinit(void); const gchar *get_external_diff_viewer(void); void vc_external_diff(const gchar * src, const gchar * dest); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits June 2015