Mercurial > pidgin.yaz
changeset 26949:4f36ec04181c
merge of '2b7afd5f3a168b013e5d3cd69999ffb6e0ee95a6'
and '2c9a1153bc1694e9656752a73526bd6b7461265b'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Mon, 11 May 2009 01:37:56 +0000 |
| parents | 0402ec1872dc (diff) ccc217362818 (current diff) |
| children | 329f5a43b68a e0bcdc2bad7d |
| files | |
| diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/dbus-analyze-functions.py Mon May 11 00:17:40 2009 +0000 +++ b/libpurple/dbus-analyze-functions.py Mon May 11 01:37:56 2009 +0000 @@ -31,6 +31,15 @@ "purple_account_unregister", "purple_connection_new_unregister", + # These functions are excluded because they involve setting arbitrary + # data via pointers for protocols and UIs. This just won't work. + "purple_blist_get_ui_data", + "purple_blist_set_ui_data", + "purple_blist_node_get_ui_data", + "purple_blist_node_set_ui_data", + "purple_buddy_get_protocol_data", + "purple_buddy_set_protocol_data", + # This is excluded because this script treats PurpleLogReadFlags* # as pointer to a struct, instead of a pointer to an enum. This # causes a compilation error. Someone should fix this script.
--- a/libpurple/protocols/msn/slplink.c Mon May 11 00:17:40 2009 +0000 +++ b/libpurple/protocols/msn/slplink.c Mon May 11 01:37:56 2009 +0000 @@ -683,9 +683,9 @@ size = st.st_size; if(!file_name) { - base = g_path_get_basename(file_path); - u8 = purple_utf8_try_convert(base); - g_free(base); + gchar *basename = g_path_get_basename(file_path); + u8 = purple_utf8_try_convert(basename); + g_free(basename); file_name = u8; }