[evolution/wip-webkit2] EMailDisplay - Subscribe to DBus signal only when the GDBusProxy is avaliable

[Tomas Popela <tpopela src gnome org>]

commit 0949505e311cb6a75b204803982f971d50d7c778
Author: Tomas Popela <tpopela redhat com>
Date:   Tue Jan 14 14:57:30 2014 +0100

    EMailDisplay - Subscribe to DBus signal only when the GDBusProxy is avaliable

 mail/e-mail-display.c |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 9b2fc61..32113ff 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -795,22 +795,23 @@ setup_dom_bindings (WebKitWebView *web_view,
 
        web_extension = e_web_view_get_web_extension_proxy (E_WEB_VIEW (web_view));
 
-       if (display->priv->web_extension_headers_collapsed_signal_id == 0) {
-               display->priv->web_extension_headers_collapsed_signal_id =
-                       g_dbus_connection_signal_subscribe (
-                               g_dbus_proxy_get_connection (web_extension),
-                               g_dbus_proxy_get_name (web_extension),
-                               EVOLUTION_WEB_EXTENSION_INTERFACE,
-                               "RecurToggled",
-                               EVOLUTION_WEB_EXTENSION_OBJECT_PATH,
-                               NULL,
-                               G_DBUS_SIGNAL_FLAGS_NONE,
-                               (GDBusSignalCallback) headers_collapsed_signal_cb,
-                               display,
-                               NULL);
-       }
 
        if (web_extension) {
+               if (display->priv->web_extension_headers_collapsed_signal_id == 0) {
+                       display->priv->web_extension_headers_collapsed_signal_id =
+                               g_dbus_connection_signal_subscribe (
+                                       g_dbus_proxy_get_connection (web_extension),
+                                       g_dbus_proxy_get_name (web_extension),
+                                       EVOLUTION_WEB_EXTENSION_INTERFACE,
+                                       "RecurToggled",
+                                       EVOLUTION_WEB_EXTENSION_OBJECT_PATH,
+                                       NULL,
+                                       G_DBUS_SIGNAL_FLAGS_NONE,
+                                       (GDBusSignalCallback) headers_collapsed_signal_cb,
+                                       display,
+                                       NULL);
+               }
+
                g_dbus_proxy_call (
                        web_extension,
                        "EMailDisplayBindDOM",