Plugins-Commits January 2022

plugins-commits@lists.geany.org

1 participants
15 discussions

[geany/geany-plugins] ee92ff: GeanyLua: Add geany.settype()
by Skif-off 31 Jan '22

31 Jan '22

Branch: refs/heads/master Author: Skif-off <Skif-off(a)users.noreply.github.com> Committer: Skif-off <Skif-off(a)users.noreply.github.com> Date: Fri, 14 Jan 2022 18:02:33 UTC Commit: ee92ffa4289099a003f55e4286faf04478530f70 https://github.com/geany/geany-plugins/commit/ee92ffa4289099a003f55e4286faf… Log Message: ----------- GeanyLua: Add geany.settype() Modified Paths: -------------- geanylua/docs/geanylua-ref.html geanylua/glspi_doc.c geanylua/keywords.list Modified: geanylua/docs/geanylua-ref.html 21 lines changed, 16 insertions(+), 5 deletions(-) =================================================================== @@ -177,31 +177,36 @@ </tr> <tr class="odd"> + <td>  function <a href="#settype">settype</a> ( filetype ) </td> + <td class="desc">-- Change the current file type.</td> +</tr> + +<tr class="even"> <td>  function <a href="#signal">signal</a> ( widget, signal ) </td> <td class="desc">-- Send a GTK signal to a Geany interface widget.</td> </tr> -<tr class="even"> +<tr class="odd"> <td>  function <a href="#status">status</a> ( message ) </td> <td class="desc">-- Send a string to display in the status tab of the messages window.</td> </tr> -<tr class="odd"> +<tr class="even"> <td>  function <a href="#text">text</a> ( [content] ) </td> <td class="desc">-- Get or set the contents of the entire document.</td> </tr> -<tr class="even"> +<tr class="odd"> <td>  function <a href="#word">word</a> ( [position] ) </td> <td class="desc">-- Get the word at the specified location.</td> </tr> -<tr class="odd"> +<tr class="even"> <td>  function <a href="#xsel">xsel</a> ( [text] ) </td> <td class="desc">-- Get or set the contents of the primary X selection.</td> </tr> -<tr class="even"> +<tr class="odd"> <td>  function <a href="#yield">yield</a> () </td> <td class="desc">-- Refreshes the user interface.</td> </tr> @@ -955,6 +960,12 @@ (caret) position. +<a name="settype"></a><hr><h3><tt>geany.settype ( filetype )</tt></h3> +Will change the current file type. Use one-word description of the +file type, e.g. "C" or "Python" (see the "<tt>filetype_extensions.conf</tt>" +file). + + <a name="signal"></a><hr><h3><tt>geany.signal ( widget, signal )</tt></h3> Emits a GTK signal to a given widget in the Geany user interface. The <tt>widget</tt> argument is a string identifying the widget by its Glade  <tt>"id"</tt>  attribute. Modified: geanylua/glspi_doc.c 24 lines changed, 24 insertions(+), 0 deletions(-) =================================================================== @@ -334,11 +334,35 @@ static gint glspi_fileinfo(lua_State* L) } +/* Change the current file type */ +static gint glspi_setfiletype(lua_State* L) +{ + GeanyDocument *doc=NULL; + GeanyFiletype *ft=NULL; + const gchar *ftn=NULL; + + if (lua_gettop(L)==1){ + if (!lua_isstring(L, 1)) { return FAIL_STRING_ARG(1); } + doc = document_get_current(); + if (!(doc && doc->is_valid)) { return 0; } + ftn=lua_tostring(L, 1); + if ('\0' == ftn[0]) { return 0; } + ft=filetypes_lookup_by_name(ftn); + if (ft != NULL){ + document_set_filetype(doc, ft); + return 1; + } + } + return 0; +} + + static const struct luaL_reg glspi_doc_funcs[] = { {"filename", glspi_filename}, {"fileinfo", glspi_fileinfo}, + {"settype", glspi_setfiletype}, {"documents", glspi_documents}, {"count", glspi_count}, {"activate", glspi_activate}, Modified: geanylua/keywords.list 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -7,4 +7,4 @@ word5=0xf0a000;0xffffff;false;false ## Put this in the [keywords] section: -user1=geany.activate geany.appinfo geany.banner geany.basename geany.batch geany.byte geany.caller geany.caret geany.choose geany.close geany.confirm geany.copy geany.count geany.cut geany.dirlist geany.dirname geany.dirsep geany.documents geany.fileinfo geany.filename geany.find geany.fullpath geany.height geany.input geany.keycmd geany.keygrab geany.launch geany.length geany.lines geany.match geany.message geany.navigate geany.newfile geany.open geany.optimize geany.paste geany.pickfile geany.pluginver geany.rectsel geany.reloadconf geany.rescan geany.rowcol geany.save geany.scintilla geany.script geany.select geany.selection geany.signal geany.stat geany.status geany.text geany.timeout geany.wkdir geany.word geany.wordchars geany.xsel geany.yield dialog.checkbox dialog.color dialog.file dialog.font dialog.group dialog.heading dialog.hr dialog.label dialog.new dialog.option dialog.password dialog.radio dialog.run dialog.select dialog.text dialog.textarea keyfile.comment keyfile.data keyfile.groups keyfile.has keyfile.keys keyfile.new keyfile.remove keyfile.value +user1=geany.activate geany.appinfo geany.banner geany.basename geany.batch geany.byte geany.caller geany.caret geany.choose geany.close geany.confirm geany.copy geany.count geany.cut geany.dirlist geany.dirname geany.dirsep geany.documents geany.fileinfo geany.filename geany.find geany.fullpath geany.height geany.input geany.keycmd geany.keygrab geany.launch geany.length geany.lines geany.match geany.message geany.navigate geany.newfile geany.open geany.optimize geany.paste geany.pickfile geany.pluginver geany.rectsel geany.reloadconf geany.rescan geany.rowcol geany.save geany.scintilla geany.script geany.select geany.selection geany.settype geany.signal geany.stat geany.status geany.text geany.timeout geany.wkdir geany.word geany.wordchars geany.xsel geany.yield dialog.checkbox dialog.color dialog.file dialog.font dialog.group dialog.heading dialog.hr dialog.label dialog.new dialog.option dialog.password dialog.radio dialog.run dialog.select dialog.text dialog.textarea keyfile.comment keyfile.data keyfile.groups keyfile.has keyfile.keys keyfile.new keyfile.remove keyfile.value -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 1f823b: Merge pull request #1157 from Skif-off/geanylua-setfiletype
by Enrico Tröger 31 Jan '22

31 Jan '22

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 30 Jan 2022 21:25:31 UTC Commit: 1f823b2e6146f2e0d70db0b73d731d6dff1b495e https://github.com/geany/geany-plugins/commit/1f823b2e6146f2e0d70db0b73d731… Log Message: ----------- Merge pull request #1157 from Skif-off/geanylua-setfiletype GeanyLua: Add geany.settype() Modified Paths: -------------- geanylua/docs/geanylua-ref.html geanylua/glspi_doc.c geanylua/keywords.list Modified: geanylua/docs/geanylua-ref.html 21 lines changed, 16 insertions(+), 5 deletions(-) =================================================================== @@ -177,31 +177,36 @@ </tr> <tr class="odd"> + <td>  function <a href="#settype">settype</a> ( filetype ) </td> + <td class="desc">-- Change the current file type.</td> +</tr> + +<tr class="even"> <td>  function <a href="#signal">signal</a> ( widget, signal ) </td> <td class="desc">-- Send a GTK signal to a Geany interface widget.</td> </tr> -<tr class="even"> +<tr class="odd"> <td>  function <a href="#status">status</a> ( message ) </td> <td class="desc">-- Send a string to display in the status tab of the messages window.</td> </tr> -<tr class="odd"> +<tr class="even"> <td>  function <a href="#text">text</a> ( [content] ) </td> <td class="desc">-- Get or set the contents of the entire document.</td> </tr> -<tr class="even"> +<tr class="odd"> <td>  function <a href="#word">word</a> ( [position] ) </td> <td class="desc">-- Get the word at the specified location.</td> </tr> -<tr class="odd"> +<tr class="even"> <td>  function <a href="#xsel">xsel</a> ( [text] ) </td> <td class="desc">-- Get or set the contents of the primary X selection.</td> </tr> -<tr class="even"> +<tr class="odd"> <td>  function <a href="#yield">yield</a> () </td> <td class="desc">-- Refreshes the user interface.</td> </tr> @@ -955,6 +960,12 @@ (caret) position. +<a name="settype"></a><hr><h3><tt>geany.settype ( filetype )</tt></h3> +Will change the current file type. Use one-word description of the +file type, e.g. "C" or "Python" (see the "<tt>filetype_extensions.conf</tt>" +file). + + <a name="signal"></a><hr><h3><tt>geany.signal ( widget, signal )</tt></h3> Emits a GTK signal to a given widget in the Geany user interface. The <tt>widget</tt> argument is a string identifying the widget by its Glade  <tt>"id"</tt>  attribute. Modified: geanylua/glspi_doc.c 24 lines changed, 24 insertions(+), 0 deletions(-) =================================================================== @@ -334,11 +334,35 @@ static gint glspi_fileinfo(lua_State* L) } +/* Change the current file type */ +static gint glspi_setfiletype(lua_State* L) +{ + GeanyDocument *doc=NULL; + GeanyFiletype *ft=NULL; + const gchar *ftn=NULL; + + if (lua_gettop(L)==1){ + if (!lua_isstring(L, 1)) { return FAIL_STRING_ARG(1); } + doc = document_get_current(); + if (!(doc && doc->is_valid)) { return 0; } + ftn=lua_tostring(L, 1); + if ('\0' == ftn[0]) { return 0; } + ft=filetypes_lookup_by_name(ftn); + if (ft != NULL){ + document_set_filetype(doc, ft); + return 1; + } + } + return 0; +} + + static const struct luaL_reg glspi_doc_funcs[] = { {"filename", glspi_filename}, {"fileinfo", glspi_fileinfo}, + {"settype", glspi_setfiletype}, {"documents", glspi_documents}, {"count", glspi_count}, {"activate", glspi_activate}, Modified: geanylua/keywords.list 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -7,4 +7,4 @@ word5=0xf0a000;0xffffff;false;false ## Put this in the [keywords] section: -user1=geany.activate geany.appinfo geany.banner geany.basename geany.batch geany.byte geany.caller geany.caret geany.choose geany.close geany.confirm geany.copy geany.count geany.cut geany.dirlist geany.dirname geany.dirsep geany.documents geany.fileinfo geany.filename geany.find geany.fullpath geany.height geany.input geany.keycmd geany.keygrab geany.launch geany.length geany.lines geany.match geany.message geany.navigate geany.newfile geany.open geany.optimize geany.paste geany.pickfile geany.pluginver geany.rectsel geany.reloadconf geany.rescan geany.rowcol geany.save geany.scintilla geany.script geany.select geany.selection geany.signal geany.stat geany.status geany.text geany.timeout geany.wkdir geany.word geany.wordchars geany.xsel geany.yield dialog.checkbox dialog.color dialog.file dialog.font dialog.group dialog.heading dialog.hr dialog.label dialog.new dialog.option dialog.password dialog.radio dialog.run dialog.select dialog.text dialog.textarea keyfile.comment keyfile.data keyfile.groups keyfile.has keyfile.keys keyfile.new keyfile.remove keyfile.value +user1=geany.activate geany.appinfo geany.banner geany.basename geany.batch geany.byte geany.caller geany.caret geany.choose geany.close geany.confirm geany.copy geany.count geany.cut geany.dirlist geany.dirname geany.dirsep geany.documents geany.fileinfo geany.filename geany.find geany.fullpath geany.height geany.input geany.keycmd geany.keygrab geany.launch geany.length geany.lines geany.match geany.message geany.navigate geany.newfile geany.open geany.optimize geany.paste geany.pickfile geany.pluginver geany.rectsel geany.reloadconf geany.rescan geany.rowcol geany.save geany.scintilla geany.script geany.select geany.selection geany.settype geany.signal geany.stat geany.status geany.text geany.timeout geany.wkdir geany.word geany.wordchars geany.xsel geany.yield dialog.checkbox dialog.color dialog.file dialog.font dialog.group dialog.heading dialog.hr dialog.label dialog.new dialog.option dialog.password dialog.radio dialog.run dialog.select dialog.text dialog.textarea keyfile.comment keyfile.data keyfile.groups keyfile.has keyfile.keys keyfile.new keyfile.remove keyfile.value -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 1e2f19: Project Organizer: Use system trash for file/folder removal
by xiota 31 Jan '22

31 Jan '22

Branch: refs/heads/master Author: xiota <github(a)mentalfossa.com> Committer: xiota <github(a)mentalfossa.com> Date: Wed, 20 Oct 2021 12:31:18 UTC Commit: 1e2f19f979e7b7548c5d65c266513c961071598c https://github.com/geany/geany-plugins/commit/1e2f19f979e7b7548c5d65c266513… Log Message: ----------- Project Organizer: Use system trash for file/folder removal Modified Paths: -------------- projectorganizer/src/prjorg-utils.c Modified: projectorganizer/src/prjorg-utils.c 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -149,9 +149,16 @@ gboolean create_dir(char *utf8_name) gboolean remove_file_or_dir(char *utf8_name) { + gboolean ret = FALSE; gchar *name = utils_get_locale_from_utf8(utf8_name); - gboolean ret = g_remove(utf8_name) == 0; + + GFile *file = g_file_new_for_path(name); + ret = g_file_trash(file, NULL, NULL); + if (!ret) + ret = g_file_delete(file, NULL, NULL); + g_free(name); + g_object_unref(file); return ret; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] cc2333: Merge pull request #1125 from xiota/pr-prjorg-trash
by Enrico Tröger 31 Jan '22

31 Jan '22

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 30 Jan 2022 21:18:02 UTC Commit: cc23333ef23bb5d2a18745d309757553505fee0d https://github.com/geany/geany-plugins/commit/cc23333ef23bb5d2a18745d309757… Log Message: ----------- Merge pull request #1125 from xiota/pr-prjorg-trash Project Organizer: Use system trash for file/folder removal Modified Paths: -------------- projectorganizer/src/prjorg-utils.c Modified: projectorganizer/src/prjorg-utils.c 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -149,9 +149,16 @@ gboolean create_dir(char *utf8_name) gboolean remove_file_or_dir(char *utf8_name) { + gboolean ret = FALSE; gchar *name = utils_get_locale_from_utf8(utf8_name); - gboolean ret = g_remove(utf8_name) == 0; + + GFile *file = g_file_new_for_path(name); + ret = g_file_trash(file, NULL, NULL); + if (!ret) + ret = g_file_delete(file, NULL, NULL); + g_free(name); + g_object_unref(file); return ret; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 971945: Merge pull request #1153 from eht16/win_bundle_xz_in_geany
by Enrico Tröger 23 Jan '22

23 Jan '22

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 23 Jan 2022 11:21:43 UTC Commit: 97194514582710920dee22ab5db7db43b22e12c6 https://github.com/geany/geany-plugins/commit/97194514582710920dee22ab5db7d… Log Message: ----------- Merge pull request #1153 from eht16/win_bundle_xz_in_geany Windows: xz is now bundled in Geany itself Modified Paths: -------------- build/geany-plugins.nsi build/gtk-bundle-from-msys2.sh Modified: build/geany-plugins.nsi 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -232,7 +232,6 @@ Section Uninstall Delete "$INSTDIR\bin\libhttp_parser-2.dll" Delete "$INSTDIR\bin\libhunspell-1.7-0.dll" Delete "$INSTDIR\bin\libidn2-0.dll" - Delete "$INSTDIR\bin\liblzma-5.dll" Delete "$INSTDIR\bin\libnghttp2-14.dll" Delete "$INSTDIR\bin\libp11-kit-0.dll" Delete "$INSTDIR\bin\libpsl-5.dll" Modified: build/gtk-bundle-from-msys2.sh 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -51,7 +51,6 @@ p11-kit readline sqlite3 termcap -xz " gtk3_dependency_pkgs=" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 0abcc7: Merge pull request #960 from ChrisJAllan/treebrowser-root
by Enrico Tröger 22 Jan '22

22 Jan '22

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 22 Jan 2022 12:43:57 UTC Commit: 0abcc76f5497b253de77a2518d625418e21b8ce2 https://github.com/geany/geany-plugins/commit/0abcc76f5497b253de77a2518d625… Log Message: ----------- Merge pull request #960 from ChrisJAllan/treebrowser-root TreeBrowser: Allow new file/folder in top level Modified Paths: -------------- treebrowser/src/treebrowser.c Modified: treebrowser/src/treebrowser.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1076,7 +1076,11 @@ on_menu_create_new_object(GtkMenuItem *menuitem, const gchar *type) gtk_tree_model_get(model, &iter_parent, TREEBROWSER_COLUMN_URI, &uri, -1); } else + { + SETPTR(uri, g_path_get_dirname(uri)); + refresh_root = TRUE; + } } } else -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 6ba800: Fix create when selection is in top of path
by Chris Allan 15 Jan '22

15 Jan '22

Branch: refs/heads/master Author: Chris Allan <cjallan(a)uci.edu> Committer: Chris Allan <chrisallan(a)protonmail.com> Date: Sat, 15 Jan 2022 16:31:30 UTC Commit: 6ba8009841baa0cdceabb8e9797de0d016e60097 https://github.com/geany/geany-plugins/commit/6ba8009841baa0cdceabb8e9797de… Log Message: ----------- Fix create when selection is in top of path Modified Paths: -------------- treebrowser/src/treebrowser.c Modified: treebrowser/src/treebrowser.c 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -1076,7 +1076,11 @@ on_menu_create_new_object(GtkMenuItem *menuitem, const gchar *type) gtk_tree_model_get(model, &iter_parent, TREEBROWSER_COLUMN_URI, &uri, -1); } else + { + SETPTR(uri, g_path_get_dirname(uri)); + refresh_root = TRUE; + } } } else -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 8bc033: Windows: xz is now bundled in Geany itself
by Enrico Tröger 11 Jan '22

11 Jan '22

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Mon, 10 Jan 2022 22:20:33 UTC Commit: 8bc033e9f0ed3ba77ac0d929a1cc702555a7f640 https://github.com/geany/geany-plugins/commit/8bc033e9f0ed3ba77ac0d929a1cc7… Log Message: ----------- Windows: xz is now bundled in Geany itself Modified Paths: -------------- build/geany-plugins.nsi build/gtk-bundle-from-msys2.sh Modified: build/geany-plugins.nsi 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -232,7 +232,6 @@ Section Uninstall Delete "$INSTDIR\bin\libhttp_parser-2.dll" Delete "$INSTDIR\bin\libhunspell-1.7-0.dll" Delete "$INSTDIR\bin\libidn2-0.dll" - Delete "$INSTDIR\bin\liblzma-5.dll" Delete "$INSTDIR\bin\libnghttp2-14.dll" Delete "$INSTDIR\bin\libp11-kit-0.dll" Delete "$INSTDIR\bin\libpsl-5.dll" Modified: build/gtk-bundle-from-msys2.sh 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -51,7 +51,6 @@ p11-kit readline sqlite3 termcap -xz " gtk3_dependency_pkgs=" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 01b19d: GeanyLua: Update glspi_keycmd.h: add GEANY_KEYS_FILE_RELOAD_ALL, del GEANY_KEYS_COUNT
by Skif-off 09 Jan '22

09 Jan '22

Branch: refs/heads/master Author: Skif-off <Skif-off(a)users.noreply.github.com> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 09 Jan 2022 14:52:20 UTC Commit: 01b19d2d401f49f220157f28cc5e53de491f71a9 https://github.com/geany/geany-plugins/commit/01b19d2d401f49f220157f28cc5e5… Log Message: ----------- GeanyLua: Update glspi_keycmd.h: add GEANY_KEYS_FILE_RELOAD_ALL, del GEANY_KEYS_COUNT Modified Paths: -------------- geanylua/glspi_keycmd.h Modified: geanylua/glspi_keycmd.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -32,7 +32,6 @@ static KeyCmdHashEntry key_cmd_hash_entries[] = { {"CLIPBOARD_CUT", GEANY_KEY_GROUP_CLIPBOARD, GEANY_KEYS_CLIPBOARD_CUT}, {"CLIPBOARD_CUTLINE", GEANY_KEY_GROUP_CLIPBOARD, GEANY_KEYS_CLIPBOARD_CUTLINE}, {"CLIPBOARD_PASTE", GEANY_KEY_GROUP_CLIPBOARD, GEANY_KEYS_CLIPBOARD_PASTE}, - {"COUNT", GEANY_KEY_GROUP_COUNT, GEANY_KEYS_COUNT}, {"DOCUMENT_CLONE", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_CLONE}, {"DOCUMENT_FOLDALL", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_FOLDALL}, {"DOCUMENT_LINEBREAK", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_LINEBREAK}, @@ -76,13 +75,14 @@ static KeyCmdHashEntry key_cmd_hash_entries[] = { {"FILE_PROPERTIES", GEANY_KEY_GROUP_FILE, GEANY_KEYS_FILE_PROPERTIES}, {"FILE_QUIT", GEANY_KEY_GROUP_FILE, GEANY_KEYS_FILE_QUIT}, {"FILE_RELOAD", GEANY_KEY_GROUP_FILE, GEANY_KEYS_FILE_RELOAD}, + {"FILE_RELOAD_ALL", GEANY_KEY_GROUP_FILE, GEANY_KEYS_FILE_RELOAD_ALL}, {"FILE_SAVE", GEANY_KEY_GROUP_FILE, GEANY_KEYS_FILE_SAVE}, {"FILE_SAVEALL", GEANY_KEY_GROUP_FILE, GEANY_KEYS_FILE_SAVEALL}, {"FILE_SAVEAS", GEANY_KEY_GROUP_FILE, GEANY_KEYS_FILE_SAVEAS}, {"FOCUS_COMPILER", GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_COMPILER}, {"FOCUS_EDITOR", GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR}, - {"FOCUS_MESSAGES", GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_MESSAGES}, {"FOCUS_MESSAGE_WINDOW", GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_MESSAGE_WINDOW}, + {"FOCUS_MESSAGES", GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_MESSAGES}, {"FOCUS_SCRIBBLE", GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_SCRIBBLE}, {"FOCUS_SEARCHBAR", GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_SEARCHBAR}, {"FOCUS_SIDEBAR", GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_SIDEBAR}, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 27c17b: Replace deprecated setptr macro with SETPTR
by xiota 09 Jan '22

09 Jan '22

Branch: refs/heads/master Author: xiota <github(a)mentalfossa.com> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 09 Jan 2022 14:31:02 UTC Commit: 27c17b76a1d3a6803fb3756a5c1e4177ec91b834 https://github.com/geany/geany-plugins/commit/27c17b76a1d3a6803fb3756a5c1e4… Log Message: ----------- Replace deprecated setptr macro with SETPTR Modified Paths: -------------- addons/src/ao_openuri.c addons/src/ao_tasks.c geanydoc/src/config.c geanydoc/src/geanydoc.c geanymacro/src/geanymacro.c geanyprj/src/sidebar.c geanyprj/src/utils.c geanyvc/src/geanyvc.c geanyvc/src/utils.c geanyvc/src/vc_svn.c spellcheck/src/gui.c spellcheck/src/scplugin.c treebrowser/src/treebrowser.c Modified: addons/src/ao_openuri.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -256,7 +256,7 @@ void ao_open_uri_update_menu(AoOpenUri *openuri, GeanyDocument *doc, gint pos) if (text[len - 1] == '.' || text[len - 1] == ':') text[len - 1] = '\0'; - setptr(priv->uri, text); + SETPTR(priv->uri, text); gtk_widget_show(priv->menu_item_open); gtk_widget_show(priv->menu_item_copy); Modified: addons/src/ao_tasks.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -538,7 +538,7 @@ static void create_task(AoTasks *t, GeanyDocument *doc, gint line, const gchar * /* retrieve the following line and use it for the tooltip */ context = g_strstrip(sci_get_line(doc->editor->sci, line + 1)); - setptr(context, g_strconcat( + SETPTR(context, g_strconcat( _("Context:"), "\n", line_buf, "\n", context, NULL)); tooltip = g_markup_escape_text(context, -1); Modified: geanydoc/src/config.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -60,7 +60,7 @@ config_init(void) config_file = g_build_filename(geany->app->configdir, "plugins", "geanydoc", NULL); utils_mkdir(config_file, TRUE); - setptr(config_file, g_build_filename(config_file, "geanydoc.conf", NULL)); + SETPTR(config_file, g_build_filename(config_file, "geanydoc.conf", NULL)); config = g_key_file_new(); if (!g_key_file_load_from_file(config, config_file, G_KEY_FILE_KEEP_COMMENTS, NULL)) Modified: geanydoc/src/geanydoc.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -184,7 +184,7 @@ show_doc(const gchar * word, gint cmd_num) if (tmp != NULL) { tmp[1] = 's'; - setptr(command, g_strdup_printf(command, word)); + SETPTR(command, g_strdup_printf(command, word)); } if (intern) Modified: geanymacro/src/geanymacro.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -687,7 +687,7 @@ static void SaveSettings(void) g_mkdir_with_parents(config_file,0755); /* make config_file hold name of settings file */ - setptr(config_file,g_build_filename(config_file,"settings.conf",NULL)); + SETPTR(config_file,g_build_filename(config_file,"settings.conf",NULL)); /* write data */ utils_write_file(config_file, data); @@ -719,7 +719,7 @@ static void LoadSettings(void) g_mkdir_with_parents(config_file,0755); /* make config_file hold name of settings file */ - setptr(config_file,g_build_filename(config_file,"settings.conf",NULL)); + SETPTR(config_file,g_build_filename(config_file,"settings.conf",NULL)); /* either load settings file, or create one from default */ config=g_key_file_new(); Modified: geanyprj/src/sidebar.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -63,8 +63,8 @@ static gchar *get_tree_path_filename(GtkTreePath *treepath) gtk_tree_model_get_iter(model, &iter, treepath); gtk_tree_model_get(model, &iter, FILEVIEW_COLUMN_NAME, &name, -1); - setptr(name, utils_get_locale_from_utf8(name)); - setptr(name, get_full_path(g_current_project->path, name)); + SETPTR(name, utils_get_locale_from_utf8(name)); + SETPTR(name, get_full_path(g_current_project->path, name)); return name; } Modified: geanyprj/src/utils.c 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -121,8 +121,8 @@ gchar *get_full_path(const gchar *location, const gchar *path) gchar *dir; dir = g_path_get_dirname(location); - setptr(dir, g_build_filename(dir, path, NULL)); - setptr(dir, normpath(dir)); + SETPTR(dir, g_build_filename(dir, path, NULL)); + SETPTR(dir, normpath(dir)); return dir; } @@ -139,7 +139,7 @@ gchar *get_relative_path(const gchar *location, const gchar *path) } dir = g_path_get_dirname(location); - setptr(dir, normpath(dir)); + SETPTR(dir, normpath(dir)); plen = strlen(path); dlen = strlen(dir); @@ -148,7 +148,7 @@ gchar *get_relative_path(const gchar *location, const gchar *path) { if (plen > dlen) { - setptr(dir, g_strdup(path + strlen(dir) + 1)); + SETPTR(dir, g_strdup(path + strlen(dir) + 1)); return dir; } else if (plen == dlen) @@ -213,7 +213,7 @@ GSList *get_file_list(const gchar *path, guint * length, gboolean(*func)(const g else { abs_path = g_get_current_dir(); - setptr(abs_path, g_build_filename(abs_path, path, NULL)); + SETPTR(abs_path, g_build_filename(abs_path, path, NULL)); } if (!g_file_test(abs_path, G_FILE_TEST_IS_DIR)) { Modified: geanyvc/src/geanyvc.c 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -397,7 +397,7 @@ get_cmd(const gchar ** argv, const gchar * dir, const gchar * filename, GSList * utils_string_replace_all(repl, P_ABS_FILENAME, filename); utils_string_replace_all(repl, P_BASENAME, basename); ret[j] = g_string_free(repl, FALSE); - setptr(ret[j], utils_get_locale_from_utf8(ret[j])); + SETPTR(ret[j], utils_get_locale_from_utf8(ret[j])); } } g_free(abs_dir); @@ -510,11 +510,11 @@ execute_custom_command(const gchar * dir, const gchar ** argv, const gchar ** en tmp = g_string_new(*std_out); utils_string_replace_all(tmp, "\r\n", "\n"); utils_string_replace_all(tmp, "\r", "\n"); - setptr(*std_out, g_string_free(tmp, FALSE)); + SETPTR(*std_out, g_string_free(tmp, FALSE)); if (!g_utf8_validate(*std_out, -1, NULL)) { - setptr(*std_out, encodings_convert_to_utf8(*std_out, + SETPTR(*std_out, encodings_convert_to_utf8(*std_out, strlen(*std_out), NULL)); } if (EMPTY(*std_out)) @@ -528,11 +528,11 @@ execute_custom_command(const gchar * dir, const gchar ** argv, const gchar ** en tmp = g_string_new(*std_err); utils_string_replace_all(tmp, "\r\n", "\n"); utils_string_replace_all(tmp, "\r", "\n"); - setptr(*std_err, g_string_free(tmp, FALSE)); + SETPTR(*std_err, g_string_free(tmp, FALSE)); if (!g_utf8_validate(*std_err, -1, NULL)) { - setptr(*std_err, encodings_convert_to_utf8(*std_err, + SETPTR(*std_err, encodings_convert_to_utf8(*std_err, strlen(*std_err), NULL)); } if (EMPTY(*std_err)) @@ -635,10 +635,10 @@ vcdiff_file_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpoint localename = utils_get_locale_from_utf8(doc->file_name); new = g_strconcat(doc->file_name, ".geanyvc.~NEW~", NULL); - setptr(new, utils_get_locale_from_utf8(new)); + SETPTR(new, utils_get_locale_from_utf8(new)); old = g_strconcat(doc->file_name, ".geanyvc.~BASE~", NULL); - setptr(old, utils_get_locale_from_utf8(old)); + SETPTR(old, utils_get_locale_from_utf8(old)); if (g_rename(localename, new) != 0) { Modified: geanyvc/src/utils.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -95,8 +95,8 @@ get_full_path(const gchar * location, const gchar * path) gchar *dir; dir = g_path_get_dirname(location); - setptr(dir, g_build_filename(dir, path, NULL)); - setptr(dir, normpath(dir)); + SETPTR(dir, g_build_filename(dir, path, NULL)); + SETPTR(dir, normpath(dir)); return dir; } Modified: geanyvc/src/vc_svn.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -142,13 +142,13 @@ get_base_dir(const gchar * path) g_free(test_dir); continue; } - setptr(test_dir, g_build_filename(base, "branches", NULL)); + SETPTR(test_dir, g_build_filename(base, "branches", NULL)); if (!g_file_test(test_dir, G_FILE_TEST_IS_DIR)) { g_free(test_dir); continue; } - setptr(test_dir, g_build_filename(base, "tags", NULL)); + SETPTR(test_dir, g_build_filename(base, "tags", NULL)); if (!g_file_test(test_dir, G_FILE_TEST_IS_DIR)) { g_free(test_dir); Modified: spellcheck/src/gui.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -463,7 +463,7 @@ void sc_gui_update_editor_menu_cb(GObject *obj, const gchar *word, gint pos, clickinfo.pos = pos; clickinfo.doc = doc; - setptr(clickinfo.word, search_word); + SETPTR(clickinfo.word, search_word); update_editor_menu_items(search_word, (const gchar**) suggs, n_suggs); @@ -644,7 +644,7 @@ static void menu_item_toggled_cb(GtkCheckMenuItem *menuitem, gpointer gdata) /* Another language was chosen from the menu item, so make it default for this session. */ if (gdata != NULL) { - setptr(sc_info->default_language, g_strdup(gdata)); + SETPTR(sc_info->default_language, g_strdup(gdata)); sc_speller_reinit_enchant_dict(); sc_gui_update_menu(); update_labels(); Modified: spellcheck/src/scplugin.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -141,9 +141,9 @@ static void configure_response_cb(GtkDialog *dialog, gint response, gpointer use { GtkComboBox *combo = GTK_COMBO_BOX(g_object_get_data(G_OBJECT(dialog), "combo")); - setptr(sc_info->default_language, gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo))); + SETPTR(sc_info->default_language, gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo))); #ifdef HAVE_ENCHANT_1_5 - setptr(sc_info->dictionary_dir, g_strdup(gtk_entry_get_text(GTK_ENTRY( + SETPTR(sc_info->dictionary_dir, g_strdup(gtk_entry_get_text(GTK_ENTRY( g_object_get_data(G_OBJECT(dialog), "dict_dir"))))); #endif sc_speller_reinit_enchant_dict(); Modified: treebrowser/src/treebrowser.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -480,7 +480,7 @@ treebrowser_chroot(const gchar *dir) gtk_entry_set_text(GTK_ENTRY(addressbar), directory); if (!directory || strlen(directory) == 0) - setptr(directory, g_strdup(G_DIR_SEPARATOR_S)); + SETPTR(directory, g_strdup(G_DIR_SEPARATOR_S)); if (! treebrowser_checkdir(directory)) { @@ -490,7 +490,7 @@ treebrowser_chroot(const gchar *dir) treebrowser_bookmarks_set_state(); - setptr(addressbar_last_address, directory); + SETPTR(addressbar_last_address, directory); treebrowser_browse(addressbar_last_address, NULL); treebrowser_load_bookmarks(); @@ -1098,7 +1098,7 @@ on_menu_create_new_object(GtkMenuItem *menuitem, const gchar *type) gboolean creation_success = FALSE; while(g_file_test(uri_new, G_FILE_TEST_EXISTS)) - setptr(uri_new, g_strconcat(uri_new, "_", NULL)); + SETPTR(uri_new, g_strconcat(uri_new, "_", NULL)); if (utils_str_equal(type, "directory")) creation_success = (g_mkdir(uri_new, 0755) == 0); -------------- 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 January 2022