Plugins-Commits June 2016

plugins-commits@lists.geany.org

1 participants
67 discussions

[geany/plugins.geany.org] c67522: Add a hint of renamed geanysendmail
by Frank Lanitz 12 Jun '16

12 Jun '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 12 Jun 2016 17:53:49 UTC Commit: c675226073be2e2d5611f174360fe1b4032cee69 https://github.com/geany/plugins.geany.org/commit/c675226073be2e2d5611f1743… Log Message: ----------- Add a hint of renamed geanysendmail Modified Paths: -------------- content/geanysendmail.html Modified: content/geanysendmail.html 222 lines changed, 3 insertions(+), 219 deletions(-) =================================================================== @@ -1,220 +1,4 @@ <h2>GeanySendMail</h2> -<div class="contents topic" id="contents"> - <h3 class="topic-title first"> - Contents - </h3> - <ul class="simple"> - <li> - <a class="reference internal" href="#about" id="id1" name="id1">About</a> - </li> - <li> - <a class="reference internal" href="#requirements" id="id2" name="id2">Requirements</a> - </li> - <li> - <a class="reference internal" href="#installation" id="id3" name="id3">Installation</a> - </li> - <li> - <a class="reference internal" href="#usage" id="id4" name="id4">Usage</a> - </li> - <li> - <a class="reference internal" href="#configuration" id="id5" name="id5">Configuration</a> - </li> - <li> - <a class="reference internal" href="#development" id="id6" name="id6">Development</a> - </li> - <li> - <a class="reference internal" href="#known-issues" id="id7" name="id7">Known issues</a> - </li> - <li> - <a class="reference internal" href="#license" id="id8" name="id8">License</a> - </li> - <li> - <a class="reference internal" href="#bugs-questions-bugs-homepage" id="id9" name="id9">Bugs, - questions, bugs, homepage</a> - </li> - </ul> -</div> -<div class="section" id="about"> - <h3> - About - </h3> - <p> - GeanySendMail is a little plugin to send a document as attachment using the preferred mail - client from inside Geany. It is similar to the envelope symbol of most office tools and - requires a mail client that is supporting remote calls. - </p> - - <p><a href="#contents">back to top</a></p> -</div> -<div class="section" id="requirements"> - <h3> - Requirements - </h3> - <p> - For compiling the plugin yourself, you will need the GTK (>= 2.8.0) libraries and header - files. You will also need its dependency libraries and header files, such as Pango, Glib and - ATK. All these files are available at <a class="reference external" href= - "http://www.gtk.org">http://www.gtk.org</a>. - </p> - <p> - And obviously, you will need to have Geany installed. If you have Geany installed from the - sources, you should be ready to go. If you used a prepared package e.g. from your distribution - you probably need to install an additional package, this might be called geany-dev or - geany-devel. Please note that in order to compile and use this plugin, you need Geany 0.16 or - later (Geany Plugin API v116 or higher). - </p> - <p> - Furthermore you need, of course, a C compiler and the Make tool. The GNU versions of these - tools are recommended. - </p> - - <p><a href="#contents">back to top</a></p> -</div> -<div class="section" id="installation"> - <h3> - Installation - </h3> - <p> - This version of the plugin is installed with the combined geany-plugins release. Please check - README of this package or download stand alone version of plugin from <a class= - "reference external" href= - "http://frank.uvena.de/en/Geany/geanysendmail/">http://frank.uvena.de/en/Geany/geanysendmail/</a> - </p> - - <p><a href="#contents">back to top</a></p> -</div> -<div class="section" id="usage"> - <h3> - Usage - </h3> - <p> - After installed successfully, load the plugin in Geany's plugin manager and a new menu item in - the Tools menu will appear. Before you can start you need to configure your mail client. This - can be done in the configuration dialog (details on it later). You can also assign a keyboard - shortcut in Geany's preferences dialog to send your document. - </p> - - <p><a href="#contents">back to top</a></p> -</div> -<div class="section" id="configuration"> - <h3> - Configuration - </h3> - <p> - In the configuration dialog you can set up a command that is called by the plugin to - communicate with your mail client. Depending on what's your favorite mailer, the command will - differ. A number of placeholders are available for doing this: - </p> - <ul> - <li> - %s: Will be replaced by the complete path of the file that should be send. - </li> - <li> - %r: Will be replaced by one or more recipient's email address that can be - entered inside a separate dialog. (Please remember during input, what your mail client - is expecting here) - </li> - <li> - %b: Will be replace by the file name. For a file /tmp/foo.baa it will be - replaced by foo.baa. - </li> - </ul> - <p> - Depending on how you like to use, you can combine all of the placeholders to build up your - command. It is possible to use one placeholder several times. When using keep care, as the - placeholders are replace step by step, so a filename containing %b might have some funny - outcome. However, examples could be: - </p> - <p>Sylpheed:</p> - <code>sylpheed --attach "%f" --compose "%r"</code> - - <p>mutt:</p> - <code>mutt -s "Sending '%b'" -a "%f" "%r"</code> - - <p>Mozilla Thunderbird at Windows:</p> - <code>"C:Program FilesMozilla Thunderbirdthunderbird.exe" - -compose to="%r",subject="%b",attachment="%f"</code> - - <p> - In theory it should also work together with tools like Microsoft Outlook - Unfortunately the - author wasn't able to bring it up running. Input for the correct commandline is highly welcome. - </p> - - <p><a href="#contents">back to top</a></p> -</div> -<div class="section" id="development"> - <h3> - Development - </h3> - <p> - You can checkout the current source code from the Subversion repository at Sourceforge.net. Get - the code from: - </p> - <code> - svn checkout <a class="reference external" href= - "http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geanys…">http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geanys…</a> - </code> - <p> - As this plugin is part of the combined geany-plugins release, you may also like to check its - Subversion repository by checking ou - </p> - <code> - svn checkout <a class="reference external" href= - "http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-…">http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-…</a> - </code> - <p> - If you want to create a patch, please respect the license of GeanySendMail (GPLv2 or above) as - well as intellectual property of third. Patches that should be included to the default - distribution must be licensed under the same conditions as GeanySendMail by the copyright - owner. - </p> - - <p><a href="#contents">back to top</a></p> -</div> -<div class="section" id="known-issues"> - <h3> - Known issues - </h3> - <p> - In case you are working with white spaces either in your path names, file names or at mail - addresses (e.g. for separating two addresses) you should keep care of proper quoting since %s, - %b and %r will be replaced without any quotes. - </p> - <p> - For more recent information all reported issues will be tracked at <a class= - "reference external" href= - "http://sourceforge.net/tracker/?group_id=222729">http://sourceforge.net/tracker/?group_id=222729</a> - </p> - - <p><a href="#contents">back to top</a></p> -</div> -<div class="section" id="license"> - <h3> - License - </h3> - <p> - GeanySendMail and all its parts is distributed under the terms of the GNU General Public - License as published by the Free Software Foundation; either version 2 of the License, or (at - your option) any later version. A copy of this license can be found in the file COPYING - included with the source code of this program. If not, you will be able to get a copy by - contacting the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. - </p> - - <p><a href="#contents">back to top</a></p> -</div> -<div class="section" id="bugs-questions-bugs-homepage"> - <h3> - Bugs, questions, bugs, homepage - </h3> - <p> - If you found any bugs or want to provide a patch, please contact Frank Lanitz - (frank(at)geany(dot)org). Please also do so, if you got any questions and visiting <a class= - "reference external" href= - "http://frank.uvena.de/en/Geany/geanysendmail">http://frank.uvena.de/en/Geany/geanysendmail</a> - didn't help you to figure out the answer. Visiting the website is also a good start if you want - to check for any update on this plugin. - </p> - - <p><a href="#contents">back to top</a></p> -</div> +<p> + The plugin has been renamed an can now be found <a href="http://plugins.geany.org/sendmail.html">here</a>. +</p> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 0b8c2e: Startet a stub for 1.28
by Frank Lanitz 12 Jun '16

12 Jun '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 12 Jun 2016 17:50:52 UTC Commit: 0b8c2e6e584fa764e9a0ffa497d1b0e2ac6355b2 https://github.com/geany/geany-plugins/commit/0b8c2e6e584fa764e9a0ffa497d1b… Log Message: ----------- Startet a stub for 1.28 Modified Paths: -------------- NEWS Modified: NEWS 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,9 @@ +Geany Plugins 1.28 (not yet released) + + General: + * Renaming plugin GeanySendMail to SendMail + + Geany Plugins 1.27 (2016-03-13) General: -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 3f966c: Merge pull request #443 from frlan/feature/rename_geanysendmail
by Frank Lanitz 12 Jun '16

12 Jun '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 12 Jun 2016 17:48:58 UTC Commit: 3f966c93951344bc9f8e28da80dd9116a75bec0f https://github.com/geany/geany-plugins/commit/3f966c93951344bc9f8e28da80dd9… Log Message: ----------- Merge pull request #443 from frlan/feature/rename_geanysendmail Rename GeanySendMail to plain SendMail Modified Paths: -------------- Makefile.am README build/geany-plugins.nsi build/geanysendmail.m4 build/sendmail.m4 configure.ac geanysendmail/src/Makefile.am po/POTFILES.in sendmail/AUTHORS sendmail/COPYING sendmail/ChangeLog sendmail/Makefile.am sendmail/NEWS sendmail/README sendmail/TODO sendmail/src/Makefile.am sendmail/src/mail-icon.xpm sendmail/src/sendmail.c Modified: Makefile.am 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -91,9 +91,6 @@ if ENABLE_GEANYPY SUBDIRS += geanypy endif -if ENABLE_GEANYSENDMAIL -SUBDIRS += geanysendmail -endif if ENABLE_GEANYVC SUBDIRS += geanyvc @@ -143,6 +140,10 @@ if ENABLE_SCOPE SUBDIRS += scope endif +if ENABLE_SENDMAIL +SUBDIRS += sendmail +endif + if ENABLE_SHIFTCOLUMN SUBDIRS += shiftcolumn endif Modified: README 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -68,7 +68,6 @@ Available plugins are: * ``geanypg`` -- the geanypg plugin * ``geanyprj`` -- the GeanyPrj plugin * ``geanypy`` -- the Geanypy plugin -* ``geanysendmail`` -- the GeanySendmail plugin * ``geanyvc`` -- the GeanyVC plugin * ``geniuspaste`` -- the paste to a pastebin plugin * ``gitchangebar`` -- the GitChangeBar plugin @@ -83,6 +82,7 @@ Available plugins are: * ``pretty_printer`` -- the pretty-printer plugin * ``projectorganizer`` -- the ProjectOrganizer plugin * ``scope`` -- the Scope plugin +* ``sendmail`` -- the GeanySendmail plugin * ``shiftcolumn`` -- the ShiftColumn plugin * ``spellcheck`` -- the spellcheck plugin * ``treebrowser`` -- the Treebrowser plugin Modified: build/geany-plugins.nsi 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -173,6 +173,7 @@ Section Uninstall Delete "$INSTDIR\lib\geany\geanynumberedbookmarks.dll" Delete "$INSTDIR\lib\geany\geanypg.dll" Delete "$INSTDIR\lib\geany\geanyprj.dll" + ; Keep for geanysendmail propper deleting old dll some time Delete "$INSTDIR\lib\geany\geanysendmail.dll" Delete "$INSTDIR\lib\geany\geanyvc.dll" Delete "$INSTDIR\lib\geany\geniuspaste.dll" @@ -185,6 +186,7 @@ Section Uninstall Delete "$INSTDIR\lib\geany\pretty-printer.dll" Delete "$INSTDIR\lib\geany\projectorganizer.dll" Delete "$INSTDIR\lib\geany\scope.dll" + Delete "$INSTDIR\lib\geany\sendmail.dll" Delete "$INSTDIR\lib\geany\shiftcolumn.dll" Delete "$INSTDIR\lib\geany\spellcheck.dll" Delete "$INSTDIR\lib\geany\tableconvert.dll" Modified: build/geanysendmail.m4 9 lines changed, 0 insertions(+), 9 deletions(-) =================================================================== @@ -1,9 +0,0 @@ -AC_DEFUN([GP_CHECK_GEANYSENDMAIL], -[ - GP_ARG_DISABLE([GeanySendmail], [yes]) - GP_COMMIT_PLUGIN_STATUS([GeanySendmail]) - AC_CONFIG_FILES([ - geanysendmail/Makefile - geanysendmail/src/Makefile - ]) -]) Modified: build/sendmail.m4 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,9 @@ +AC_DEFUN([GP_CHECK_SENDMAIL], +[ + GP_ARG_DISABLE([Sendmail], [yes]) + GP_COMMIT_PLUGIN_STATUS([Sendmail]) + AC_CONFIG_FILES([ + sendmail/Makefile + sendmail/src/Makefile + ]) +]) Modified: configure.ac 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -50,7 +50,6 @@ GP_CHECK_GEANYMINISCRIPT GP_CHECK_GEANYNUMBEREDBOOKMARKS GP_CHECK_GEANYPRJ GP_CHECK_GEANYPY -GP_CHECK_GEANYSENDMAIL GP_CHECK_GEANYVC GP_CHECK_GEANYPG GP_CHECK_GENIUSPASTE @@ -64,6 +63,7 @@ GP_CHECK_POHELPER GP_CHECK_PRETTYPRINTER GP_CHECK_PROJECTORGANIZER GP_CHECK_SCOPE +GP_CHECK_SENDMAIL GP_CHECK_SHIFTCOLUMN GP_CHECK_SPELLCHECK GP_CHECK_TREEBROWSER Modified: geanysendmail/src/Makefile.am 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -include $(top_srcdir)/build/vars.build.mk -plugin = geanysendmail - -geanyplugins_LTLIBRARIES = geanysendmail.la - -geanysendmail_la_SOURCES = geanysendmail.c mail-icon.xpm -geanysendmail_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanySendMail\" -geanysendmail_la_LIBADD = $(COMMONLIBS) - -include $(top_srcdir)/build/cppcheck.mk Modified: po/POTFILES.in 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -200,9 +200,6 @@ geanyprj/src/xproject.c # Geanypy geanypy/src/geanypy-plugin.c -# geanysendmail -geanysendmail/src/geanysendmail.c - # geanyvc geanyvc/src/geanyvc.c geanyvc/src/geanyvc.h @@ -283,6 +280,9 @@ scope/src/utils.c scope/src/views.c scope/src/store/scptreestore.c +# sendmail +sendmail/src/sendmail.c + # Spell Check spellcheck/src/speller.c spellcheck/src/scplugin.c Modified: sendmail/AUTHORS 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: sendmail/COPYING 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: sendmail/ChangeLog 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: sendmail/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ include $(top_srcdir)/build/vars.auxfiles.mk SUBDIRS = src -plugin = geanysendmail +plugin = sendmail Modified: sendmail/NEWS 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: sendmail/README 20 lines changed, 11 insertions(+), 9 deletions(-) =================================================================== @@ -1,16 +1,18 @@ -GeanySendMail -============= +SendMail +======== .. contents:: About ------ -GeanySendMail is a little plugin to send a document as attachment +SendMail is a little plugin to send a document as attachment using the preferred mail client from inside Geany. It is similar to the envelope symbol of most office tools and requires a mail client that is supporting remote calls. +This is not a direct binding to sendmail, even if it could be used for. + Requirements ------------ @@ -25,7 +27,7 @@ installed from the sources, you should be ready to go. If you used a prepared package e.g. from your distribution you probably need to install an additional package, this might be called geany-dev or geany-devel. Please note that in order to compile and use this plugin, -you need Geany 0.20 or later (Geany Plugin API v199 or higher). +you need Geany 1.26 or later (Geany Plugin API v224 or higher). Furthermore you need, of course, a C compiler and the Make tool. The GNU versions of these tools are recommended. @@ -37,7 +39,7 @@ Installation This version of the plugin is installed with the combined geany-plugins release. Please check README of this package or download stand alone version of plugin from -http://frank.uvena.de/en/Geany/geanysendmail/ +http://frank.uvena.de/en/Geany/SendMail/ Usage @@ -96,9 +98,9 @@ github.com. Get the code by: git clone https://github.com/geany/geany-plugins.git If you want to create a patch, please respect the license of -GeanySendMail (GPLv2 or above) as well as intellectual property of +SendMail (GPLv2 or above) as well as intellectual property of third. Patches that should be included to the default distribution -must be licensed under the same conditions as GeanySendMail by the +must be licensed under the same conditions as SendMail by the copyright owner. @@ -117,7 +119,7 @@ https://github.com/geany/geany-plugins/issues License ------- -GeanySendMail and all its parts is distributed under the terms of the +SendMail and all its parts is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found in the file COPYING @@ -131,6 +133,6 @@ Bugs, questions, bugs, homepage If you found any bugs or want to provide a patch, please contact Frank Lanitz (frank(at)geany(dot)org). Please also do so, if you got any -questions and visiting http://frank.uvena.de/en/Geany/geanysendmail +questions and visiting http://frank.uvena.de/en/Geany/SendMail didn't help you to figure out the answer. Visiting the website is also a good start if you want to check for any update on this plugin. Modified: sendmail/TODO 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: sendmail/src/Makefile.am 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,10 @@ +include $(top_srcdir)/build/vars.build.mk +plugin = sendmail + +geanyplugins_LTLIBRARIES = sendmail.la + +sendmail_la_SOURCES = sendmail.c mail-icon.xpm +sendmail_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"SendMail\" +sendmail_la_LIBADD = $(COMMONLIBS) + +include $(top_srcdir)/build/cppcheck.mk Modified: sendmail/src/mail-icon.xpm 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: sendmail/src/sendmail.c 68 lines changed, 65 insertions(+), 3 deletions(-) =================================================================== @@ -1,7 +1,7 @@ /* - * geanysendmail.c + * sendmail.c * - * Copyright 2007-2015 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2007-2016 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Copyright 2007 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * Copyright 2007, 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * Copyright 2008, 2009 Timothy Boronczyk <tboronczyk(at)gmail(dot)com> @@ -30,6 +30,9 @@ #include <geanyplugin.h> #include "mail-icon.xpm" +#include <glib.h> +#include <glib/gstdio.h> +#include <errno.h> GeanyPlugin *geany_plugin; GeanyData *geany_data; @@ -39,7 +42,7 @@ PLUGIN_VERSION_CHECK(224) PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, GETTEXT_PACKAGE, - _("GeanySendMail"), + _("SendMail"), _("Sends the current file as attachment with your favorite mailer"), VERSION, "Frank Lanitz <frank(a)frank.uvena.de>") @@ -116,6 +119,8 @@ send_as_attachment(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer g } config_dir = g_path_get_dirname(config_file); + + if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) { @@ -354,12 +359,69 @@ GtkWidget *plugin_configure(GtkDialog *dialog) void plugin_init(GeanyData G_GNUC_UNUSED *data) { GKeyFile *config = g_key_file_new(); + gchar *config_file_old = NULL; + gchar *config_dir = NULL; + gchar *config_dir_old = NULL; gchar *kb_label = _("Send file by mail"); GtkWidget *menu_mail = NULL; GeanyKeyGroup *key_group; config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, + "sendmail", G_DIR_SEPARATOR_S, "mail.conf", NULL); + + #ifndef G_OS_WIN32 + /* We try only to move if we are on not Windows platform */ + config_file_old = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, + "plugins", G_DIR_SEPARATOR_S, "geanysendmail", G_DIR_SEPARATOR_S, "mail.conf", NULL); + config_dir = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, + "plugins", G_DIR_SEPARATOR_S, "sendmail", NULL); + config_dir_old = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, + "plugins", G_DIR_SEPARATOR_S, "geanysendmail", NULL); + + if (g_file_test(config_file_old, G_FILE_TEST_EXISTS)) + { + if (dialogs_show_question( + _("Renamed plugin detected!\n" + "\n" + "GeanySendMail has been renamed to sendmail -- you surely have " + "already recognised it. \n" + "Geany is able to migrate your old plugin configuration by " + "moving the old configuration file to new location.\n" + "Move now?"))) + { + if (g_rename(config_dir_old, config_dir) == 0) + { + dialogs_show_msgbox(GTK_MESSAGE_INFO, + _("Your configuration directory has been " + "successfully moved from \"%s\" to \"%s\"."), + config_dir_old, config_dir); + } + else + { + /* If there was an error on migrating we need + * to load from original one. + * When saving new configuration it will go to + * new folder so migration should + * be implicit. */ + g_free(config_file); + config_file = g_strdup(config_file_old); + dialogs_show_msgbox( + GTK_MESSAGE_WARNING, + _("Your old configuration directory \"%s\" could " + "not be moved to \"%s\" (%s). " + "Please move manually the directory to the new location."), + config_dir_old, + config_dir, + g_strerror(errno)); + } + } + } + + g_free(config_dir_old); + g_free(config_dir); + g_free(config_file_old); + #endif /* Initialising options from config file */ g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e14567: Little cleanup of README
by Frank Lanitz 12 Jun '16

12 Jun '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 12 Jun 2016 17:47:47 UTC Commit: e145679d2ee5a463b79678685da5d0333d9cb541 https://github.com/geany/geany-plugins/commit/e145679d2ee5a463b79678685da5d… Log Message: ----------- Little cleanup of README Modified Paths: -------------- sendmail/README Modified: sendmail/README 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,5 +1,5 @@ SendMail -============= +======== .. contents:: @@ -11,7 +11,7 @@ using the preferred mail client from inside Geany. It is similar to the envelope symbol of most office tools and requires a mail client that is supporting remote calls. -This is not a direct binding to sendmail, even it might could be used for. +This is not a direct binding to sendmail, even if it could be used for. Requirements -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ea088f: Sendmail: Adding short note about what is is not
by Frank Lanitz 12 Jun '16

12 Jun '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 12 Jun 2016 13:19:55 UTC Commit: ea088f299e6741bed977efe30a7a2e338b18bac6 https://github.com/geany/geany-plugins/commit/ea088f299e6741bed977efe30a7a2… Log Message: ----------- Sendmail: Adding short note about what is is not Modified Paths: -------------- sendmail/README Modified: sendmail/README 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -11,6 +11,8 @@ using the preferred mail client from inside Geany. It is similar to the envelope symbol of most office tools and requires a mail client that is supporting remote calls. +This is not a direct binding to sendmail, even it might could be used for. + Requirements ------------ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] de0242: Migrate old configuration dir to new location
by Frank Lanitz 12 Jun '16

12 Jun '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 12 Jun 2016 13:19:55 UTC Commit: de0242529344321f42d8b1ba6660afe2fa066f60 https://github.com/geany/geany-plugins/commit/de0242529344321f42d8b1ba6660a… Log Message: ----------- Migrate old configuration dir to new location Modified Paths: -------------- sendmail/src/sendmail.c Modified: sendmail/src/sendmail.c 62 lines changed, 62 insertions(+), 0 deletions(-) =================================================================== @@ -30,6 +30,9 @@ #include <geanyplugin.h> #include "mail-icon.xpm" +#include <glib.h> +#include <glib/gstdio.h> +#include <errno.h> GeanyPlugin *geany_plugin; GeanyData *geany_data; @@ -116,6 +119,8 @@ send_as_attachment(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer g } config_dir = g_path_get_dirname(config_file); + + if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) { @@ -354,12 +359,69 @@ GtkWidget *plugin_configure(GtkDialog *dialog) void plugin_init(GeanyData G_GNUC_UNUSED *data) { GKeyFile *config = g_key_file_new(); + gchar *config_file_old = NULL; + gchar *config_dir = NULL; + gchar *config_dir_old = NULL; gchar *kb_label = _("Send file by mail"); GtkWidget *menu_mail = NULL; GeanyKeyGroup *key_group; config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, + "sendmail", G_DIR_SEPARATOR_S, "mail.conf", NULL); + + #ifndef G_OS_WIN32 + /* We try only to move if we are on not Windows platform */ + config_file_old = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, + "plugins", G_DIR_SEPARATOR_S, "geanysendmail", G_DIR_SEPARATOR_S, "mail.conf", NULL); + config_dir = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, + "plugins", G_DIR_SEPARATOR_S, "sendmail", NULL); + config_dir_old = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, + "plugins", G_DIR_SEPARATOR_S, "geanysendmail", NULL); + + if (g_file_test(config_file_old, G_FILE_TEST_EXISTS)) + { + if (dialogs_show_question( + _("Renamed plugin detected!\n" + "\n" + "GeanySendMail has been renamed to sendmail -- you surely have " + "already recognised it. \n" + "Geany is able to migrate your old plugin configuration by " + "moving the old configuration file to new location.\n" + "Move now?"))) + { + if (g_rename(config_dir_old, config_dir) == 0) + { + dialogs_show_msgbox(GTK_MESSAGE_INFO, + _("Your configuration directory has been " + "successfully moved from \"%s\" to \"%s\"."), + config_dir_old, config_dir); + } + else + { + /* If there was an error on migrating we need + * to load from original one. + * When saving new configuration it will go to + * new folder so migration should + * be implicit. */ + g_free(config_file); + config_file = g_strdup(config_file_old); + dialogs_show_msgbox( + GTK_MESSAGE_WARNING, + _("Your old configuration directory \"%s\" could " + "not be moved to \"%s\" (%s). " + "Please move manually the directory to the new location."), + config_dir_old, + config_dir, + g_strerror(errno)); + } + } + } + + g_free(config_dir_old); + g_free(config_dir); + g_free(config_file_old); + #endif /* Initialising options from config file */ g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c3cc05: Rename plugin GeanySendMail -> SendMail
by Frank Lanitz 12 Jun '16

12 Jun '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 12 Jun 2016 13:19:55 UTC Commit: c3cc0559026917508120cd5d3de41389d2dd2844 https://github.com/geany/geany-plugins/commit/c3cc0559026917508120cd5d3de41… Log Message: ----------- Rename plugin GeanySendMail -> SendMail Modified Paths: -------------- Makefile.am README build/geany-plugins.nsi build/geanysendmail.m4 build/sendmail.m4 configure.ac geanysendmail/src/Makefile.am po/POTFILES.in sendmail/AUTHORS sendmail/COPYING sendmail/ChangeLog sendmail/Makefile.am sendmail/NEWS sendmail/README sendmail/TODO sendmail/src/Makefile.am sendmail/src/mail-icon.xpm sendmail/src/sendmail.c Modified: Makefile.am 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -91,9 +91,6 @@ if ENABLE_GEANYPY SUBDIRS += geanypy endif -if ENABLE_GEANYSENDMAIL -SUBDIRS += geanysendmail -endif if ENABLE_GEANYVC SUBDIRS += geanyvc @@ -143,6 +140,10 @@ if ENABLE_SCOPE SUBDIRS += scope endif +if ENABLE_SENDMAIL +SUBDIRS += sendmail +endif + if ENABLE_SHIFTCOLUMN SUBDIRS += shiftcolumn endif Modified: README 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -68,7 +68,6 @@ Available plugins are: * ``geanypg`` -- the geanypg plugin * ``geanyprj`` -- the GeanyPrj plugin * ``geanypy`` -- the Geanypy plugin -* ``geanysendmail`` -- the GeanySendmail plugin * ``geanyvc`` -- the GeanyVC plugin * ``geniuspaste`` -- the paste to a pastebin plugin * ``gitchangebar`` -- the GitChangeBar plugin @@ -83,6 +82,7 @@ Available plugins are: * ``pretty_printer`` -- the pretty-printer plugin * ``projectorganizer`` -- the ProjectOrganizer plugin * ``scope`` -- the Scope plugin +* ``sendmail`` -- the GeanySendmail plugin * ``shiftcolumn`` -- the ShiftColumn plugin * ``spellcheck`` -- the spellcheck plugin * ``treebrowser`` -- the Treebrowser plugin Modified: build/geany-plugins.nsi 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -173,6 +173,7 @@ Section Uninstall Delete "$INSTDIR\lib\geany\geanynumberedbookmarks.dll" Delete "$INSTDIR\lib\geany\geanypg.dll" Delete "$INSTDIR\lib\geany\geanyprj.dll" + ; Keep for geanysendmail propper deleting old dll some time Delete "$INSTDIR\lib\geany\geanysendmail.dll" Delete "$INSTDIR\lib\geany\geanyvc.dll" Delete "$INSTDIR\lib\geany\geniuspaste.dll" @@ -185,6 +186,7 @@ Section Uninstall Delete "$INSTDIR\lib\geany\pretty-printer.dll" Delete "$INSTDIR\lib\geany\projectorganizer.dll" Delete "$INSTDIR\lib\geany\scope.dll" + Delete "$INSTDIR\lib\geany\sendmail.dll" Delete "$INSTDIR\lib\geany\shiftcolumn.dll" Delete "$INSTDIR\lib\geany\spellcheck.dll" Delete "$INSTDIR\lib\geany\tableconvert.dll" Modified: build/geanysendmail.m4 9 lines changed, 0 insertions(+), 9 deletions(-) =================================================================== @@ -1,9 +0,0 @@ -AC_DEFUN([GP_CHECK_GEANYSENDMAIL], -[ - GP_ARG_DISABLE([GeanySendmail], [yes]) - GP_COMMIT_PLUGIN_STATUS([GeanySendmail]) - AC_CONFIG_FILES([ - geanysendmail/Makefile - geanysendmail/src/Makefile - ]) -]) Modified: build/sendmail.m4 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,9 @@ +AC_DEFUN([GP_CHECK_SENDMAIL], +[ + GP_ARG_DISABLE([Sendmail], [yes]) + GP_COMMIT_PLUGIN_STATUS([Sendmail]) + AC_CONFIG_FILES([ + sendmail/Makefile + sendmail/src/Makefile + ]) +]) Modified: configure.ac 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -50,7 +50,6 @@ GP_CHECK_GEANYMINISCRIPT GP_CHECK_GEANYNUMBEREDBOOKMARKS GP_CHECK_GEANYPRJ GP_CHECK_GEANYPY -GP_CHECK_GEANYSENDMAIL GP_CHECK_GEANYVC GP_CHECK_GEANYPG GP_CHECK_GENIUSPASTE @@ -64,6 +63,7 @@ GP_CHECK_POHELPER GP_CHECK_PRETTYPRINTER GP_CHECK_PROJECTORGANIZER GP_CHECK_SCOPE +GP_CHECK_SENDMAIL GP_CHECK_SHIFTCOLUMN GP_CHECK_SPELLCHECK GP_CHECK_TREEBROWSER Modified: geanysendmail/src/Makefile.am 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -1,10 +0,0 @@ -include $(top_srcdir)/build/vars.build.mk -plugin = geanysendmail - -geanyplugins_LTLIBRARIES = geanysendmail.la - -geanysendmail_la_SOURCES = geanysendmail.c mail-icon.xpm -geanysendmail_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"GeanySendMail\" -geanysendmail_la_LIBADD = $(COMMONLIBS) - -include $(top_srcdir)/build/cppcheck.mk Modified: po/POTFILES.in 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -200,9 +200,6 @@ geanyprj/src/xproject.c # Geanypy geanypy/src/geanypy-plugin.c -# geanysendmail -geanysendmail/src/geanysendmail.c - # geanyvc geanyvc/src/geanyvc.c geanyvc/src/geanyvc.h @@ -283,6 +280,9 @@ scope/src/utils.c scope/src/views.c scope/src/store/scptreestore.c +# sendmail +sendmail/src/sendmail.c + # Spell Check spellcheck/src/speller.c spellcheck/src/scplugin.c Modified: sendmail/AUTHORS 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: sendmail/COPYING 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: sendmail/ChangeLog 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: sendmail/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ include $(top_srcdir)/build/vars.auxfiles.mk SUBDIRS = src -plugin = geanysendmail +plugin = sendmail Modified: sendmail/NEWS 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: sendmail/README 16 lines changed, 8 insertions(+), 8 deletions(-) =================================================================== @@ -1,12 +1,12 @@ -GeanySendMail +SendMail ============= .. contents:: About ------ -GeanySendMail is a little plugin to send a document as attachment +SendMail is a little plugin to send a document as attachment using the preferred mail client from inside Geany. It is similar to the envelope symbol of most office tools and requires a mail client that is supporting remote calls. @@ -25,7 +25,7 @@ installed from the sources, you should be ready to go. If you used a prepared package e.g. from your distribution you probably need to install an additional package, this might be called geany-dev or geany-devel. Please note that in order to compile and use this plugin, -you need Geany 0.20 or later (Geany Plugin API v199 or higher). +you need Geany 1.26 or later (Geany Plugin API v224 or higher). Furthermore you need, of course, a C compiler and the Make tool. The GNU versions of these tools are recommended. @@ -37,7 +37,7 @@ Installation This version of the plugin is installed with the combined geany-plugins release. Please check README of this package or download stand alone version of plugin from -http://frank.uvena.de/en/Geany/geanysendmail/ +http://frank.uvena.de/en/Geany/SendMail/ Usage @@ -96,9 +96,9 @@ github.com. Get the code by: git clone https://github.com/geany/geany-plugins.git If you want to create a patch, please respect the license of -GeanySendMail (GPLv2 or above) as well as intellectual property of +SendMail (GPLv2 or above) as well as intellectual property of third. Patches that should be included to the default distribution -must be licensed under the same conditions as GeanySendMail by the +must be licensed under the same conditions as SendMail by the copyright owner. @@ -117,7 +117,7 @@ https://github.com/geany/geany-plugins/issues License ------- -GeanySendMail and all its parts is distributed under the terms of the +SendMail and all its parts is distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found in the file COPYING @@ -131,6 +131,6 @@ Bugs, questions, bugs, homepage If you found any bugs or want to provide a patch, please contact Frank Lanitz (frank(at)geany(dot)org). Please also do so, if you got any -questions and visiting http://frank.uvena.de/en/Geany/geanysendmail +questions and visiting http://frank.uvena.de/en/Geany/SendMail didn't help you to figure out the answer. Visiting the website is also a good start if you want to check for any update on this plugin. Modified: sendmail/TODO 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: sendmail/src/Makefile.am 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,10 @@ +include $(top_srcdir)/build/vars.build.mk +plugin = sendmail + +geanyplugins_LTLIBRARIES = sendmail.la + +sendmail_la_SOURCES = sendmail.c mail-icon.xpm +sendmail_la_CPPFLAGS = $(AM_CPPFLAGS) -DG_LOG_DOMAIN=\"SendMail\" +sendmail_la_LIBADD = $(COMMONLIBS) + +include $(top_srcdir)/build/cppcheck.mk Modified: sendmail/src/mail-icon.xpm 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: sendmail/src/sendmail.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -1,7 +1,7 @@ /* - * geanysendmail.c + * sendmail.c * - * Copyright 2007-2015 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2007-2016 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Copyright 2007 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * Copyright 2007, 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * Copyright 2008, 2009 Timothy Boronczyk <tboronczyk(at)gmail(dot)com> @@ -39,7 +39,7 @@ PLUGIN_VERSION_CHECK(224) PLUGIN_SET_TRANSLATABLE_INFO( LOCALEDIR, GETTEXT_PACKAGE, - _("GeanySendMail"), + _("SendMail"), _("Sends the current file as attachment with your favorite mailer"), VERSION, "Frank Lanitz <frank(a)frank.uvena.de>") -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 5a898d: shiftcolumn: Drop use of the most obvious deprecated Geany API
by Colomban Wendling 09 Jun '16

09 Jun '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 20 Feb 2016 19:23:59 UTC Commit: 5a898d9028d09fbfeb46bb4411bb768bf78588f4 https://github.com/geany/geany-plugins/commit/5a898d9028d09fbfeb46bb4411bb7… Log Message: ----------- shiftcolumn: Drop use of the most obvious deprecated Geany API Modified Paths: -------------- shiftcolumn/src/shiftcolumn.c Modified: shiftcolumn/src/shiftcolumn.c 39 lines changed, 12 insertions(+), 27 deletions(-) =================================================================== @@ -60,15 +60,13 @@ enum{ KB_SHIFT_RIGHT, KB_COUNT }; -PLUGIN_KEY_GROUP(shiftcolumn, KB_COUNT) static void shift_left_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer gdata){ gchar *txt; gchar *txt_i; gchar char_before; - gint txt_len; gint startpos; gint endpos; @@ -113,15 +111,12 @@ static void shift_left_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, if(startline == endline){ /* get the text in question */ - txt_len = endpos - startpos; - txt_i = g_malloc(txt_len + 1); - txt = g_malloc(txt_len + 2); - sci_get_selected_text(sci, txt_i); + txt_i = sci_get_selection_contents(sci); char_before = sci_get_char_at(sci, startpos - 1); /* set up new text buf */ - (void) g_sprintf(txt, "%s%c", txt_i, char_before); + txt = g_strdup_printf("%s%c", txt_i, char_before); /* start undo */ sci_start_undo_action(sci); @@ -182,15 +177,11 @@ static void shift_left_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, sci_set_selection_start(sci, linepos + startcol); sci_set_selection_end(sci, linepos + endcol); - txt_len = sci_get_selected_text_length(sci); - txt_i = g_malloc(txt_len + 1); - txt = g_malloc(txt_len + 2); - - sci_get_selected_text(sci, txt_i); + txt_i = sci_get_selection_contents(sci); char_before = sci_get_char_at(sci, linepos + startcol - 1); /* set up new text buf */ - (void) g_sprintf(txt, "%s%c", txt_i, char_before); + txt = g_strdup_printf("%s%c", txt_i, char_before); /* put the new text in */ sci_set_selection_start(sci, linepos + startcol - 1); @@ -219,7 +210,6 @@ static void shift_right_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, gchar *txt; gchar *txt_i; gchar char_after; - gint txt_len; gint startpos; gint endpos; @@ -260,15 +250,12 @@ static void shift_right_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, if(startline == endline){ /* get the text in question */ - txt_len = endpos - startpos; - txt_i = g_malloc(txt_len + 1); - txt = g_malloc(txt_len + 2); - sci_get_selected_text(sci, txt_i); + txt_i = sci_get_selection_contents(sci); char_after = sci_get_char_at(sci, endpos); /* set up new text buf */ - (void) g_sprintf(txt, "%c%s", char_after, txt_i); + txt = g_strdup_printf("%c%s", char_after, txt_i); /* start undo */ sci_start_undo_action(sci); @@ -319,15 +306,11 @@ static void shift_right_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, sci_set_selection_start(sci, linepos + startcol); sci_set_selection_end(sci, linepos + endcol); - txt_len = sci_get_selected_text_length(sci); - txt_i = g_malloc(txt_len + 1); - txt = g_malloc(txt_len + 2); - - sci_get_selected_text(sci, txt_i); + txt_i = sci_get_selection_contents(sci); char_after = sci_get_char_at(sci, linepos + endcol); /* set up new text buf */ - (void) g_sprintf(txt, "%c%s", char_after, txt_i); + txt = g_strdup_printf("%c%s", char_after, txt_i); /* put the new text in */ sci_set_selection_end(sci, linepos + endcol + 1); @@ -373,6 +356,7 @@ static void kb_shift_right(G_GNUC_UNUSED guint key_id){ } void plugin_init(G_GNUC_UNUSED GeanyData *data){ + GeanyKeyGroup *key_group; /* init gettext and friends */ main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); @@ -396,9 +380,10 @@ void plugin_init(G_GNUC_UNUSED GeanyData *data){ ui_add_document_sensitive(menu_item_shift_left); /* setup keybindings */ - keybindings_set_item(plugin_key_group, KB_SHIFT_LEFT, kb_shift_left, + key_group = plugin_set_key_group(geany_plugin, "shiftcolumn", KB_COUNT, NULL); + keybindings_set_item(key_group, KB_SHIFT_LEFT, kb_shift_left, 0, GDK_CONTROL_MASK, "shift_left", _("Shift Left"), menu_item_shift_left); - keybindings_set_item(plugin_key_group, KB_SHIFT_RIGHT, kb_shift_right, + keybindings_set_item(key_group, KB_SHIFT_RIGHT, kb_shift_right, 0, GDK_CONTROL_MASK, "shift_right", _("Shift Right"), menu_item_shift_right); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] dc0af5: shiftcolumn: Fix shifting when the selection was created backwards
by Colomban Wendling 09 Jun '16

09 Jun '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 20 Feb 2016 20:50:00 UTC Commit: dc0af51b96d4b98ada550d464b0cd17b24268419 https://github.com/geany/geany-plugins/commit/dc0af51b96d4b98ada550d464b0cd… Log Message: ----------- shiftcolumn: Fix shifting when the selection was created backwards Modified Paths: -------------- shiftcolumn/src/shiftcolumn.c Modified: shiftcolumn/src/shiftcolumn.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -123,6 +123,7 @@ static void shift_left_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, /* put the new text in */ sci_set_selection_start(sci, startpos - 1); + sci_set_selection_end(sci, endpos); sci_replace_sel(sci, txt); /* select the right bit again */ @@ -261,6 +262,7 @@ static void shift_right_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, sci_start_undo_action(sci); /* put the new text in */ + sci_set_selection_start(sci, startpos); sci_set_selection_end(sci, endpos + 1); sci_replace_sel(sci, txt); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f66df0: Merge pull request #366 from b4n/shiftcolumn/less-deprecated
by Jiří Techet 09 Jun '16

09 Jun '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Thu, 09 Jun 2016 13:22:18 UTC Commit: f66df036048fb76f0dc2305ef0c6ce32b1f5ba28 https://github.com/geany/geany-plugins/commit/f66df036048fb76f0dc2305ef0c6c… Log Message: ----------- Merge pull request #366 from b4n/shiftcolumn/less-deprecated Shiftcolumn: Geany deprecation fixes + a simple fix Modified Paths: -------------- shiftcolumn/src/shiftcolumn.c Modified: shiftcolumn/src/shiftcolumn.c 41 lines changed, 14 insertions(+), 27 deletions(-) =================================================================== @@ -52,15 +52,13 @@ enum{ KB_SHIFT_RIGHT, KB_COUNT }; -PLUGIN_KEY_GROUP(shiftcolumn, KB_COUNT) static void shift_left_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer gdata){ gchar *txt; gchar *txt_i; gchar char_before; - gint txt_len; gint startpos; gint endpos; @@ -105,21 +103,19 @@ static void shift_left_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, if(startline == endline){ /* get the text in question */ - txt_len = endpos - startpos; - txt_i = g_malloc(txt_len + 1); - txt = g_malloc(txt_len + 2); - sci_get_selected_text(sci, txt_i); + txt_i = sci_get_selection_contents(sci); char_before = sci_get_char_at(sci, startpos - 1); /* set up new text buf */ - (void) g_sprintf(txt, "%s%c", txt_i, char_before); + txt = g_strdup_printf("%s%c", txt_i, char_before); /* start undo */ sci_start_undo_action(sci); /* put the new text in */ sci_set_selection_start(sci, startpos - 1); + sci_set_selection_end(sci, endpos); sci_replace_sel(sci, txt); /* select the right bit again */ @@ -174,15 +170,11 @@ static void shift_left_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, sci_set_selection_start(sci, linepos + startcol); sci_set_selection_end(sci, linepos + endcol); - txt_len = sci_get_selected_text_length(sci); - txt_i = g_malloc(txt_len + 1); - txt = g_malloc(txt_len + 2); - - sci_get_selected_text(sci, txt_i); + txt_i = sci_get_selection_contents(sci); char_before = sci_get_char_at(sci, linepos + startcol - 1); /* set up new text buf */ - (void) g_sprintf(txt, "%s%c", txt_i, char_before); + txt = g_strdup_printf("%s%c", txt_i, char_before); /* put the new text in */ sci_set_selection_start(sci, linepos + startcol - 1); @@ -211,7 +203,6 @@ static void shift_right_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, gchar *txt; gchar *txt_i; gchar char_after; - gint txt_len; gint startpos; gint endpos; @@ -252,20 +243,18 @@ static void shift_right_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, if(startline == endline){ /* get the text in question */ - txt_len = endpos - startpos; - txt_i = g_malloc(txt_len + 1); - txt = g_malloc(txt_len + 2); - sci_get_selected_text(sci, txt_i); + txt_i = sci_get_selection_contents(sci); char_after = sci_get_char_at(sci, endpos); /* set up new text buf */ - (void) g_sprintf(txt, "%c%s", char_after, txt_i); + txt = g_strdup_printf("%c%s", char_after, txt_i); /* start undo */ sci_start_undo_action(sci); /* put the new text in */ + sci_set_selection_start(sci, startpos); sci_set_selection_end(sci, endpos + 1); sci_replace_sel(sci, txt); @@ -311,15 +300,11 @@ static void shift_right_cb(G_GNUC_UNUSED GtkMenuItem *menuitem, sci_set_selection_start(sci, linepos + startcol); sci_set_selection_end(sci, linepos + endcol); - txt_len = sci_get_selected_text_length(sci); - txt_i = g_malloc(txt_len + 1); - txt = g_malloc(txt_len + 2); - - sci_get_selected_text(sci, txt_i); + txt_i = sci_get_selection_contents(sci); char_after = sci_get_char_at(sci, linepos + endcol); /* set up new text buf */ - (void) g_sprintf(txt, "%c%s", char_after, txt_i); + txt = g_strdup_printf("%c%s", char_after, txt_i); /* put the new text in */ sci_set_selection_end(sci, linepos + endcol + 1); @@ -365,6 +350,7 @@ static void kb_shift_right(G_GNUC_UNUSED guint key_id){ } void plugin_init(G_GNUC_UNUSED GeanyData *data){ + GeanyKeyGroup *key_group; menu_item_shift_left = gtk_menu_item_new_with_mnemonic(_("Shift Left")); gtk_widget_show(menu_item_shift_left); @@ -385,9 +371,10 @@ void plugin_init(G_GNUC_UNUSED GeanyData *data){ ui_add_document_sensitive(menu_item_shift_left); /* setup keybindings */ - keybindings_set_item(plugin_key_group, KB_SHIFT_LEFT, kb_shift_left, + key_group = plugin_set_key_group(geany_plugin, "shiftcolumn", KB_COUNT, NULL); + keybindings_set_item(key_group, KB_SHIFT_LEFT, kb_shift_left, 0, GDK_CONTROL_MASK, "shift_left", _("Shift Left"), menu_item_shift_left); - keybindings_set_item(plugin_key_group, KB_SHIFT_RIGHT, kb_shift_right, + keybindings_set_item(key_group, KB_SHIFT_RIGHT, kb_shift_right, 0, GDK_CONTROL_MASK, "shift_right", _("Shift Right"), menu_item_shift_right); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits June 2016