Removed empty private data

This commit is contained in:
Jesse van den Kieboom 2006-02-20 22:31:00 +00:00
parent 926bb5dd87
commit e1918e694c
6 changed files with 21 additions and 19 deletions

View File

@ -6,9 +6,9 @@
G_TYPE_INSTANCE_GET_PRIVATE((object), \ G_TYPE_INSTANCE_GET_PRIVATE((object), \
GM_TYPE_MCP_AWNS_PING, GmMcpAwnsPingPrivate)) GM_TYPE_MCP_AWNS_PING, GmMcpAwnsPingPrivate))
struct _GmMcpAwnsPingPrivate { /*struct _GmMcpAwnsPingPrivate {
}; };*/
/* Signals /* Signals
@ -51,12 +51,12 @@ gm_mcp_awns_ping_class_init(GmMcpAwnsPingClass *klass) {
pklass->name = "dns-com-awns-ping"; pklass->name = "dns-com-awns-ping";
pklass->handle_simple = &gm_mcp_awns_ping_handle_simple; pklass->handle_simple = &gm_mcp_awns_ping_handle_simple;
g_type_class_add_private(object_class, sizeof(GmMcpAwnsPingPrivate)); //g_type_class_add_private(object_class, sizeof(GmMcpAwnsPingPrivate));
} }
static void static void
gm_mcp_awns_ping_init(GmMcpAwnsPing *obj) { gm_mcp_awns_ping_init(GmMcpAwnsPing *obj) {
obj->priv = GM_MCP_AWNS_PING_GET_PRIVATE(obj); //obj->priv = GM_MCP_AWNS_PING_GET_PRIVATE(obj);
} }
GmMcpAwnsPing * GmMcpAwnsPing *

View File

@ -5,9 +5,9 @@
G_TYPE_INSTANCE_GET_PRIVATE((object), \ G_TYPE_INSTANCE_GET_PRIVATE((object), \
GM_TYPE_MCP_ICECREW_MCPRESET, GmMcpIcecrewMcpresetPrivate)) GM_TYPE_MCP_ICECREW_MCPRESET, GmMcpIcecrewMcpresetPrivate))
struct _GmMcpIcecrewMcpresetPrivate { /*struct _GmMcpIcecrewMcpresetPrivate {
}; };*/
/* Signals /* Signals
@ -50,12 +50,12 @@ gm_mcp_icecrew_mcpreset_class_init(GmMcpIcecrewMcpresetClass *klass) {
pklass->name = "dns-nl-icecrew-mcpreset"; pklass->name = "dns-nl-icecrew-mcpreset";
pklass->handle_simple = &gm_mcp_icecrew_mcpreset_handle_simple; pklass->handle_simple = &gm_mcp_icecrew_mcpreset_handle_simple;
g_type_class_add_private(object_class, sizeof(GmMcpIcecrewMcpresetPrivate)); //g_type_class_add_private(object_class, sizeof(GmMcpIcecrewMcpresetPrivate));
} }
static void static void
gm_mcp_icecrew_mcpreset_init(GmMcpIcecrewMcpreset *obj) { gm_mcp_icecrew_mcpreset_init(GmMcpIcecrewMcpreset *obj) {
obj->priv = GM_MCP_ICECREW_MCPRESET_GET_PRIVATE(obj); //obj->priv = GM_MCP_ICECREW_MCPRESET_GET_PRIVATE(obj);
} }
GmMcpIcecrewMcpreset * GmMcpIcecrewMcpreset *

View File

@ -780,6 +780,7 @@ gm_mcp_icecrew_userlist_process_triggers(GmMcpIcecrewUserlist *package,
GList const *item; GList const *item;
GmTrigger *trigger; GmTrigger *trigger;
regmatch_t matches[MAX_MATCHES]; regmatch_t matches[MAX_MATCHES];
gint num;
GmMcpPackage *playerdb = gm_mcp_session_find_package( GmMcpPackage *playerdb = gm_mcp_session_find_package(
GM_MCP_PACKAGE_SESSION(package), "dns-nl-icecrew-playerdb"); GM_MCP_PACKAGE_SESSION(package), "dns-nl-icecrew-playerdb");
@ -795,9 +796,9 @@ gm_mcp_icecrew_userlist_process_triggers(GmMcpIcecrewUserlist *package,
trigger = (GmTrigger *)(item->data); trigger = (GmTrigger *)(item->data);
if (trigger->event == TT_USERS) { if (trigger->event == TT_USERS) {
if (gm_trigger_match_user(trigger, username, condition, matches, if ((num = gm_trigger_match_user(trigger, username, condition,
MAX_MATCHES)) { matches, MAX_MATCHES))) {
gm_world_apply_trigger(world, trigger, username, matches); gm_world_apply_trigger(world, trigger, username, matches, num);
} }
} }
} }

View File

@ -9,9 +9,9 @@
G_TYPE_INSTANCE_GET_PRIVATE((object), \ G_TYPE_INSTANCE_GET_PRIVATE((object), \
GM_TYPE_MCP_VMOO_CLIENT, GmMcpVmooClientPrivate)) GM_TYPE_MCP_VMOO_CLIENT, GmMcpVmooClientPrivate))
struct _GmMcpVmooClientPrivate { /*struct _GmMcpVmooClientPrivate {
}; };*/
typedef struct _GmMcpVmooClientView { typedef struct _GmMcpVmooClientView {
GmMcpVmooClient *package; GmMcpVmooClient *package;
@ -68,12 +68,12 @@ gm_mcp_vmoo_client_class_init(GmMcpVmooClientClass *klass) {
pklass->handle_simple = gm_mcp_vmoo_client_handle_simple; pklass->handle_simple = gm_mcp_vmoo_client_handle_simple;
pklass->create_view = gm_mcp_vmoo_client_create_view; pklass->create_view = gm_mcp_vmoo_client_create_view;
g_type_class_add_private(object_class, sizeof(GmMcpVmooClientPrivate)); //g_type_class_add_private(object_class, sizeof(GmMcpVmooClientPrivate));
} }
static void static void
gm_mcp_vmoo_client_init(GmMcpVmooClient *obj) { gm_mcp_vmoo_client_init(GmMcpVmooClient *obj) {
obj->priv = GM_MCP_VMOO_CLIENT_GET_PRIVATE(obj); //obj->priv = GM_MCP_VMOO_CLIENT_GET_PRIVATE(obj);
} }
GmMcpVmooClient * GmMcpVmooClient *

View File

@ -36,7 +36,7 @@ struct _GmMcpVmooClient {
GmMcpPackage parent; GmMcpPackage parent;
/*< private > */ /*< private > */
GmMcpVmooClientPrivate *priv; //GmMcpVmooClientPrivate *priv;
}; };
/* /*

View File

@ -244,6 +244,7 @@ gm_mcp_vmoo_userlist_process_triggers(GmMcpVmooUserlist *package,
GmTriggers *triggers; GmTriggers *triggers;
GList const *item; GList const *item;
GmTrigger *trigger; GmTrigger *trigger;
gint num;
regmatch_t matches[MAX_MATCHES]; regmatch_t matches[MAX_MATCHES];
if (package->priv->initializing) { if (package->priv->initializing) {
@ -257,9 +258,9 @@ gm_mcp_vmoo_userlist_process_triggers(GmMcpVmooUserlist *package,
trigger = (GmTrigger *)(item->data); trigger = (GmTrigger *)(item->data);
if (trigger->event == TT_USERS) { if (trigger->event == TT_USERS) {
if (gm_trigger_match_user(trigger, username, condition, matches, if ((num = gm_trigger_match_user(trigger, username, condition,
MAX_MATCHES)) { matches, MAX_MATCHES))) {
gm_world_apply_trigger(world, trigger, username, matches); gm_world_apply_trigger(world, trigger, username, matches, num);
} }
} }
} }