[geany/geany-plugins] 375449: Merge pull request #710 from LarsGit223/wb-issue709

[Frank Lanitz]

Branch:      refs/heads/master
Author:      Frank Lanitz <frank at frank.uvena.de>
Committer:   GitHub <noreply at github.com>
Date:        Sun, 04 Mar 2018 10:54:01 UTC
Commit:      37544948c7600a34d0d3b0ed4a2066d22b15ef18
             https://github.com/geany/geany-plugins/commit/37544948c7600a34d0d3b0ed4a2066d22b15ef18

Log Message:
-----------
Merge pull request #710 from LarsGit223/wb-issue709

workbench: import base path on "Add project..."


Modified Paths:
--------------
    workbench/src/wb_project.c
    workbench/src/wb_project.h
    workbench/src/workbench.c

Modified: workbench/src/wb_project.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1562,7 +1562,7 @@ gboolean wb_project_save(WB_PROJECT *prj, GError **error)
  * @return TRUE on success, FALSE otherwise
  *
  **/
-gboolean wb_project_load(WB_PROJECT *prj, gchar *filename, GError **error)
+gboolean wb_project_load(WB_PROJECT *prj, const gchar *filename, GError **error)
 {
 	GKeyFile *kf;
 	guint	 index;


Modified: workbench/src/wb_project.h
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -71,7 +71,7 @@ gchar *wb_project_get_bookmark_at_index (WB_PROJECT *prj, guint index);
 guint wb_project_get_bookmarks_count(WB_PROJECT *prj);
 
 gboolean wb_project_save(WB_PROJECT *prj, GError **error);
-gboolean wb_project_load(WB_PROJECT *prj, gchar *filename, GError **error);
+gboolean wb_project_load(WB_PROJECT *prj, const gchar *filename, GError **error);
 
 gchar *wb_project_get_info (WB_PROJECT *prj);
 


Modified: workbench/src/workbench.c
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -457,6 +457,9 @@ gboolean workbench_add_project(WORKBENCH *wb, const gchar *filename)
 		}
 		g_ptr_array_add (wb->projects, entry);
 
+		/* Load project to import base path. */
+		wb_project_load(project, filename, NULL);
+
 		wb->modified = TRUE;
 		return TRUE;
 	}



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