Mercurial > pidgin
changeset 17080:4b65a67d23b8
Replace some C99 struct syntax.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 14 May 2007 23:34:08 +0000 |
| parents | 79f6b097a0a6 |
| children | f6dd1f7689ee |
| files | libpurple/example/nullclient.c libpurple/protocols/sametime/sametime.c |
| diffstat | 2 files changed, 99 insertions(+), 66 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/example/nullclient.c Mon May 14 23:17:42 2007 +0000 +++ b/libpurple/example/nullclient.c Mon May 14 23:34:08 2007 +0000 @@ -137,7 +137,25 @@ static PurpleConversationUiOps null_conv_uiops = { - .write_conv = null_write_conv + NULL, /* create_conversation */ + NULL, /* destroy_conversation */ + NULL, /* write_chat */ + NULL, /* write_im */ + null_write_conv, /* write_conv */ + NULL, /* chat_add_users */ + NULL, /* chat_rename_user */ + NULL, /* chat_remove_users */ + NULL, /* chat_update_user */ + NULL, /* present */ + NULL, /* has_focus */ + NULL, /* custom_smiley_add */ + NULL, /* custom_smiley_write */ + NULL, /* custom_smiley_close */ + NULL, /* send_confirm */ + NULL, + NULL, + NULL, + NULL }; static void
--- a/libpurple/protocols/sametime/sametime.c Mon May 14 23:17:42 2007 +0000 +++ b/libpurple/protocols/sametime/sametime.c Mon May 14 23:34:08 2007 +0000 @@ -1777,14 +1777,14 @@ static struct mwSessionHandler mw_session_handler = { - .io_write = mw_session_io_write, - .io_close = mw_session_io_close, - .clear = mw_session_clear, - .on_stateChange = mw_session_stateChange, - .on_setPrivacyInfo = mw_session_setPrivacyInfo, - .on_setUserStatus = mw_session_setUserStatus, - .on_admin = mw_session_admin, - .on_announce = mw_session_announce, + mw_session_io_write, + mw_session_io_close, + mw_session_clear, + mw_session_stateChange, + mw_session_setPrivacyInfo, + mw_session_setUserStatus, + mw_session_admin, + mw_session_announce, }; @@ -1803,8 +1803,8 @@ static struct mwAwareHandler mw_aware_handler = { - .on_attrib = mw_aware_on_attrib, - .clear = mw_aware_clear, + mw_aware_on_attrib, + mw_aware_clear, }; @@ -2042,14 +2042,14 @@ static struct mwConferenceHandler mw_conference_handler = { - .on_invited = mw_conf_invited, - .conf_opened = mw_conf_opened, - .conf_closed = mw_conf_closed, - .on_peer_joined = mw_conf_peer_joined, - .on_peer_parted = mw_conf_peer_parted, - .on_text = mw_conf_text, - .on_typing = mw_conf_typing, - .clear = mw_conf_clear, + mw_conf_invited, + mw_conf_opened, + mw_conf_closed, + mw_conf_peer_joined, + mw_conf_peer_parted, + mw_conf_text, + mw_conf_typing, + mw_conf_clear, }; @@ -2287,12 +2287,12 @@ static struct mwFileTransferHandler mw_ft_handler = { - .ft_offered = mw_ft_offered, - .ft_opened = mw_ft_opened, - .ft_closed = mw_ft_closed, - .ft_recv = mw_ft_recv, - .ft_ack = mw_ft_ack, - .clear = mw_ft_clear, + mw_ft_offered, + mw_ft_opened, + mw_ft_closed, + mw_ft_recv, + mw_ft_ack, + mw_ft_clear, }; @@ -2854,11 +2854,11 @@ static struct mwImHandler mw_im_handler = { - .conversation_opened = mw_conversation_opened, - .conversation_closed = mw_conversation_closed, - .conversation_recv = mw_conversation_recv, - .place_invite = mw_place_invite, - .clear = mw_im_clear, + mw_conversation_opened, + mw_conversation_closed, + mw_conversation_recv, + mw_place_invite, + mw_im_clear, }; @@ -3052,14 +3052,14 @@ static struct mwPlaceHandler mw_place_handler = { - .opened = mw_place_opened, - .closed = mw_place_closed, - .peerJoined = mw_place_peerJoined, - .peerParted = mw_place_peerParted, - .peerSetAttribute = mw_place_peerSetAttribute, - .peerUnsetAttribute = mw_place_peerUnsetAttribute, - .message = mw_place_message, - .clear = mw_place_clear, + mw_place_opened, + mw_place_closed, + mw_place_peerJoined, + mw_place_peerParted, + mw_place_peerSetAttribute, + mw_place_peerUnsetAttribute, + mw_place_message, + mw_place_clear, }; @@ -4575,9 +4575,9 @@ struct mwSession *session; struct mwPrivacyInfo privacy = { - .deny = FALSE, - .count = 0, - .users = NULL, + FALSE, /* deny */ + 0, /* count */ + NULL, /* users */ }; g_return_if_fail(gc != NULL); @@ -5167,7 +5167,13 @@ static PurplePluginUiInfo mw_plugin_ui_info = { - .get_plugin_pref_frame = mw_plugin_get_plugin_pref_frame, + mw_plugin_get_plugin_pref_frame, + 0, /* page_num */ + NULL, /* frame */ + NULL, + NULL, + NULL, + NULL }; @@ -5648,30 +5654,39 @@ g_log_remove_handler("meanwhile", log_handler[1]); } - -static PurplePluginInfo mw_plugin_info = { - .magic = PURPLE_PLUGIN_MAGIC, - .major_version = PURPLE_MAJOR_VERSION, - .minor_version = PURPLE_MINOR_VERSION, - .type = PURPLE_PLUGIN_PROTOCOL, - .ui_requirement = NULL, - .flags = 0, - .dependencies = NULL, - .priority = PURPLE_PRIORITY_DEFAULT, - .id = PLUGIN_ID, - .name = PLUGIN_NAME, - .version = VERSION, - .summary = PLUGIN_SUMMARY, - .description = PLUGIN_DESC, - .author = PLUGIN_AUTHOR, - .homepage = PLUGIN_HOMEPAGE, - .load = mw_plugin_load, - .unload = mw_plugin_unload, - .destroy = mw_plugin_destroy, - .ui_info = NULL, - .extra_info = &mw_prpl_info, - .prefs_info = &mw_plugin_ui_info, - .actions = mw_plugin_actions, +static PurplePluginInfo mw_plugin_info = +{ + PURPLE_PLUGIN_MAGIC, + PURPLE_MAJOR_VERSION, + PURPLE_MINOR_VERSION, + PURPLE_PLUGIN_PROTOCOL, /**< type */ + NULL, /**< ui_requirement */ + 0, /**< flags */ + NULL, /**< dependencies */ + PURPLE_PRIORITY_DEFAULT, /**< priority */ + + PLUGIN_ID, /**< id */ + PLUGIN_NAME, /**< name */ + VERSION, /**< version */ + PLUGIN_SUMMARY, /**< summary */ + PLUGIN_DESC, /**< description */ + PLUGIN_AUTHOR, /**< author */ + PLUGIN_HOMEPAGE, /**< homepage */ + + mw_plugin_load, /**< load */ + mw_plugin_unload, /**< unload */ + mw_plugin_destroy, /**< destroy */ + + NULL, /**< ui_info */ + &mw_prpl_info, /**< extra_info */ + &mw_plugin_ui_info, /**< prefs_info */ + mw_plugin_actions, + + /* padding */ + NULL, + NULL, + NULL, + NULL };