Mercurial > pidgin
changeset 21042:b3ae0eb23df3
merge of '022ff8d97a85c1c5ea7b66f7d6ce6c607fd12a32'
and '7f71f284598d962a9074116360bce09e65458488'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sun, 28 Oct 2007 17:27:07 +0000 |
| parents | 5af17c5a4a12 (diff) acbbcf6b6b46 (current diff) |
| children | 6b9e304272e4 |
| files | |
| diffstat | 2 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/dbus-analyze-functions.py Sun Oct 28 17:25:18 2007 +0000 +++ b/libpurple/dbus-analyze-functions.py Sun Oct 28 17:27:07 2007 +0000 @@ -75,7 +75,11 @@ ] pointer = "#pointer#" -myexception = "My Exception" + +class MyException(Exception): + pass + +myexception = MyException() def ctopascal(name): newname = "" @@ -520,7 +524,7 @@ try: self.processfunction(functiontext, paramtexts) - except myexception: + except MyException: sys.stderr.write(myline + "\n") except: sys.stderr.write(myline + "\n")
--- a/libpurple/prpl.h Sun Oct 28 17:25:18 2007 +0000 +++ b/libpurple/prpl.h Sun Oct 28 17:27:07 2007 +0000 @@ -339,6 +339,15 @@ void (*remove_group)(PurpleConnection *gc, PurpleGroup *group); + /** Gets the real name of a participant in a chat. For example, on + * XMPP this turns a chat room nick <tt>foo</tt> into + * <tt>room@server/foo</tt> + * @param gc the connection on which the room is. + * @param id the ID of the chat room. + * @param who the nickname of the chat participant. + * @return the real name of the participant. This string must be + * freed by the caller. + */ char *(*get_cb_real_name)(PurpleConnection *gc, int id, const char *who); void (*set_chat_topic)(PurpleConnection *gc, int id, const char *topic);