summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@igalia.com>2015-02-11 16:37:16 -0600
committerMichael Catanzaro <mcatanzaro@igalia.com>2015-02-12 12:37:26 -0600
commit7fd59fa5909e6fb5b87e9d216cbd0cb94ddecf61 (patch)
treefb9cf410ce4de69a23fab810339d3af8a245eac6
parent9103afa253010837ec95b83f66ac8e2deb06efc9 (diff)
downloadepiphany-7fd59fa5909e6fb5b87e9d216cbd0cb94ddecf61.tar.gz
Fix crash when we can't connect to the session bus
This GError is never initialized. g_application_get_dbus_connection() does not take a GError. https://bugzilla.gnome.org/show_bug.cgi?id=744360
-rw-r--r--embed/ephy-embed-shell.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 360bffdd7..e5f447a72 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -525,12 +525,9 @@ initialize_web_extensions (WebKitWebContext* web_context,
static void
ephy_embed_shell_setup_web_extensions_connection (EphyEmbedShell *shell)
{
- GError *error = NULL;
-
shell->priv->bus = g_application_get_dbus_connection (G_APPLICATION (shell));
if (!shell->priv->bus) {
- g_warning ("Application not connected to session bus: %s\n", error->message);
- g_error_free (error);
+ g_warning ("Application not connected to session bus");
return;
}