[geany/geany-plugins] 9abd91: A few improvements as suggested by review of PR

[Frank Lanitz]

Branch:      refs/heads/master
Author:      Frank Lanitz <frank at frank.uvena.de>
Committer:   Frank Lanitz <frank at frank.uvena.de>
Date:        Wed, 10 Aug 2016 20:31:31 UTC
Commit:      9abd912b7f9c40cebb8b5a6a00d0be27645e1936
             https://github.com/geany/geany-plugins/commit/9abd912b7f9c40cebb8b5a6a00d0be27645e1936

Log Message:
-----------
A few improvements as suggested by review of PR


Modified Paths:
--------------
    MAINTAINERS
    NEWS
    README
    build/lipsum.m4
    configure.ac
    lipsum/README
    lipsum/src/lipsum.c

Modified: MAINTAINERS
11 lines changed, 6 insertions(+), 5 deletions(-)
===================================================================
@@ -95,11 +95,6 @@ M: Frank Lanitz <frank at frank.uvena.de>
 W: http://frank.uvena.de/en/Geany/geanylatex/
 S: Maintained
 
-geanylipsum
-P: Frank Lanitz <frank at frank.uvena.de>
-M: Frank Lanitz <frank at frank.uvena.de>
-W: http://plugins.geany.org/geanylipsum.html
-S: Maintained
 
 geanylua
 P:
@@ -173,6 +168,12 @@ M: Sylvan Mostert <smostert.dev at gmail.com>
 W:
 S: Maintained
 
+lipsum
+P: Frank Lanitz <frank at frank.uvena.de>
+M: Frank Lanitz <frank at frank.uvena.de>
+W: http://plugins.geany.org/lipsum.html
+S: Maintained
+
 markdown
 P: Matthew Brush <matt at geany.org>
 M: Matthew Brush <matt at geany.org>


Modified: NEWS
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -1,6 +1,7 @@
 Geany Plugins 1.29 (not yet released)
 
-    No changes by now.
+    General:
+    * Rename plugin GeanyLipsum to Lipsum (PR#472)
 
 
 Geany Plugins 1.28 (2016-07-10)


Modified: README
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -60,7 +60,6 @@ Available plugins are:
 * ``geanygendoc`` -- the GeanyGenDoc plugin
 * ``geanyinsertnum`` -- the GeanyInsertNum plugin
 * ``geanylatex`` -- the GeanyLaTeX plugin
-* ``geanylipsum`` -- the GeanyLipsum plugin
 * ``geanylua`` -- the GeanyLua plugin
 * ``geanymacro`` -- the GeanyMacro plugin
 * ``geanyminiscript`` -- the GeanyMiniScript plugin
@@ -73,6 +72,7 @@ Available plugins are:
 * ``gitchangebar`` -- the GitChangeBar plugin
 * ``gtkspell`` -- GeanyVC's spell-check support
 * ``lineoperations`` -- simple line functions that can be applied to an open file
+* ``lipsum`` -- the Lipsum plugin
 * ``markdown`` -- the Markdown plugin
 * ``multiterm`` -- the multiterm plugin
 * ``overview``-- the overview plugin


Modified: build/lipsum.m4
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
-AC_DEFUN([GP_CHECK_GEANYLIPSUM],
+AC_DEFUN([GP_CHECK_LIPSUM],
 [
     GP_ARG_DISABLE([Lipsum], [auto])
     GP_COMMIT_PLUGIN_STATUS([Lipsum])


Modified: configure.ac
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -43,7 +43,6 @@ GP_CHECK_GEANYEXTRASEL
 GP_CHECK_GEANYGENDOC
 GP_CHECK_GEANYINSERTNUM
 GP_CHECK_GEANYLATEX
-GP_CHECK_GEANYLIPSUM
 GP_CHECK_GEANYLUA
 GP_CHECK_GEANYMACRO
 GP_CHECK_GEANYMINISCRIPT
@@ -55,6 +54,7 @@ GP_CHECK_GEANYPG
 GP_CHECK_GENIUSPASTE
 GP_CHECK_GITCHANGEBAR
 GP_CHECK_LINEOPERATIONS
+GP_CHECK_LIPSUM
 GP_CHECK_MARKDOWN
 GP_CHECK_MULTITERM
 GP_CHECK_OVERVIEW


Modified: lipsum/README
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,5 +1,5 @@
 Lipsum
------------
+------
 
 .. contents::
 


Modified: lipsum/src/lipsum.c
18 lines changed, 9 insertions(+), 9 deletions(-)
===================================================================
@@ -160,22 +160,22 @@ plugin_init(G_GNUC_UNUSED GeanyData *data)
 
 	#ifndef G_OS_WIN32
 	/* We try only to move if we are on not Windows platform */
-	config_dir_old = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S,
-		"plugins", G_DIR_SEPARATOR_S, "geanylipsum", NULL);
-	config_file_old = g_strconcat(config_dir_old,  G_DIR_SEPARATOR_S,
+	config_dir_old = g_build_filename(geany->app->configdir,
+		"plugins", "geanylipsum", NULL);
+	config_file_old = g_build_filename(config_dir_old,
 		"lipsum.conf", NULL);
-	config_dir = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S,
-		"plugins", G_DIR_SEPARATOR_S, "lipsum", NULL);
+	config_dir = g_build_filename(geany->app->configdir,
+		"plugins", "lipsum", NULL);
 	if (g_file_test(config_file_old, G_FILE_TEST_EXISTS))
 	{
 		if (dialogs_show_question(
 			_("Renamed plugin detected!\n"
 			  "\n"
-			  "GeanyLipsum has been renamed to Lipsum -- you surely have "
-			  "already recognised it. \n"
+			  "As you may have already noticed, GeanyLipsum has been "
+			  "renamed to just Lipsum. \n"
 			  "Geany is able to migrate your old plugin configuration by "
 			  "moving the old configuration file to new location.\n"
-			  "Attention: this will not include your keybindings.\n"
+			  "Warning: This will not include your keybindings.\n"
 			  "Move now?")))
 		{
 			if (g_rename(config_dir_old, config_dir) == 0)
@@ -198,7 +198,7 @@ plugin_init(G_GNUC_UNUSED GeanyData *data)
 					GTK_MESSAGE_WARNING,
 					_("Your old configuration directory \"%s\" could "
 					  "not be moved to \"%s\" (%s). "
-					  "Please move manually the directory to the new location."),
+					  "Please manually move the directory to the new location."),
 					config_dir_old,
 					config_dir,
 					g_strerror(errno));



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).