Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: lashd/server.c
- ===================================================================
- --- lashd/server.c (revision 150)
- +++ lashd/server.c (working copy)
- @@ -41,7 +41,6 @@
- void server_create_loader(server_t * server);
- void server_set_loader(server_t * server, loader_t * loader);
- void server_set_ui_project(server_t * server, const char *project);
- -void server_set_default_dir(server_t * server, const char *default_dir);
- server_t *
- server_new(const char *default_dir)
- @@ -52,7 +51,7 @@
- pthread_mutex_init(&server->server_events_lock, NULL);
- pthread_cond_init(&server->server_event_cond, NULL);
- - server->default_dir = lash_strdup(default_dir);
- + server->project_dir = lash_strdup(lash_get_fqn(getenv("HOME"), default_dir));
- server_create_loader(server);
- @@ -119,7 +118,7 @@
- signal(SIGCHLD, SIG_IGN);
- loader_destroy(server->loader);
- - free(server->default_dir);
- + free(server->project_dir);
- free(server);
- lash_debug("server destroyed");
- @@ -161,9 +160,9 @@
- }
- const char *
- -server_get_default_dir(server_t * server)
- +server_get_project_dir(server_t * server)
- {
- - return server->default_dir;
- + return server->project_dir;
- }
- int
- @@ -366,9 +365,7 @@
- do {
- sprintf(new_name, "project-%d", num);
- - new_dir = lash_get_fqn(lash_get_fqn(getenv("HOME"),
- - server->default_dir),
- - new_name);
- + new_dir = lash_get_fqn(server->project_dir, new_name);
- num++;
- lash_debug("Trying project name %s, dir %s",
- new_name, new_dir);
- @@ -398,9 +395,7 @@
- lash_debug("The new project's name is %s", project->name);
- project_set_directory(project,
- - lash_get_fqn(lash_get_fqn(getenv("HOME"),
- - server->default_dir),
- - project->name));
- + lash_get_fqn(server->project_dir, project->name));
- lash_create_dir(project->directory);
- Index: lashd/server.h
- ===================================================================
- --- lashd/server.h (revision 150)
- +++ lashd/server.h (working copy)
- @@ -52,7 +52,7 @@
- loader_t * loader;
- int loader_quit;
- - char * default_dir;
- + char * project_dir;
- lash_list_t * projects;
- lash_list_t * interfaces;
- @@ -82,4 +82,7 @@
- void server_send_event (server_t * server, server_event_t * server_event);
- +const char *
- +server_get_project_dir(server_t * server);
- +
- #endif /* __LASHD_SERVER_H__ */
Add Comment
Please, Sign In to add comment