aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/ephy-dbus.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6582b3c69..1a8599d4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-01-28 Christian Persch <chpe@svn.gnome.org>
+ * src/ephy-dbus.c: (ephy_dbus_connect_to_session_bus):
+
+ Fix error condition check.
+
+2007-01-28 Christian Persch <chpe@svn.gnome.org>
+
* data/mime-types-permissions.xml:
Add more mime types.
diff --git a/src/ephy-dbus.c b/src/ephy-dbus.c
index c365d02d1..9299bb2dd 100644
--- a/src/ephy-dbus.c
+++ b/src/ephy-dbus.c
@@ -245,7 +245,7 @@ ephy_dbus_connect_to_session_bus (EphyDbus *ephy_dbus,
priv->session_bus = dbus_g_bus_get (DBUS_BUS_SESSION, error);
if (priv->session_bus == NULL)
{
- g_warning("Unable to connect to session bus: %s", error ? (*error)->message : "");
+ g_warning("Unable to connect to session bus: %s", error && *error ? (*error)->message : "");
return FALSE;
}