summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@igalia.com>2016-03-05 13:05:00 -0600
committerMichael Catanzaro <mcatanzaro@igalia.com>2016-03-06 14:11:25 -0600
commitfff5e08b204896fbeca5773137226e841cd50800 (patch)
tree6b46a56876f74b2e4759df0bfbb9c408d8834f66
parent98cfd68cbb244c7720e0637aef96fb24c3be0de2 (diff)
downloadepiphany-fff5e08b204896fbeca5773137226e841cd50800.tar.gz
Improve some FIXMEs
* Let's not rename downloaded files * g_application_get_application_id is a thing https://bugzilla.gnome.org/show_bug.cgi?id=610586
-rw-r--r--embed/ephy-embed-shell.c6
-rw-r--r--lib/ephy-file-helpers.c1
2 files changed, 3 insertions, 4 deletions
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index f83f851ed..5777cc94c 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -1141,9 +1141,9 @@ ephy_embed_shell_launch_handler (EphyEmbedShell *shell,
/* Do not allow recursive calls into the browser, they can lead to
* infinite loops and they should never happen anyway. */
- /* FIXME: eventually there should be a nice and safe way of getting
- * the app ID from the GApplication itself, but for now let's
- * hardcode the .desktop file name and use it here. */
+ /* FIXME: Should use g_application_get_application_id() here instead of
+ * hardcoding epiphany.desktop. But first, we have to rename the desktop file.
+ */
if (!app || g_strcmp0 (g_app_info_get_id (app), "epiphany.desktop") == 0)
return ret;
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index 1c828cf1c..69de1345f 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -788,7 +788,6 @@ ephy_file_launcher_get_app_info_for_file (GFile *file,
if (type != NULL && type[0] != '\0' &&
ephy_file_check_mime (type) == EPHY_MIME_PERMISSION_SAFE)
{
- /* FIXME rename tmp file to right extension ? */
app = g_app_info_get_default_for_type (type, FALSE);
}
g_free (type);