Plugins-Commits April 2017

plugins-commits@lists.geany.org

1 participants
49 discussions

[geany/geany-plugins] cfd70a: Merge pull request #569 from geany/osx_relpath
by Frank Lanitz 29 Apr '17

29 Apr '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 29 Apr 2017 09:44:18 UTC Commit: cfd70a8bea776bcc0309ca2db0252c9b39b75a07 https://github.com/geany/geany-plugins/commit/cfd70a8bea776bcc0309ca2db0252… Log Message: ----------- Merge pull request #569 from geany/osx_relpath Use paths relative to the bundle on OS X Modified Paths: -------------- geanygendoc/src/ggd-utils.c geniuspaste/src/geniuspaste.c git-changebar/src/gcb-plugin.c overview/overview/overviewprefspanel.c pohelper/src/gph-plugin.c scope/src/scope.c Modified: geanygendoc/src/ggd-utils.c 27 lines changed, 19 insertions(+), 8 deletions(-) =================================================================== @@ -135,6 +135,24 @@ ggd_copy_file (const gchar *input, return success; } +static gchar * +get_data_dir_path (const gchar *filename) +{ + gchar *prefix = NULL; + gchar *path; + +#ifdef G_OS_WIN32 + prefix = g_win32_get_package_installation_directory_of_module (NULL); +#elif defined(__APPLE__) + if (g_getenv ("GEANY_PLUGINS_SHARE_PATH")) + return g_build_filename (g_getenv ("GEANY_PLUGINS_SHARE_PATH"), + PLUGIN, filename, NULL); +#endif + path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, filename, NULL); + g_free (prefix); + return path; +} + /** * ggd_get_config_file: * @name: The name of the configuration file to get (ASCII string) @@ -161,7 +179,6 @@ ggd_get_config_file (const gchar *name, GError **error) { gchar *path = NULL; - gchar *system_prefix = NULL; gchar *user_dir; gchar *user_path; gchar *system_dir; @@ -170,17 +187,12 @@ ggd_get_config_file (const gchar *name, g_return_val_if_fail (name != NULL, NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); -#ifdef G_OS_WIN32 - system_prefix = g_win32_get_package_installation_directory_of_module (NULL); -#endif - /* here we guess the locale encoding is ASCII-compatible, anyway it's the case * on Windows since we use UTF-8 and on UNIX it would cause too much troubles * everywhere if it is not anyway */ user_dir = g_build_filename (geany->app->configdir, "plugins", GGD_PLUGIN_CNAME, section, NULL); - system_dir = g_build_filename (system_prefix ? system_prefix : "", - PLUGINDATADIR, section, NULL); + system_dir = get_data_dir_path (section); user_path = g_build_filename (user_dir, name, NULL); system_path = g_build_filename (system_dir, name, NULL); if (perms_req & GGD_PERM_R) { @@ -259,7 +271,6 @@ ggd_get_config_file (const gchar *name, if (path != system_path) g_free (system_path); g_free (user_dir); g_free (system_dir); - g_free (system_prefix); return path; } Modified: geniuspaste/src/geniuspaste.c 24 lines changed, 17 insertions(+), 7 deletions(-) =================================================================== @@ -244,17 +244,29 @@ static void load_pastebins_in_dir(const gchar *path) } } -static void load_all_pastebins(void) +static gchar *get_data_dir_path(const gchar *filename) { -#ifdef G_OS_WIN32 - gchar *prefix = g_win32_get_package_installation_directory_of_module(NULL); -#else gchar *prefix = NULL; + gchar *path; + +#ifdef G_OS_WIN32 + prefix = g_win32_get_package_installation_directory_of_module(NULL); +#elif defined(__APPLE__) + if (g_getenv("GEANY_PLUGINS_SHARE_PATH")) + return g_build_filename(g_getenv("GEANY_PLUGINS_SHARE_PATH"), + PLUGIN, filename, NULL); #endif + path = g_build_filename(prefix ? prefix : "", PLUGINDATADIR, filename, NULL); + g_free(prefix); + return path; +} + +static void load_all_pastebins(void) +{ gchar *paths[] = { g_build_filename(geany->app->configdir, "plugins", "geniuspaste", "pastebins", NULL), - g_build_filename(prefix ? prefix : "", PLUGINDATADIR, "pastebins", NULL) + get_data_dir_path("pastebins") }; guint i; @@ -264,8 +276,6 @@ static void load_all_pastebins(void) g_free(paths[i]); } pastebins = g_slist_sort(pastebins, sort_pastebins); - - g_free(prefix); } static void free_all_pastebins(void) Modified: git-changebar/src/gcb-plugin.c 27 lines changed, 19 insertions(+), 8 deletions(-) =================================================================== @@ -1386,19 +1386,31 @@ on_plugin_configure_response (GtkDialog *dialog, } } +static gchar * +get_data_dir_path (const gchar *filename) +{ + gchar *prefix = NULL; + gchar *path; + +#ifdef G_OS_WIN32 + prefix = g_win32_get_package_installation_directory_of_module (NULL); +#elif defined(__APPLE__) + if (g_getenv ("GEANY_PLUGINS_SHARE_PATH")) + return g_build_filename (g_getenv ("GEANY_PLUGINS_SHARE_PATH"), + PLUGIN, filename, NULL); +#endif + path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, filename, NULL); + g_free (prefix); + return path; +} + GtkWidget * plugin_configure (GtkDialog *dialog) { GError *error = NULL; GtkWidget *base = NULL; GtkBuilder *builder = gtk_builder_new (); -#ifdef G_OS_WIN32 - gchar *prefix = g_win32_get_package_installation_directory_of_module (NULL); -#else - gchar *prefix = NULL; -#endif - gchar *path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, - "prefs.ui", NULL); + gchar *path = get_data_dir_path ("prefs.ui"); gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE); if (! gtk_builder_add_from_file (builder, path, &error)) { @@ -1444,7 +1456,6 @@ plugin_configure (GtkDialog *dialog) } g_free (path); - g_free (prefix); g_object_unref (builder); return base; Modified: overview/overview/overviewprefspanel.c 26 lines changed, 19 insertions(+), 7 deletions(-) =================================================================== @@ -192,18 +192,31 @@ overview_prefs_panel_load_prefs (OverviewPrefsPanel *self) g_signal_emit_by_name (self, "prefs-loaded", self->prefs); } +static gchar * +get_data_dir_path (const gchar *filename) +{ + gchar *prefix = NULL; + gchar *path; + +#ifdef G_OS_WIN32 + prefix = g_win32_get_package_installation_directory_of_module (NULL); +#elif defined(__APPLE__) + if (g_getenv ("GEANY_PLUGINS_SHARE_PATH")) + return g_build_filename (g_getenv ("GEANY_PLUGINS_SHARE_PATH"), + PLUGIN, filename, NULL); +#endif + path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, filename, NULL); + g_free (prefix); + return path; +} + static void overview_prefs_panel_init (OverviewPrefsPanel *self) { GtkBuilder *builder; GError *error = NULL; GtkWidget *overlay_frame; -#ifdef G_OS_WIN32 - gchar *prefix = g_win32_get_package_installation_directory_of_module (NULL); -#else - gchar *prefix = NULL; -#endif - gchar *ui_file_path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, "prefs.ui", NULL); + gchar *ui_file_path = get_data_dir_path ("prefs.ui"); builder = gtk_builder_new (); if (! gtk_builder_add_from_file (builder, ui_file_path, &error)) @@ -215,7 +228,6 @@ overview_prefs_panel_init (OverviewPrefsPanel *self) } g_free (ui_file_path); - g_free (prefix); self->prefs_table = builder_get_widget (builder, "prefs-table"); self->width_spin = builder_get_widget (builder, "width-spin"); Modified: pohelper/src/gph-plugin.c 16 lines changed, 9 insertions(+), 7 deletions(-) =================================================================== @@ -1360,16 +1360,18 @@ on_color_button_color_notify (GtkWidget *widget, static gchar * get_data_dir_path (const gchar *filename) { -#ifdef G_OS_WIN32 - gchar *prefix = g_win32_get_package_installation_directory_of_module (NULL); -#else gchar *prefix = NULL; + gchar *path; + +#ifdef G_OS_WIN32 + prefix = g_win32_get_package_installation_directory_of_module (NULL); +#elif defined(__APPLE__) + if (g_getenv ("GEANY_PLUGINS_SHARE_PATH")) + return g_build_filename( g_getenv ("GEANY_PLUGINS_SHARE_PATH"), + PLUGIN, filename, NULL); #endif - gchar *path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, - filename, NULL); - + path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, filename, NULL); g_free (prefix); - return path; } Modified: scope/src/scope.c 19 lines changed, 18 insertions(+), 1 deletions(-) =================================================================== @@ -526,10 +526,27 @@ void configure_panel(void) gtk_notebook_set_tab_pos(GTK_NOTEBOOK(debug_panel), pref_panel_tab_pos); } +static gchar *get_data_dir_path(const gchar *filename) +{ + gchar *prefix = NULL; + gchar *path; + +#ifdef G_OS_WIN32 + prefix = g_win32_get_package_installation_directory_of_module(NULL); +#elif defined(__APPLE__) + if (g_getenv("GEANY_PLUGINS_SHARE_PATH")) + return g_build_filename(g_getenv("GEANY_PLUGINS_SHARE_PATH"), + PLUGIN, filename, NULL); +#endif + path = g_build_filename(prefix ? prefix : "", PLUGINDATADIR, filename, NULL); + g_free(prefix); + return path; +} + void plugin_init(G_GNUC_UNUSED GeanyData *gdata) { GeanyKeyGroup *scope_key_group; - char *gladefile = g_build_filename(PLUGINDATADIR, "scope.glade", NULL); + char *gladefile = get_data_dir_path("scope.glade"); GError *gerror = NULL; GtkWidget *menubar1 = ui_lookup_widget(geany->main_widgets->window, "menubar1"); guint item; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] a8e787: Add note to plugins which are currently not activly maintained as marked inside MAINTAINERS
by Frank Lanitz 29 Apr '17

29 Apr '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 08 Apr 2017 15:14:04 UTC Commit: a8e787070d6fa227f6b5927eb30a073939331f29 https://github.com/geany/geany-plugins/commit/a8e787070d6fa227f6b5927eb30a0… Log Message: ----------- Add note to plugins which are currently not activly maintained as marked inside MAINTAINERS Modified Paths: -------------- geanydoc/src/geanydoc.c geanyextrasel/src/extrasel.c geanyinsertnum/src/insertnum.c geanylua/glspi_ver.h geanypg/src/geanypg.c geanyprj/src/geanyprj.c geanyvc/src/geanyvc.c pretty-printer/src/PluginEntry.c scope/src/scope.c shiftcolumn/src/shiftcolumn.c treebrowser/src/treebrowser.c Modified: geanydoc/src/geanydoc.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -47,7 +47,7 @@ static GtkWidget *keyb2; PLUGIN_VERSION_CHECK(224) /* All plugins must set name, description, version and author. */ PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, - _("Doc"), _("Call documentation viewer on current symbol."), VERSION, + _("Doc"), _("Call documentation viewer on current symbol. \nThis plugin currently has no maintainer. Would you like to help by contributing to this plugin?"), VERSION, "Yura Siamshka <yurand2(a)gmail.com>") /* Keybinding(s) */ Modified: geanyextrasel/src/extrasel.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,9 @@ GeanyData *geany_data; PLUGIN_VERSION_CHECK(224) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, - _("Extra Selection"), _("Column mode, select to line / brace / anchor."), + _("Extra Selection"), _("Column mode, select to line / brace / anchor." + "\nThis plugin currently has no maintainer. Would you like to help by " + "contributing to this plugin?"), "0.52", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") /* Keybinding(s) */ Modified: geanyinsertnum/src/insertnum.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -41,7 +41,9 @@ GeanyData *geany_data; PLUGIN_VERSION_CHECK(224) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, - _("Insert Numbers"), _("Insert/Fill columns with numbers."), + _("Insert Numbers"), _("Insert/Fill columns with numbers." + "\nThis plugin currently has no maintainer. Would you like to help" + " by contributing to this plugin?"), "0.2.2", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") /* Keybinding(s) */ Modified: geanylua/glspi_ver.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -6,7 +6,7 @@ #define PLUGIN_NAME _("Lua Script") -#define PLUGIN_DESC _("Write and run Lua scripts for custom commands.") +#define PLUGIN_DESC _("Write and run Lua scripts for custom commands.\nThis plugin currently has no maintainer. Would you like to help by contributing to this plugin?") #define PLUGIN_VER VERSION Modified: geanypg/src/geanypg.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -33,7 +33,9 @@ PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, GETTEXT_PACKAGE, "GeanyPG", - _("gpg encryption plugin for geany"), + _("GPG encryption plugin for geany." + "\nThis plugin currently has no maintainer. Would you " + "like to help by contributing to this plugin?"), "0.1", _("Hans Alves <alves.h88(a)gmail.com>")) Modified: geanyprj/src/geanyprj.c 9 lines changed, 6 insertions(+), 3 deletions(-) =================================================================== @@ -4,7 +4,7 @@ * Copyright 2007 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Copyright 2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2007 Nick Treleaven <nick.treleaven(a)btinternet.com> - * Copyright 2007,2008 Yura Siamashka <yurand2(a)gmail.com> + * Copyright 2007, 2008 Yura Siamashka <yurand2(a)gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,8 +36,11 @@ PLUGIN_VERSION_CHECK(224) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, - "GeanyPrj", _("Alternative project support."), VERSION, - "Yura Siamashka <yurand2(a)gmail.com>") + "GeanyPrj", _("Alternative project support. \nThis plugin currently" + "has no maintainer. Would you like to help by contributing " + "to this plugin?"), + VERSION, + "Yura Siamashka <yurand2(a)gmail.com>") GeanyPlugin *geany_plugin; GeanyData *geany_data; Modified: geanyvc/src/geanyvc.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -69,7 +69,9 @@ PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, GETTEXT_PACKAGE, _("GeanyVC"), - _("Interface to different Version Control systems."), + _("Interface to different Version Control systems." + "\nThis plugins is currently not developed actively. " + "Would you like to help by contributing to this plugin?"), VERSION, "Yura Siamashka <yurand2(a)gmail.com>,\nFrank Lanitz <frank(a)frank.uvena.de>") Modified: pretty-printer/src/PluginEntry.c 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -34,7 +34,8 @@ PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, GETTEXT_PACKAGE, _("XML PrettyPrinter"), - _("Formats an XML and makes it human-readable."), + _("Formats an XML and makes it human-readable. \nThis plugin currently" + "has no maintainer. Would you like to help by contributing to this plugin?"), PRETTY_PRINTER_VERSION, "Cédric Tabin - http://www.astorm.ch") /*========================================== DECLARATIONS ================================================================*/ @@ -117,7 +118,7 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) int result; int xOffset; GeanyFiletype* fileType; - + g_return_if_fail(doc != NULL); editor = doc->editor; Modified: scope/src/scope.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,9 @@ GeanyData *geany_data; PLUGIN_VERSION_CHECK(224) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, _("Scope Debugger"), - _("Relatively simple GDB front-end."), "0.94", + _("Relatively simple GDB front-end." + "\nThis plugin currently has no maintainer. Would you like to help " + "by contributing to this plugin?"), "0.94", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") /* Keybinding(s) */ Modified: shiftcolumn/src/shiftcolumn.c 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -38,9 +38,11 @@ GeanyData *geany_data; PLUGIN_VERSION_CHECK(224) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, - _("Shift Column"), - _("Shift a selection left and right"), - VERSION, "Andrew L Janke <a.janke(a)gmail.com>") + _("Shift Column"), + _("Shift a selection left and right." + "\nThis plugin currently has no maintainer. Would you like to help " + "by contributing to this plugin?"), + VERSION, "Andrew L Janke <a.janke(a)gmail.com>") static GtkWidget *menu_item_shift_left = NULL; Modified: treebrowser/src/treebrowser.c 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -125,7 +125,10 @@ PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, GETTEXT_PACKAGE, _("TreeBrowser"), - _("This plugin adds a tree browser to Geany, allowing the user to browse files using a tree view of the directory being browsed."), + _("This plugin adds a tree browser to Geany, allowing the user to " + "browse files using a tree view of the directory being browsed." + "\nThis plugin currently has no maintainer. Would you like to help " + "by contributing to this plugin?"), "0.20" , "Adrian Dimitrov (dimitrov.adrian(a)gmail.com)") -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e1b18d: Merge pull request #540 from frlan/feature/show-unmaintained-in-plugin-manager
by Frank Lanitz 29 Apr '17

29 Apr '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 29 Apr 2017 09:40:43 UTC Commit: e1b18d0a1f7e37023c50c33855b3633845150766 https://github.com/geany/geany-plugins/commit/e1b18d0a1f7e37023c50c33855b36… Log Message: ----------- Merge pull request #540 from frlan/feature/show-unmaintained-in-plugin-manager Add note to plugins which are currently not actively maintained Modified Paths: -------------- geanydoc/src/geanydoc.c geanyextrasel/src/extrasel.c geanyinsertnum/src/insertnum.c geanylua/glspi_ver.h geanypg/src/geanypg.c geanyprj/src/geanyprj.c geanyvc/src/geanyvc.c pretty-printer/src/PluginEntry.c scope/src/scope.c shiftcolumn/src/shiftcolumn.c treebrowser/src/treebrowser.c Modified: geanydoc/src/geanydoc.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -47,7 +47,7 @@ static GtkWidget *keyb2; PLUGIN_VERSION_CHECK(224) /* All plugins must set name, description, version and author. */ PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, - _("Doc"), _("Call documentation viewer on current symbol."), VERSION, + _("Doc"), _("Call documentation viewer on current symbol. \nThis plugin currently has no maintainer. Would you like to help by contributing to this plugin?"), VERSION, "Yura Siamshka <yurand2(a)gmail.com>") /* Keybinding(s) */ Modified: geanyextrasel/src/extrasel.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,9 @@ GeanyData *geany_data; PLUGIN_VERSION_CHECK(224) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, - _("Extra Selection"), _("Column mode, select to line / brace / anchor."), + _("Extra Selection"), _("Column mode, select to line / brace / anchor." + "\nThis plugin currently has no maintainer. Would you like to help by " + "contributing to this plugin?"), "0.52", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") /* Keybinding(s) */ Modified: geanyinsertnum/src/insertnum.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -41,7 +41,9 @@ GeanyData *geany_data; PLUGIN_VERSION_CHECK(224) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, - _("Insert Numbers"), _("Insert/Fill columns with numbers."), + _("Insert Numbers"), _("Insert/Fill columns with numbers." + "\nThis plugin currently has no maintainer. Would you like to help" + " by contributing to this plugin?"), "0.2.2", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") /* Keybinding(s) */ Modified: geanylua/glspi_ver.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -6,7 +6,7 @@ #define PLUGIN_NAME _("Lua Script") -#define PLUGIN_DESC _("Write and run Lua scripts for custom commands.") +#define PLUGIN_DESC _("Write and run Lua scripts for custom commands.\nThis plugin currently has no maintainer. Would you like to help by contributing to this plugin?") #define PLUGIN_VER VERSION Modified: geanypg/src/geanypg.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -33,7 +33,9 @@ PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, GETTEXT_PACKAGE, "GeanyPG", - _("gpg encryption plugin for geany"), + _("GPG encryption plugin for geany." + "\nThis plugin currently has no maintainer. Would you " + "like to help by contributing to this plugin?"), "0.1", _("Hans Alves <alves.h88(a)gmail.com>")) Modified: geanyprj/src/geanyprj.c 9 lines changed, 6 insertions(+), 3 deletions(-) =================================================================== @@ -4,7 +4,7 @@ * Copyright 2007 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Copyright 2007 Enrico Tröger <enrico.troeger(a)uvena.de> * Copyright 2007 Nick Treleaven <nick.treleaven(a)btinternet.com> - * Copyright 2007,2008 Yura Siamashka <yurand2(a)gmail.com> + * Copyright 2007, 2008 Yura Siamashka <yurand2(a)gmail.com> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,8 +36,11 @@ PLUGIN_VERSION_CHECK(224) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, - "GeanyPrj", _("Alternative project support."), VERSION, - "Yura Siamashka <yurand2(a)gmail.com>") + "GeanyPrj", _("Alternative project support. \nThis plugin currently" + "has no maintainer. Would you like to help by contributing " + "to this plugin?"), + VERSION, + "Yura Siamashka <yurand2(a)gmail.com>") GeanyPlugin *geany_plugin; GeanyData *geany_data; Modified: geanyvc/src/geanyvc.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -69,7 +69,9 @@ PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, GETTEXT_PACKAGE, _("GeanyVC"), - _("Interface to different Version Control systems."), + _("Interface to different Version Control systems." + "\nThis plugins is currently not developed actively. " + "Would you like to help by contributing to this plugin?"), VERSION, "Yura Siamashka <yurand2(a)gmail.com>,\nFrank Lanitz <frank(a)frank.uvena.de>") Modified: pretty-printer/src/PluginEntry.c 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -34,7 +34,8 @@ PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, GETTEXT_PACKAGE, _("XML PrettyPrinter"), - _("Formats an XML and makes it human-readable."), + _("Formats an XML and makes it human-readable. \nThis plugin currently" + "has no maintainer. Would you like to help by contributing to this plugin?"), PRETTY_PRINTER_VERSION, "Cédric Tabin - http://www.astorm.ch") /*========================================== DECLARATIONS ================================================================*/ @@ -117,7 +118,7 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) int result; int xOffset; GeanyFiletype* fileType; - + g_return_if_fail(doc != NULL); editor = doc->editor; Modified: scope/src/scope.c 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,9 @@ GeanyData *geany_data; PLUGIN_VERSION_CHECK(224) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, _("Scope Debugger"), - _("Relatively simple GDB front-end."), "0.94", + _("Relatively simple GDB front-end." + "\nThis plugin currently has no maintainer. Would you like to help " + "by contributing to this plugin?"), "0.94", "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") /* Keybinding(s) */ Modified: shiftcolumn/src/shiftcolumn.c 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -38,9 +38,11 @@ GeanyData *geany_data; PLUGIN_VERSION_CHECK(224) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, - _("Shift Column"), - _("Shift a selection left and right"), - VERSION, "Andrew L Janke <a.janke(a)gmail.com>") + _("Shift Column"), + _("Shift a selection left and right." + "\nThis plugin currently has no maintainer. Would you like to help " + "by contributing to this plugin?"), + VERSION, "Andrew L Janke <a.janke(a)gmail.com>") static GtkWidget *menu_item_shift_left = NULL; Modified: treebrowser/src/treebrowser.c 5 lines changed, 4 insertions(+), 1 deletions(-) =================================================================== @@ -125,7 +125,10 @@ PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, GETTEXT_PACKAGE, _("TreeBrowser"), - _("This plugin adds a tree browser to Geany, allowing the user to browse files using a tree view of the directory being browsed."), + _("This plugin adds a tree browser to Geany, allowing the user to " + "browse files using a tree view of the directory being browsed." + "\nThis plugin currently has no maintainer. Would you like to help " + "by contributing to this plugin?"), "0.20" , "Adrian Dimitrov (dimitrov.adrian(a)gmail.com)") -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 802e8d: scope: Fix locating the glade file on OS X and Windows
by Jiří Techet 26 Apr '17

26 Apr '17

Branch: refs/heads/osx_relpath Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 26 Apr 2017 20:46:20 UTC Commit: 802e8d3266ec2773705d3e4522e1a57b9972dfe7 https://github.com/geany/geany-plugins/commit/802e8d3266ec2773705d3e4522e1a… Log Message: ----------- scope: Fix locating the glade file on OS X and Windows Modified Paths: -------------- scope/src/scope.c Modified: scope/src/scope.c 19 lines changed, 18 insertions(+), 1 deletions(-) =================================================================== @@ -524,10 +524,27 @@ void configure_panel(void) gtk_notebook_set_tab_pos(GTK_NOTEBOOK(debug_panel), pref_panel_tab_pos); } +static gchar *get_data_dir_path(const gchar *filename) +{ + gchar *prefix = NULL; + gchar *path; + +#ifdef G_OS_WIN32 + prefix = g_win32_get_package_installation_directory_of_module(NULL); +#elif defined(__APPLE__) + if (g_getenv("GEANY_PLUGINS_SHARE_PATH")) + return g_build_filename(g_getenv("GEANY_PLUGINS_SHARE_PATH"), + PLUGIN, filename, NULL); +#endif + path = g_build_filename(prefix ? prefix : "", PLUGINDATADIR, filename, NULL); + g_free(prefix); + return path; +} + void plugin_init(G_GNUC_UNUSED GeanyData *gdata) { GeanyKeyGroup *scope_key_group; - char *gladefile = g_build_filename(PLUGINDATADIR, "scope.glade", NULL); + char *gladefile = get_data_dir_path("scope.glade"); GError *gerror = NULL; GtkWidget *menubar1 = ui_lookup_widget(geany->main_widgets->window, "menubar1"); guint item; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 9c970c: pohelper: Fix locating the ui file on OS X when using bundle
by Jiří Techet 26 Apr '17

26 Apr '17

Branch: refs/heads/osx_relpath Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 26 Apr 2017 20:46:20 UTC Commit: 9c970c1acc7961d862d1a2f4498583b321035907 https://github.com/geany/geany-plugins/commit/9c970c1acc7961d862d1a2f449858… Log Message: ----------- pohelper: Fix locating the ui file on OS X when using bundle Modified Paths: -------------- pohelper/src/gph-plugin.c Modified: pohelper/src/gph-plugin.c 16 lines changed, 9 insertions(+), 7 deletions(-) =================================================================== @@ -1360,16 +1360,18 @@ on_color_button_color_notify (GtkWidget *widget, static gchar * get_data_dir_path (const gchar *filename) { -#ifdef G_OS_WIN32 - gchar *prefix = g_win32_get_package_installation_directory_of_module (NULL); -#else gchar *prefix = NULL; + gchar *path; + +#ifdef G_OS_WIN32 + prefix = g_win32_get_package_installation_directory_of_module (NULL); +#elif defined(__APPLE__) + if (g_getenv ("GEANY_PLUGINS_SHARE_PATH")) + return g_build_filename( g_getenv ("GEANY_PLUGINS_SHARE_PATH"), + PLUGIN, filename, NULL); #endif - gchar *path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, - filename, NULL); - + path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, filename, NULL); g_free (prefix); - return path; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 663d3d: overview: Fix locating the ui file on OS X when using bundle
by Jiří Techet 26 Apr '17

26 Apr '17

Branch: refs/heads/osx_relpath Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 26 Apr 2017 20:46:20 UTC Commit: 663d3d798b0ab6ba7ae6b3cee75f9689e83fca6f https://github.com/geany/geany-plugins/commit/663d3d798b0ab6ba7ae6b3cee75f9… Log Message: ----------- overview: Fix locating the ui file on OS X when using bundle Modified Paths: -------------- overview/overview/overviewprefspanel.c Modified: overview/overview/overviewprefspanel.c 26 lines changed, 19 insertions(+), 7 deletions(-) =================================================================== @@ -192,18 +192,31 @@ overview_prefs_panel_load_prefs (OverviewPrefsPanel *self) g_signal_emit_by_name (self, "prefs-loaded", self->prefs); } +static gchar * +get_data_dir_path (const gchar *filename) +{ + gchar *prefix = NULL; + gchar *path; + +#ifdef G_OS_WIN32 + prefix = g_win32_get_package_installation_directory_of_module (NULL); +#elif defined(__APPLE__) + if (g_getenv ("GEANY_PLUGINS_SHARE_PATH")) + return g_build_filename (g_getenv ("GEANY_PLUGINS_SHARE_PATH"), + PLUGIN, filename, NULL); +#endif + path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, filename, NULL); + g_free (prefix); + return path; +} + static void overview_prefs_panel_init (OverviewPrefsPanel *self) { GtkBuilder *builder; GError *error = NULL; GtkWidget *overlay_frame; -#ifdef G_OS_WIN32 - gchar *prefix = g_win32_get_package_installation_directory_of_module (NULL); -#else - gchar *prefix = NULL; -#endif - gchar *ui_file_path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, "prefs.ui", NULL); + gchar *ui_file_path = get_data_dir_path ("prefs.ui"); builder = gtk_builder_new (); if (! gtk_builder_add_from_file (builder, ui_file_path, &error)) @@ -215,7 +228,6 @@ overview_prefs_panel_init (OverviewPrefsPanel *self) } g_free (ui_file_path); - g_free (prefix); self->prefs_table = builder_get_widget (builder, "prefs-table"); self->width_spin = builder_get_widget (builder, "width-spin"); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f6cb49: git-changebar: Fix locating the ui file on OS X when using bundle
by Jiří Techet 26 Apr '17

26 Apr '17

Branch: refs/heads/osx_relpath Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 26 Apr 2017 20:46:20 UTC Commit: f6cb49987fde36ecdede37a87052bd9888398d17 https://github.com/geany/geany-plugins/commit/f6cb49987fde36ecdede37a87052b… Log Message: ----------- git-changebar: Fix locating the ui file on OS X when using bundle Modified Paths: -------------- git-changebar/src/gcb-plugin.c Modified: git-changebar/src/gcb-plugin.c 27 lines changed, 19 insertions(+), 8 deletions(-) =================================================================== @@ -1386,19 +1386,31 @@ on_plugin_configure_response (GtkDialog *dialog, } } +static gchar * +get_data_dir_path (const gchar *filename) +{ + gchar *prefix = NULL; + gchar *path; + +#ifdef G_OS_WIN32 + prefix = g_win32_get_package_installation_directory_of_module (NULL); +#elif defined(__APPLE__) + if (g_getenv ("GEANY_PLUGINS_SHARE_PATH")) + return g_build_filename (g_getenv ("GEANY_PLUGINS_SHARE_PATH"), + PLUGIN, filename, NULL); +#endif + path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, filename, NULL); + g_free (prefix); + return path; +} + GtkWidget * plugin_configure (GtkDialog *dialog) { GError *error = NULL; GtkWidget *base = NULL; GtkBuilder *builder = gtk_builder_new (); -#ifdef G_OS_WIN32 - gchar *prefix = g_win32_get_package_installation_directory_of_module (NULL); -#else - gchar *prefix = NULL; -#endif - gchar *path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, - "prefs.ui", NULL); + gchar *path = get_data_dir_path ("prefs.ui"); gtk_builder_set_translation_domain (builder, GETTEXT_PACKAGE); if (! gtk_builder_add_from_file (builder, path, &error)) { @@ -1444,7 +1456,6 @@ plugin_configure (GtkDialog *dialog) } g_free (path); - g_free (prefix); g_object_unref (builder); return base; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] cc4ef1: geanygendoc: Fix locating the pastebin configs on OS X when using bundle
by Jiří Techet 26 Apr '17

26 Apr '17

Branch: refs/heads/osx_relpath Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 26 Apr 2017 20:46:20 UTC Commit: cc4ef1c7ae3278997743202ae95d87c648bea491 https://github.com/geany/geany-plugins/commit/cc4ef1c7ae3278997743202ae95d8… Log Message: ----------- geanygendoc: Fix locating the pastebin configs on OS X when using bundle Modified Paths: -------------- geanygendoc/src/ggd-utils.c Modified: geanygendoc/src/ggd-utils.c 27 lines changed, 19 insertions(+), 8 deletions(-) =================================================================== @@ -135,6 +135,24 @@ ggd_copy_file (const gchar *input, return success; } +static gchar * +get_data_dir_path (const gchar *filename) +{ + gchar *prefix = NULL; + gchar *path; + +#ifdef G_OS_WIN32 + prefix = g_win32_get_package_installation_directory_of_module (NULL); +#elif defined(__APPLE__) + if (g_getenv ("GEANY_PLUGINS_SHARE_PATH")) + return g_build_filename (g_getenv ("GEANY_PLUGINS_SHARE_PATH"), + PLUGIN, filename, NULL); +#endif + path = g_build_filename (prefix ? prefix : "", PLUGINDATADIR, filename, NULL); + g_free (prefix); + return path; +} + /** * ggd_get_config_file: * @name: The name of the configuration file to get (ASCII string) @@ -161,7 +179,6 @@ ggd_get_config_file (const gchar *name, GError **error) { gchar *path = NULL; - gchar *system_prefix = NULL; gchar *user_dir; gchar *user_path; gchar *system_dir; @@ -170,17 +187,12 @@ ggd_get_config_file (const gchar *name, g_return_val_if_fail (name != NULL, NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL); -#ifdef G_OS_WIN32 - system_prefix = g_win32_get_package_installation_directory_of_module (NULL); -#endif - /* here we guess the locale encoding is ASCII-compatible, anyway it's the case * on Windows since we use UTF-8 and on UNIX it would cause too much troubles * everywhere if it is not anyway */ user_dir = g_build_filename (geany->app->configdir, "plugins", GGD_PLUGIN_CNAME, section, NULL); - system_dir = g_build_filename (system_prefix ? system_prefix : "", - PLUGINDATADIR, section, NULL); + system_dir = get_data_dir_path (section); user_path = g_build_filename (user_dir, name, NULL); system_path = g_build_filename (system_dir, name, NULL); if (perms_req & GGD_PERM_R) { @@ -259,7 +271,6 @@ ggd_get_config_file (const gchar *name, if (path != system_path) g_free (system_path); g_free (user_dir); g_free (system_dir); - g_free (system_prefix); return path; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4fd4ac: geniuspaste: Fix locating config files on OS X when using bundle
by Jiří Techet 26 Apr '17

26 Apr '17

Branch: refs/heads/osx_relpath Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 26 Apr 2017 20:46:20 UTC Commit: 4fd4ac74292cc5cbe38fa1d12749b6166d5dbe69 https://github.com/geany/geany-plugins/commit/4fd4ac74292cc5cbe38fa1d12749b… Log Message: ----------- geniuspaste: Fix locating config files on OS X when using bundle Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 24 lines changed, 17 insertions(+), 7 deletions(-) =================================================================== @@ -244,17 +244,29 @@ static void load_pastebins_in_dir(const gchar *path) } } -static void load_all_pastebins(void) +static gchar *get_data_dir_path(const gchar *filename) { -#ifdef G_OS_WIN32 - gchar *prefix = g_win32_get_package_installation_directory_of_module(NULL); -#else gchar *prefix = NULL; + gchar *path; + +#ifdef G_OS_WIN32 + prefix = g_win32_get_package_installation_directory_of_module(NULL); +#elif defined(__APPLE__) + if (g_getenv("GEANY_PLUGINS_SHARE_PATH")) + return g_build_filename(g_getenv("GEANY_PLUGINS_SHARE_PATH"), + PLUGIN, filename, NULL); #endif + path = g_build_filename(prefix ? prefix : "", PLUGINDATADIR, filename, NULL); + g_free(prefix); + return path; +} + +static void load_all_pastebins(void) +{ gchar *paths[] = { g_build_filename(geany->app->configdir, "plugins", "geniuspaste", "pastebins", NULL), - g_build_filename(prefix ? prefix : "", PLUGINDATADIR, "pastebins", NULL) + get_data_dir_path("pastebins") }; guint i; @@ -264,8 +276,6 @@ static void load_all_pastebins(void) g_free(paths[i]); } pastebins = g_slist_sort(pastebins, sort_pastebins); - - g_free(prefix); } static void free_all_pastebins(void) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 802e8d: scope: Fix locating the glade file on OS X and Windows
by Jiří Techet 26 Apr '17

26 Apr '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Wed, 26 Apr 2017 20:46:20 UTC Commit: 802e8d3266ec2773705d3e4522e1a57b9972dfe7 https://github.com/geany/geany-plugins/commit/802e8d3266ec2773705d3e4522e1a… Log Message: ----------- scope: Fix locating the glade file on OS X and Windows Modified Paths: -------------- scope/src/scope.c Modified: scope/src/scope.c 19 lines changed, 18 insertions(+), 1 deletions(-) =================================================================== @@ -524,10 +524,27 @@ void configure_panel(void) gtk_notebook_set_tab_pos(GTK_NOTEBOOK(debug_panel), pref_panel_tab_pos); } +static gchar *get_data_dir_path(const gchar *filename) +{ + gchar *prefix = NULL; + gchar *path; + +#ifdef G_OS_WIN32 + prefix = g_win32_get_package_installation_directory_of_module(NULL); +#elif defined(__APPLE__) + if (g_getenv("GEANY_PLUGINS_SHARE_PATH")) + return g_build_filename(g_getenv("GEANY_PLUGINS_SHARE_PATH"), + PLUGIN, filename, NULL); +#endif + path = g_build_filename(prefix ? prefix : "", PLUGINDATADIR, filename, NULL); + g_free(prefix); + return path; +} + void plugin_init(G_GNUC_UNUSED GeanyData *gdata) { GeanyKeyGroup *scope_key_group; - char *gladefile = g_build_filename(PLUGINDATADIR, "scope.glade", NULL); + char *gladefile = get_data_dir_path("scope.glade"); GError *gerror = NULL; GtkWidget *menubar1 = ui_lookup_widget(geany->main_widgets->window, "menubar1"); guint item; -------------- 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 April 2017