[epiphany/mwleeds/webapp-dbus-api: 5/17] profile-migrator: Minor fixes
- From: Phaedrus Leeds <mwleeds src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/mwleeds/webapp-dbus-api: 5/17] profile-migrator: Minor fixes
- Date: Tue, 15 Mar 2022 22:06:44 +0000 (UTC)
commit 063e02caddef2348cfb2be9013bf4242dadf69a5
Author: Phaedrus Leeds <mwleeds protonmail com>
Date: Mon Jan 24 17:50:11 2022 -0800
profile-migrator: Minor fixes
src/profile-migrator/ephy-profile-migrator.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/profile-migrator/ephy-profile-migrator.c b/src/profile-migrator/ephy-profile-migrator.c
index fcec8eb5b..9e5f54dfd 100644
--- a/src/profile-migrator/ephy-profile-migrator.c
+++ b/src/profile-migrator/ephy-profile-migrator.c
@@ -1199,7 +1199,7 @@ migrate_profile_directories (void)
g_key_file_set_string (file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_EXEC, new_exec);
icon = g_key_file_get_string (file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_ICON, &error);
- if (exec == NULL) {
+ if (icon == NULL) {
g_warning ("Failed to get Icon key from %s: %s", desktop_file_path, error->message);
continue;
}
@@ -1333,7 +1333,7 @@ migrate_webapp_names (void)
old_desktop_path_name = g_strconcat (parent_directory_path, G_DIR_SEPARATOR_S, name, NULL);
new_desktop_path_name = g_strconcat (parent_directory_path, G_DIR_SEPARATOR_S, new_name, NULL);
if (g_rename (old_desktop_path_name, new_desktop_path_name) == -1) {
- g_warning ("Cannot rename web application directroy from '%s' to '%s'", old_desktop_path_name,
new_desktop_path_name);
+ g_warning ("Cannot rename web application directory from '%s' to '%s'", old_desktop_path_name,
new_desktop_path_name);
goto next;
}
@@ -1402,6 +1402,7 @@ migrate_webapp_names (void)
}
/* Create new symlink */
+ g_free (app_desktop_file_name);
app_desktop_file_name = g_strconcat (g_get_user_data_dir (), G_DIR_SEPARATOR_S, "applications",
G_DIR_SEPARATOR_S, new_name, ".desktop", NULL);
app_link_file = g_file_new_for_path (app_desktop_file_name);
@@ -1413,6 +1414,7 @@ migrate_webapp_names (void)
}
next:
+ g_clear_error (&error);
info = g_file_enumerator_next_file (children, NULL, &error);
if (!info && error) {
g_warning ("Cannot enumerate next file: %s", error->message);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]