Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/jabber.c @ 25557:60f5abc6cf0c
propagate from branch 'im.pidgin.pidgin' (head 7f8e027e1591ade622baf58a9dac216e7122c1ac)
to branch 'im.pidgin.pidgin.vv' (head 9fd950ff4de5331c13cd762cb755741046bdd576)
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Sat, 29 Dec 2007 06:34:59 +0000 |
| parents | af2c4ef3e61d 315151da0dc6 |
| children | d5d3efbfcf30 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Fri Dec 28 17:14:52 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sat Dec 29 06:34:59 2007 +0000 @@ -2320,6 +2320,11 @@ return TRUE; } +PurpleMedia *jabber_media_initiate(PurpleConnection *gc, const char *who, PurpleMediaStreamType type) +{ + return NULL; +} + void jabber_register_commands(void) { purple_cmd_register("config", "", PURPLE_CMD_P_PRPL,