[ekg2-commit] r4569 - in trunk: ekg plugins/dbus plugins/gg plugins/icq plugins/irc plugins/jabber plugins/jogger plugins/xmsg: trunk/ekg/commands.c trunk/ekg/plugins.h trunk/plugins/dbus/dbus_iface_im.c trunk/plugins/gg/gg.c trunk/plugins/icq/icq.c trunk/plugins/irc/irc.c trunk/plugins/jabber/jabber.c trunk/plugins/jogger/jogger.c trunk/plugins/xmsg/xmsg.c
SVN commit
svn w toxygen.net
Pon, 1 Wrz 2008, 11:15:59 CEST
Author: peres
Date: 2008-09-01 11:15:58 +0200 (Mon, 01 Sep 2008)
New Revision: 4569
Modified:
trunk/ekg/commands.c
trunk/ekg/plugins.h
trunk/plugins/dbus/dbus_iface_im.c
trunk/plugins/gg/gg.c
trunk/plugins/icq/icq.c
trunk/plugins/irc/irc.c
trunk/plugins/jabber/jabber.c
trunk/plugins/jogger/jogger.c
trunk/plugins/xmsg/xmsg.c
Log:
Ok, no C standard permits anonymous unions.
Modified: trunk/ekg/commands.c
===================================================================
--- trunk/ekg/commands.c 2008-08-31 21:32:29 UTC (rev 4568)
+++ trunk/ekg/commands.c 2008-09-01 09:15:58 UTC (rev 4569)
@@ -2010,12 +2010,12 @@
printq("generic", buf);
if (p->pclass == PLUGIN_PROTOCOL) {
- char *pr = array_join((char**) p->protocol.protocols, ", ");
+ char *pr = array_join((char**) p->priv.protocol.protocols, ", ");
char *st;
char **_sts = NULL;
const status_t *_st;
- for (_st = p->protocol.statuses; *_st != EKG_STATUS_NULL; _st++) {
+ for (_st = p->priv.protocol.statuses; *_st != EKG_STATUS_NULL; _st++) {
array_add(&_sts, (char*) ekg_status_string(*_st, 2));
}
st = array_join(_sts, ", ");
Modified: trunk/ekg/plugins.h
===================================================================
--- trunk/ekg/plugins.h 2008-08-31 21:32:29 UTC (rev 4568)
+++ trunk/ekg/plugins.h 2008-09-01 09:15:58 UTC (rev 4569)
@@ -75,7 +75,7 @@
const char **protocols; /* NULL-terminated list of supported protocols, replacing GET_PLUGIN_PROTOCOLS */
const status_t *statuses; /* EKG_STATUS_NULL-terminated list of supported statuses */
} protocol;
- };
+ } priv;
} plugin_t;
/* Note about plugin_t.statuses:
Modified: trunk/plugins/dbus/dbus_iface_im.c
===================================================================
--- trunk/plugins/dbus/dbus_iface_im.c 2008-08-31 21:32:29 UTC (rev 4568)
+++ trunk/plugins/dbus/dbus_iface_im.c 2008-09-01 09:15:58 UTC (rev 4569)
@@ -30,7 +30,7 @@
if (p->pclass == PLUGIN_PROTOCOL) {
const char **a;
- for (a = p->protocol.protocols; *a; a++)
+ for (a = p->priv.protocol.protocols; *a; a++)
EKG2_DBUS_ADD_STRING(a);
}
}
@@ -109,7 +109,7 @@
if (p->pclass == PLUGIN_PROTOCOL) {
const char **a;
- for (a = p->protocol.protocols; *a; a++) {
+ for (a = p->priv.protocol.protocols; *a; a++) {
if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, a)) {
debug("ekg2_dbus_iface_im_getProtocols cannot allocate memory?\n");
ekg_oom_handler();
Modified: trunk/plugins/gg/gg.c
===================================================================
--- trunk/plugins/gg/gg.c 2008-08-31 21:32:29 UTC (rev 4568)
+++ trunk/plugins/gg/gg.c 2008-09-01 09:15:58 UTC (rev 4569)
@@ -1644,8 +1644,8 @@
PLUGIN_CHECK_VER("gg");
gg_plugin.params = gg_plugin_vars;
- gg_plugin.protocol.protocols = gg_protocols;
- gg_plugin.protocol.statuses = gg_statuses;
+ gg_plugin.priv.protocol.protocols = gg_protocols;
+ gg_plugin.priv.protocol.statuses = gg_statuses;
plugin_register(&gg_plugin, prio);
gg_setvar_default(NULL, dummy);
Modified: trunk/plugins/icq/icq.c
===================================================================
--- trunk/plugins/icq/icq.c 2008-08-31 21:32:29 UTC (rev 4568)
+++ trunk/plugins/icq/icq.c 2008-09-01 09:15:58 UTC (rev 4569)
@@ -1463,8 +1463,8 @@
icq_convert_string_init();
icq_plugin.params = icq_plugin_vars;
- icq_plugin.protocol.protocols = icq_protocols;
- icq_plugin.protocol.statuses = icq_statuses;
+ icq_plugin.priv.protocol.protocols = icq_protocols;
+ icq_plugin.priv.protocol.statuses = icq_statuses;
plugin_register(&icq_plugin, prio);
Modified: trunk/plugins/irc/irc.c
===================================================================
--- trunk/plugins/irc/irc.c 2008-08-31 21:32:29 UTC (rev 4568)
+++ trunk/plugins/irc/irc.c 2008-09-01 09:15:58 UTC (rev 4569)
@@ -2381,8 +2381,8 @@
irc_plugin_vars[23].value = pwd_realname;
irc_plugin.params = irc_plugin_vars;
- irc_plugin.protocol.protocols = irc_protocols;
- irc_plugin.protocol.statuses = irc_statuses;
+ irc_plugin.priv.protocol.protocols = irc_protocols;
+ irc_plugin.priv.protocol.statuses = irc_statuses;
plugin_register(&irc_plugin, prio);
Modified: trunk/plugins/jabber/jabber.c
===================================================================
--- trunk/plugins/jabber/jabber.c 2008-08-31 21:32:29 UTC (rev 4568)
+++ trunk/plugins/jabber/jabber.c 2008-09-01 09:15:58 UTC (rev 4569)
@@ -1623,8 +1623,8 @@
PLUGIN_CHECK_VER("jabber");
jabber_plugin.params = jabber_plugin_vars;
- jabber_plugin.protocol.protocols = jabber_protocols;
- jabber_plugin.protocol.statuses = jabber_statuses;
+ jabber_plugin.priv.protocol.protocols = jabber_protocols;
+ jabber_plugin.priv.protocol.statuses = jabber_statuses;
plugin_register(&jabber_plugin, prio);
Modified: trunk/plugins/jogger/jogger.c
===================================================================
--- trunk/plugins/jogger/jogger.c 2008-08-31 21:32:29 UTC (rev 4568)
+++ trunk/plugins/jogger/jogger.c 2008-09-01 09:15:58 UTC (rev 4569)
@@ -280,7 +280,7 @@
PLUGIN_CHECK_VER("jogger");
jogger_plugin.params = jogger_plugin_vars;
- jogger_plugin.protocol.protocols = jogger_protocols;
+ jogger_plugin.priv.protocol.protocols = jogger_protocols;
/* statuses are not supported, we're just copying jabber session status */
query_connect_id(&jogger_plugin, PLUGIN_PRINT_VERSION, jogger_print_version, NULL);
Modified: trunk/plugins/xmsg/xmsg.c
===================================================================
--- trunk/plugins/xmsg/xmsg.c 2008-08-31 21:32:29 UTC (rev 4568)
+++ trunk/plugins/xmsg/xmsg.c 2008-09-01 09:15:58 UTC (rev 4569)
@@ -710,7 +710,7 @@
xdebug("inotify fd = %d", in_fd);
xmsg_plugin.params = xmsg_plugin_vars;
- xmsg_plugin.protocol.protocols = xmsg_protocols;
+ xmsg_plugin.priv.protocol.protocols = xmsg_protocols;
/* statuses not supported */
plugin_register(&xmsg_plugin, prio);
Więcej informacji o liście dyskusyjnej ekg2-commit