Mercurial > geeqie

diff src/main.c @ 702:e07895754e65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Drop concat_dir_and_file() and use g_build_filename() instead.
author zas_
date Tue, 20 May 2008 22:09:04 +0000
parents a3218946bd2d
children 0f177c151368
line wrap: on
line diff
--- a/src/main.c	Tue May 20 22:00:14 2008 +0000
+++ b/src/main.c	Tue May 20 22:09:04 2008 +0000
@@ -295,7 +295,7 @@
 		while (i < argc)
 			{
 			const gchar *cmd_line = argv[i];
-			gchar *cmd_all = concat_dir_and_file(base_dir, cmd_line);
+			gchar *cmd_all = g_build_filename(base_dir, cmd_line, NULL);
 
 			if (cmd_line[0] == '/' && isdir(cmd_line))
 				{
@@ -560,15 +560,15 @@
 	editor_reset_defaults();
 
 	bookmark_add_default(_("Home"), homedir());
-	path = concat_dir_and_file(homedir(), "Desktop");
+	path = g_build_filename(homedir(), "Desktop", NULL);
 	bookmark_add_default(_("Desktop"), path);
 	g_free(path);
-	path = concat_dir_and_file(homedir(), GQ_RC_DIR_COLLECTIONS);
+	path = g_build_filename(homedir(), GQ_RC_DIR_COLLECTIONS, NULL);
 	bookmark_add_default(_("Collections"), path);
 	g_free(path);
 
 	g_free(options->file_ops.safe_delete_path);
-	options->file_ops.safe_delete_path = concat_dir_and_file(homedir(), GQ_RC_DIR_TRASH);
+	options->file_ops.safe_delete_path = g_build_filename(homedir(), GQ_RC_DIR_TRASH, NULL);
 
 	for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
 		{