From e1918e694c92df92ecf3ee00e8b692f9a3a40ede Mon Sep 17 00:00:00 2001
From: Jesse van den Kieboom <jessevdk@gmail.com>
Date: Mon, 20 Feb 2006 22:31:00 +0000
Subject: [PATCH] Removed empty private data

---
 gnoemoe/mcp/gm-mcp-awns-ping.c        | 8 ++++----
 gnoemoe/mcp/gm-mcp-icecrew-mcpreset.c | 8 ++++----
 gnoemoe/mcp/gm-mcp-icecrew-userlist.c | 7 ++++---
 gnoemoe/mcp/gm-mcp-vmoo-client.c      | 8 ++++----
 gnoemoe/mcp/gm-mcp-vmoo-client.h      | 2 +-
 gnoemoe/mcp/gm-mcp-vmoo-userlist.c    | 7 ++++---
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/gnoemoe/mcp/gm-mcp-awns-ping.c b/gnoemoe/mcp/gm-mcp-awns-ping.c
index 7ee67a3..ef4987d 100644
--- a/gnoemoe/mcp/gm-mcp-awns-ping.c
+++ b/gnoemoe/mcp/gm-mcp-awns-ping.c
@@ -6,9 +6,9 @@
 		G_TYPE_INSTANCE_GET_PRIVATE((object), \
 		GM_TYPE_MCP_AWNS_PING, GmMcpAwnsPingPrivate))
 
-struct _GmMcpAwnsPingPrivate {
+/*struct _GmMcpAwnsPingPrivate {
 
-};
+};*/
 
 /* Signals
 
@@ -51,12 +51,12 @@ gm_mcp_awns_ping_class_init(GmMcpAwnsPingClass *klass) {
 	pklass->name = "dns-com-awns-ping";
 	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
 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 *
diff --git a/gnoemoe/mcp/gm-mcp-icecrew-mcpreset.c b/gnoemoe/mcp/gm-mcp-icecrew-mcpreset.c
index 05196a5..27f2eaf 100644
--- a/gnoemoe/mcp/gm-mcp-icecrew-mcpreset.c
+++ b/gnoemoe/mcp/gm-mcp-icecrew-mcpreset.c
@@ -5,9 +5,9 @@
 		G_TYPE_INSTANCE_GET_PRIVATE((object), \
 		GM_TYPE_MCP_ICECREW_MCPRESET, GmMcpIcecrewMcpresetPrivate))
 
-struct _GmMcpIcecrewMcpresetPrivate {
+/*struct _GmMcpIcecrewMcpresetPrivate {
 
-};
+};*/
 
 /* Signals
 
@@ -50,12 +50,12 @@ gm_mcp_icecrew_mcpreset_class_init(GmMcpIcecrewMcpresetClass *klass) {
 	pklass->name = "dns-nl-icecrew-mcpreset";
 	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
 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 *
diff --git a/gnoemoe/mcp/gm-mcp-icecrew-userlist.c b/gnoemoe/mcp/gm-mcp-icecrew-userlist.c
index 671adee..de00e42 100644
--- a/gnoemoe/mcp/gm-mcp-icecrew-userlist.c
+++ b/gnoemoe/mcp/gm-mcp-icecrew-userlist.c
@@ -780,6 +780,7 @@ gm_mcp_icecrew_userlist_process_triggers(GmMcpIcecrewUserlist *package,
 	GList const *item;
 	GmTrigger *trigger;
 	regmatch_t matches[MAX_MATCHES];
+	gint num;
 	GmMcpPackage *playerdb = gm_mcp_session_find_package(
 			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);
 		
 		if (trigger->event == TT_USERS) {
-			if (gm_trigger_match_user(trigger, username, condition, matches, 
-					MAX_MATCHES)) {
-				gm_world_apply_trigger(world, trigger, username, matches);
+			if ((num = gm_trigger_match_user(trigger, username, condition, 
+					matches, MAX_MATCHES))) {
+				gm_world_apply_trigger(world, trigger, username, matches, num);
 			}
 		}			
 	}
diff --git a/gnoemoe/mcp/gm-mcp-vmoo-client.c b/gnoemoe/mcp/gm-mcp-vmoo-client.c
index 4fb612d..bfc5643 100644
--- a/gnoemoe/mcp/gm-mcp-vmoo-client.c
+++ b/gnoemoe/mcp/gm-mcp-vmoo-client.c
@@ -9,9 +9,9 @@
 		G_TYPE_INSTANCE_GET_PRIVATE((object), \
 		GM_TYPE_MCP_VMOO_CLIENT, GmMcpVmooClientPrivate))
 
-struct _GmMcpVmooClientPrivate {
+/*struct _GmMcpVmooClientPrivate {
 
-};
+};*/
 
 typedef struct _GmMcpVmooClientView {
 	GmMcpVmooClient *package;
@@ -68,12 +68,12 @@ gm_mcp_vmoo_client_class_init(GmMcpVmooClientClass *klass) {
 	pklass->handle_simple = gm_mcp_vmoo_client_handle_simple;
 	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
 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 *
diff --git a/gnoemoe/mcp/gm-mcp-vmoo-client.h b/gnoemoe/mcp/gm-mcp-vmoo-client.h
index ac053b8..d57e6f4 100644
--- a/gnoemoe/mcp/gm-mcp-vmoo-client.h
+++ b/gnoemoe/mcp/gm-mcp-vmoo-client.h
@@ -36,7 +36,7 @@ struct _GmMcpVmooClient {
 	GmMcpPackage parent;
 	
 	/*< private > */
-	GmMcpVmooClientPrivate *priv;
+	//GmMcpVmooClientPrivate *priv;
 };
 
 /*
diff --git a/gnoemoe/mcp/gm-mcp-vmoo-userlist.c b/gnoemoe/mcp/gm-mcp-vmoo-userlist.c
index a5923b5..fd63b48 100644
--- a/gnoemoe/mcp/gm-mcp-vmoo-userlist.c
+++ b/gnoemoe/mcp/gm-mcp-vmoo-userlist.c
@@ -244,6 +244,7 @@ gm_mcp_vmoo_userlist_process_triggers(GmMcpVmooUserlist *package,
 	GmTriggers *triggers;
 	GList const *item;
 	GmTrigger *trigger;
+	gint num;
 	regmatch_t matches[MAX_MATCHES];
 
 	if (package->priv->initializing) {
@@ -257,9 +258,9 @@ gm_mcp_vmoo_userlist_process_triggers(GmMcpVmooUserlist *package,
 		trigger = (GmTrigger *)(item->data);
 		
 		if (trigger->event == TT_USERS) {
-			if (gm_trigger_match_user(trigger, username, condition, matches, 
-					MAX_MATCHES)) {
-				gm_world_apply_trigger(world, trigger, username, matches);
+			if ((num = gm_trigger_match_user(trigger, username, condition, 
+					matches, MAX_MATCHES))) {
+				gm_world_apply_trigger(world, trigger, username, matches, num);
 			}
 		}			
 	}