im.pidgin.pidgin.vv: bd277fc8667e1c46da4b48948dac2d681265f196
sadrul at pidgin.im
sadrul at pidgin.im
Sat Dec 29 11:55:39 EST 2007
-----------------------------------------------------------------
Revision: bd277fc8667e1c46da4b48948dac2d681265f196
Ancestor: 06f8efa36821d6e1aa652f94a41f23a052ded1cf
Author: sadrul at pidgin.im
Date: 2007-12-29T16:54:15
Branch: im.pidgin.pidgin.vv
Modified files:
libpurple/media.c libpurple/media.h libpurple/mediamanager.c
libpurple/protocols/bonjour/Makefile.am
libpurple/protocols/bonjour/bonjour.c
libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
libpurple/protocols/jabber/libxmpp.c
libpurple/protocols/msn/msn.c
libpurple/protocols/msnp9/Makefile.am
libpurple/protocols/msnp9/msn.c
libpurple/protocols/myspace/myspace.c
libpurple/protocols/novell/novell.c
libpurple/protocols/null/nullprpl.c
libpurple/protocols/oscar/libaim.c
libpurple/protocols/oscar/libicq.c
libpurple/protocols/qq/qq.c libpurple/protocols/silc/silc.c
libpurple/protocols/silc10/silc.c
libpurple/protocols/simple/simple.c
libpurple/protocols/yahoo/yahoo.c libpurple/prpl.h
ChangeLog:
Fix the prplinfo structs and get rid of some compile warnings.
-------------- next part --------------
============================================================
--- libpurple/media.c 13b06513a5b54f466dabde4a154d258ff1ef7e56
+++ libpurple/media.c 571d7577bb68237c18d5f3ea8ce1b20d65ec1f6f
@@ -99,7 +99,8 @@ purple_media_get_type()
NULL,
sizeof(PurpleMedia),
0,
- (GInstanceInitFunc) purple_media_init
+ (GInstanceInitFunc) purple_media_init,
+ NULL
};
type = g_type_register_static(G_TYPE_OBJECT, "PurpleMedia", &info, 0);
}
============================================================
--- libpurple/media.h 0b6cfe7e1e4a2aac6f121a2d50d42e5886d44004
+++ libpurple/media.h c1886eacbd399ebdcbd6f1b168c6effd3c948bc6
@@ -69,7 +69,7 @@ struct _PurpleMedia
PurpleMediaPrivate *priv;
};
-GType purple_media_get_type();
+GType purple_media_get_type(void);
void purple_media_get_elements(PurpleMedia *media, GstElement **audio_src, GstElement **audio_sink,
GstElement **video_src, GstElement **video_sink);
============================================================
--- libpurple/mediamanager.c 75d3ca0077bdb4456bd9fc15d9354518684e39ec
+++ libpurple/mediamanager.c 6146c63c8c207044707830d2e7471f3833b4a0d8
@@ -78,7 +78,8 @@ purple_media_manager_get_type()
NULL,
sizeof(PurpleMediaManager),
0,
- (GInstanceInitFunc) purple_media_manager_init
+ (GInstanceInitFunc) purple_media_manager_init,
+ NULL
};
type = g_type_register_static(G_TYPE_OBJECT, "PurpleMediaManager", &info, 0);
}
============================================================
--- libpurple/protocols/bonjour/Makefile.am f216340ec301aa704851cd51c5393bc448d1006e
+++ libpurple/protocols/bonjour/Makefile.am ea2050c82d974d92cfe9a89c862f870d75af1858
@@ -52,6 +52,7 @@ AM_CPPFLAGS = \
$(DEBUG_CFLAGS) \
$(LIBXML_CFLAGS) \
$(FARSIGHT_CFLAGS)
+
if MDNS_AVAHI
AM_CPPFLAGS += $(AVAHI_CFLAGS)
else
============================================================
--- libpurple/protocols/bonjour/bonjour.c 179ac8e68bc584960e3d01fb640054e3a009e66e
+++ libpurple/protocols/bonjour/bonjour.c 3b4c3b328eb380c50c899e6f59152a0f4abeb001
@@ -482,12 +482,11 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* whiteboard_prpl_ops */
NULL, /* send_raw */
NULL, /* roomlist_room_serialize */
-
- /* padding */
- NULL,
- NULL,
- NULL,
- sizeof(PurplePluginProtocolInfo)
+ NULL, /* unregister_user */
+ NULL, /* send_attention */
+ NULL, /* get_attention_types */
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
static PurplePluginInfo info =
============================================================
--- libpurple/protocols/gg/gg.c a6b1b93cbe52dd92ba347f65ecd79ab487853520
+++ libpurple/protocols/gg/gg.c 5186b9abfa927c7d6cb793a112f444fd1d91ac29
@@ -2147,12 +2147,11 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* whiteboard_prpl_ops */
NULL, /* send_raw */
NULL, /* roomlist_room_serialize */
-
- /* padding */
- NULL,
- NULL,
- NULL,
- sizeof(PurplePluginProtocolInfo)
+ NULL, /* unregister_user */
+ NULL, /* send_attention */
+ NULL, /* get_attention_types */
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
/* }}} */
============================================================
--- libpurple/protocols/irc/irc.c 2b39e80b40b8b0305dbd8dae485dc15cbee6a4c6
+++ libpurple/protocols/irc/irc.c 64d30c435cf996868144ebce55fc811fce01ca3e
@@ -899,12 +899,11 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* whiteboard_prpl_ops */
irc_send_raw, /* send_raw */
NULL, /* roomlist_room_serialize */
-
- /* padding */
- NULL,
- NULL,
- NULL,
- NULL
+ NULL, /* unregister_user */
+ NULL, /* send_attention */
+ NULL, /* get_attention_types */
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
static gboolean load_plugin (PurplePlugin *plugin) {
@@ -953,7 +952,7 @@ static PurplePluginInfo info =
NULL,
NULL,
NULL,
- sizeof(PurplePluginProtocolInfo)
+ NULL
};
static void _init_plugin(PurplePlugin *plugin)
============================================================
--- libpurple/protocols/jabber/libxmpp.c c53a70ce0645520c4cdcc279494d43e37efbd236
+++ libpurple/protocols/jabber/libxmpp.c b85bc457c82c72c2939951327b41db363ada9e88
@@ -115,7 +115,8 @@ static PurplePluginProtocolInfo prpl_inf
jabber_unregister_account, /* unregister_user */
jabber_send_attention, /* send_attention */
jabber_attention_types, /* attention_types */
- jabber_media_initiate /* initiate_media */
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ jabber_media_initiate /* initiate_media */
};
static gboolean load_plugin(PurplePlugin *plugin)
============================================================
--- libpurple/protocols/msn/msn.c 6d1ad11bdfa08d0421e47d581d50c664d5c80687
+++ libpurple/protocols/msn/msn.c 8eccf7585c278260f0c654811dad0f4d3cf5eb0f
@@ -2283,10 +2283,9 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* roomlist_room_serialize */
NULL, /* unregister_user */
msn_send_attention, /* send_attention */
- msn_attention_types, /* attention_types */
-
- /* padding */
- sizeof(PurplePluginProtocolInfo)
+ msn_attention_types, /* get_attention_types */
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
static PurplePluginInfo info =
============================================================
--- libpurple/protocols/msnp9/Makefile.am abb8580629e70836efed2dd5724c724b478be896
+++ libpurple/protocols/msnp9/Makefile.am ead6d50993bae445b879740fcbf03116a71a9524
@@ -87,4 +87,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libpurple \
-I$(top_builddir)/libpurple \
$(GLIB_CFLAGS) \
+ $(DEBUG_CFLAGS) \
+ $(FARSIGHT_CFLAGS)
+
- $(DEBUG_CFLAGS)
============================================================
--- libpurple/protocols/msnp9/msn.c bd5f30fcf5fc40abee97ce8f75d41ac953a577ed
+++ libpurple/protocols/msnp9/msn.c cdab75b9cdff2124e6e65f52b55925c14fdb1044
@@ -2136,9 +2136,8 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* unregister_user */
msn_send_attention, /* send_attention */
msn_attention_types, /* attention_types */
-
- /* padding */
- NULL
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
static PurplePluginInfo info =
============================================================
--- libpurple/protocols/myspace/myspace.c edc104915455f6ceeb1ad8d714276cd8117b3d56
+++ libpurple/protocols/myspace/myspace.c 05d77302924a2d9f9639239b0bafd43f737e14f2
@@ -2990,7 +2990,8 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* unregister_user */
msim_send_attention, /* send_attention */
msim_attention_types, /* attention_types */
- sizeof(PurplePluginProtocolInfo)
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
============================================================
--- libpurple/protocols/novell/novell.c df9d1abf8a1ce5ae906a4d3c29fc0db040100533
+++ libpurple/protocols/novell/novell.c ba72dfdbc8c621ba69884dfb704a5929952fc735
@@ -3511,12 +3511,11 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* whiteboard_prpl_ops */
NULL, /* send_raw */
NULL, /* roomlist_room_serialize */
-
- /* padding */
- NULL,
- NULL,
- NULL,
- sizeof(PurplePluginProtocolInfo)
+ NULL, /* unregister_user */
+ NULL, /* send_attention */
+ NULL, /* get_attention_types */
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
static PurplePluginInfo info = {
============================================================
--- libpurple/protocols/null/nullprpl.c da874b0490cb8eda19c8d8e2190c35fabbbd86df
+++ libpurple/protocols/null/nullprpl.c 06ee6959fa4dc0f8cd953f221264bdd1114035fb
@@ -1122,10 +1122,11 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* whiteboard_prpl_ops */
NULL, /* send_raw */
NULL, /* roomlist_room_serialize */
- NULL, /* padding... */
- NULL,
- NULL,
- sizeof(PurpleProtocolPluginInfo)
+ NULL, /* unregister_user */
+ NULL, /* send_attention */
+ NULL, /* get_attention_types */
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
static void nullprpl_init(PurplePlugin *plugin)
============================================================
--- libpurple/protocols/oscar/libaim.c 7b9a53ebd7703456fe70c94589d2f8adad5ab6bd
+++ libpurple/protocols/oscar/libaim.c 9d6425fbbe83324b519e76946f7d9164fb938517
@@ -92,12 +92,11 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* whiteboard_prpl_ops */
NULL, /* send_raw */
NULL, /* roomlist_room_serialize */
-
- /* padding */
- NULL,
- NULL,
- NULL,
- sizeof(PurplePluginProtocolInfo)
+ NULL, /* unregister_user */
+ NULL, /* send_attention */
+ NULL, /* get_attention_types */
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
static PurplePluginInfo info =
============================================================
--- libpurple/protocols/oscar/libicq.c 89ed034eb8f13dc100415b7bfba00feb62100b1c
+++ libpurple/protocols/oscar/libicq.c 0cbf976bd5d2aed5e40ad88d262fbf07c05eb300
@@ -92,12 +92,11 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* whiteboard_prpl_ops */
NULL, /* send_raw */
NULL, /* roomlist_room_serialize */
-
- /* padding */
- NULL,
- NULL,
- NULL,
- sizeof(PurplePluginProtocolInfo)
+ NULL, /* unregister_user */
+ NULL, /* send_attention */
+ NULL, /* get_attention_types */
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
static PurplePluginInfo info =
============================================================
--- libpurple/protocols/qq/qq.c 1fa55f10acda3f439664323ff4cc0a08fd257e17
+++ libpurple/protocols/qq/qq.c 3ce874dc91a567cbdb20973d4e00350bc5305d89
@@ -701,12 +701,11 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* PurpleWhiteboardPrplOps */
NULL, /* send_raw */
NULL, /* roomlist_room_serialize */
-
- /* padding */
- NULL,
- NULL,
- NULL,
- NULL
+ NULL, /* unregister_user */
+ NULL, /* send_attention */
+ NULL, /* get_attention_types */
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
static PurplePluginInfo info = {
@@ -742,7 +741,7 @@ static PurplePluginInfo info = {
NULL,
NULL,
NULL,
- sizeof(PurplePluginProtocolInfo)
+ NULL
};
============================================================
--- libpurple/protocols/silc/silc.c f0db609e11faea4992366aff9c1f34e5262fa115
+++ libpurple/protocols/silc/silc.c 86f482122d0192483567bc52cab01cb37c99e9ce
@@ -1993,12 +1993,11 @@ static PurplePluginProtocolInfo prpl_inf
&silcpurple_wb_ops, /* whiteboard_prpl_ops */
NULL, /* send_raw */
NULL, /* roomlist_room_serialize */
-
- /* padding */
- NULL,
- NULL,
- NULL,
- NULL
+ NULL, /* unregister_user */
+ NULL, /* send_attention */
+ NULL, /* get_attention_types */
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
static PurplePluginInfo info =
@@ -2035,7 +2034,7 @@ static PurplePluginInfo info =
NULL,
NULL,
NULL,
- sizeof(PurplePluginProtocolInfo)
+ NULL
};
static void
============================================================
--- libpurple/protocols/silc10/silc.c da6bec410e8bc7978bae16d39334b6a7ed70ab3c
+++ libpurple/protocols/silc10/silc.c 0e10208b5d46bd1bb1320acf0dd09139349a2195
@@ -1793,12 +1793,11 @@ static PurplePluginProtocolInfo prpl_inf
&silcpurple_wb_ops, /* whiteboard_prpl_ops */
NULL, /* send_raw */
NULL, /* roomlist_room_serialize */
-
- /* padding */
- NULL,
- NULL,
- NULL,
- NULL
+ NULL, /* unregister_user */
+ NULL, /* send_attention */
+ NULL, /* get_attention_types */
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
static PurplePluginInfo info =
@@ -1835,7 +1834,7 @@ static PurplePluginInfo info =
NULL,
NULL,
NULL,
- sizeof(PurpleProtocolPluginInfo)
+ NULL
};
static void
============================================================
--- libpurple/protocols/simple/simple.c 335fccdc048492e618766ab800eb4278c097c1b8
+++ libpurple/protocols/simple/simple.c 54c5a6f7c851d7435d2d6d82e4922d708e97a0e8
@@ -2031,12 +2031,11 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* whiteboard_prpl_ops */
simple_send_raw, /* send_raw */
NULL, /* roomlist_room_serialize */
-
- /* padding */
- NULL,
- NULL,
- NULL,
- sizeof(PurplePluginProtocolInfo)
+ NULL, /* unregister_user */
+ NULL, /* send_attention */
+ NULL, /* get_attention_types */
+ sizeof(PurplePluginProtocolInfo), /* struct_size */
+ NULL /* initiate_media */
};
============================================================
--- libpurple/protocols/yahoo/yahoo.c 7cacf2158a059c9d9aee121ce2c1b57e44747b3c
+++ libpurple/protocols/yahoo/yahoo.c 6e8aaa8dd0fb6e27129b0aa3c469bac139608375
@@ -4345,12 +4345,10 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* send_raw */
NULL, /* roomlist_room_serialize */
NULL, /* unregister_user */
-
yahoo_send_attention,
yahoo_attention_types,
-
- /* padding */
- sizeof(PurplePluginProtocolInfo)
+ sizeof(PurplePluginProtocolInfo),
+ NULL
};
static PurplePluginInfo info =
============================================================
--- libpurple/prpl.h cd272d0c45da9db23905013b24d18e27ad324b82
+++ libpurple/prpl.h 54c9ea962d3f8b28766233de81211f46ab026227
@@ -394,24 +394,23 @@ struct _PurplePluginProtocolInfo
* reasons.
*/
void (*unregister_user)(PurpleAccount *, PurpleAccountUnregistrationCb cb, void *user_data);
-
+
/* Attention API for sending & receiving zaps/nudges/buzzes etc. */
gboolean (*send_attention)(PurpleConnection *gc, const char *username, guint type);
GList *(*get_attention_types)(PurpleAccount *acct);
- void (*_purple_reserved4)(void);
- GList *(*attention_types)(PurpleAccount *acct);
+ /* Make sure you do not try to dereference anything past struct_size! */
+ int struct_size;
+
#ifdef USE_FARSIGHT
PurpleMedia *(*initiate_media)(PurpleConnection *conn, const char *who, PurpleMediaStreamType type);
#else
- void (*initiate_media)(void)
+ void (*initiate_media)(void);
#endif
- /* Make sure you do not try to dereference anything past struct_size! */
- int struct_size;
};
#define PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl, member) \
- ((G_STRUCT_OFFSET(PurpleProtocolPluginInfo, member) < prpl->struct_size) && \
+ ((G_STRUCT_OFFSET(PurplePluginProtocolInfo, member) < prpl->struct_size) && \
prpl->member != NULL)
#define PURPLE_IS_PROTOCOL_PLUGIN(plugin) \
More information about the Commits
mailing list