diff options
| author | Ted Gould <ted@gould.cx> | 2010-07-08 10:20:16 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-07-08 10:20:16 -0500 |
| commit | 0828cb88a4db832ddfcf0350305bebf116c1a240 (patch) | |
| tree | 7ccf22d87004a15db6adb2415f8eb339782c375a /libdbusmenu-glib | |
| parent | a79f1b295ca5a6a0f20cc899db9043a46aff22e9 (diff) | |
| parent | 2e974ea0fa59265a0ec4cce29cbb62519ce872cb (diff) | |
| download | libdbusmenu-0828cb88a4db832ddfcf0350305bebf116c1a240.tar.gz libdbusmenu-0828cb88a4db832ddfcf0350305bebf116c1a240.tar.bz2 libdbusmenu-0828cb88a4db832ddfcf0350305bebf116c1a240.zip | |
Import upstream version 0.3.5
Diffstat (limited to 'libdbusmenu-glib')
| -rw-r--r-- | libdbusmenu-glib/client.c | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/server.c | 15 |
2 files changed, 18 insertions, 4 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index fa233a4..871170a 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -561,6 +561,9 @@ build_proxies (DbusmenuClient * client) static gint parse_node_get_id (xmlNodePtr node) { + if (node == NULL) { + return -1; + } if (node->type != XML_ELEMENT_NODE) { return -1; } @@ -886,6 +889,10 @@ parse_layout (DbusmenuClient * client, const gchar * layout) xmlNodePtr root = xmlDocGetRootElement(xmldoc); + if (root == NULL) { + g_warning("Unable to get root node of menu XML"); + } + DbusmenuMenuitem * oldroot = priv->root; priv->root = parse_layout_xml(client, root, priv->root, NULL, priv->menuproxy); diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index 0da66cc..13c2843 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -225,15 +225,22 @@ static void set_property (GObject * obj, guint id, const GValue * value, GParamSpec * pspec) { DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(obj); + GError * error = NULL; switch (id) { case PROP_DBUS_OBJECT: g_return_if_fail(priv->dbusobject == NULL); priv->dbusobject = g_value_dup_string(value); - DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); - dbus_g_connection_register_g_object(connection, - priv->dbusobject, - obj); + DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error); + + if (connection == NULL || error != NULL) { + g_warning("Unable to get session bus: %s", error == NULL ? "No message" : error->message); + if (error != NULL) { g_error_free(error); } + } else { + dbus_g_connection_register_g_object(connection, + priv->dbusobject, + obj); + } break; case PROP_ROOT_NODE: if (priv->root != NULL) { |