diff options
| author | Ted Gould <ted@gould.cx> | 2010-08-25 13:19:05 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-08-25 13:19:05 -0500 |
| commit | 3bd4b8dce9460159945a9cc24f0bc8aba7e62898 (patch) | |
| tree | d94605af07736d1eb037a64c106c2705db319634 /libdbusmenu-glib/client.c | |
| parent | ced95a80cc2cf2664c171879069b5c9753379dd9 (diff) | |
| parent | 15501ea22301d17dc7d193f1ece226ee657e59c3 (diff) | |
| download | libdbusmenu-3bd4b8dce9460159945a9cc24f0bc8aba7e62898.tar.gz libdbusmenu-3bd4b8dce9460159945a9cc24f0bc8aba7e62898.tar.bz2 libdbusmenu-3bd4b8dce9460159945a9cc24f0bc8aba7e62898.zip | |
Sync to trunk
Diffstat (limited to 'libdbusmenu-glib/client.c')
| -rw-r--r-- | libdbusmenu-glib/client.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index cc91b32..d88478c 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -605,6 +605,8 @@ get_properties_globber (DbusmenuClient * client, gint id, const gchar ** propert static void item_activated (DBusGProxy * proxy, gint id, guint timestamp, DbusmenuClient * client) { + g_return_if_fail(DBUSMENU_IS_CLIENT(client)); + DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); if (priv->root == NULL) { @@ -1270,7 +1272,8 @@ parse_layout (DbusmenuClient * client, const gchar * layout) xmlDocPtr xmldoc; - xmldoc = xmlReadMemory(layout, g_utf8_strlen(layout, 16*1024), "dbusmenu.xml", NULL, 0); + /* No one should need more characters than this! */ + xmldoc = xmlReadMemory(layout, g_utf8_strlen(layout, 1024*1024), "dbusmenu.xml", NULL, 0); xmlNodePtr root = xmlDocGetRootElement(xmldoc); |