Mercurial > pidgin.yaz
comparison libpurple/protocols/zephyr/zephyr.c @ 25658:903fb6879521
Broken merge.
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 27 May 2008 06:51:21 +0000 |
| parents | ff29208e03ef |
| children | adf153852bcf |
comparison
equal
deleted
inserted
replaced
| 25657:ff29208e03ef | 25658:903fb6879521 |
|---|---|
| 2913 | 2913 |
| 2914 NULL, | 2914 NULL, |
| 2915 NULL, | 2915 NULL, |
| 2916 NULL, | 2916 NULL, |
| 2917 sizeof(PurplePluginProtocolInfo), /* struct_size */ | 2917 sizeof(PurplePluginProtocolInfo), /* struct_size */ |
| 2918 sizeof(PurplePluginProtocolInfo), | 2918 NULL, /* get_account_text_table */ |
| 2919 NULL, /* initate_media */ | 2919 NULL, /* initate_media */ |
| 2920 NULL /* can_do_media */ | 2920 NULL /* can_do_media */ |
| 2921 }; | 2921 }; |
| 2922 | 2922 |
| 2923 static PurplePluginInfo info = { | 2923 static PurplePluginInfo info = { |