OnEvent(EV_PROTO_ONCONTACTDELETED) => PROTO_INTERFACE::OnContactDeleted

4 files changed, 4 insertions, 10 deletions

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index cd3d98c6c2..ca86944985 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -1241,7 +1241,8 @@ void GaduProto::broadcastnewstatus(int newStatus)
 

 ////////////////////////////////////////////////////////////

 // When contact is deleted

-int GaduProto::contactdeleted(WPARAM hContact, LPARAM)

+

+void GaduProto::OnContactDeleted(MCONTACT hContact)

 {

 	uin_t uin = (uin_t)getDword(hContact, GG_KEY_UIN, 0);

 

@@ -1260,7 +1261,7 @@ int GaduProto::contactdeleted(WPARAM hContact, LPARAM)
 			Chat_Control(m_szModuleName, wszRoomId, SESSION_OFFLINE);

 			Chat_Terminate(m_szModuleName, wszRoomId);

 		}

-		return 0;

+		return;

 	}

 

 	if (uin && isonline())

@@ -1269,8 +1270,6 @@ int GaduProto::contactdeleted(WPARAM hContact, LPARAM)
 		gg_remove_notify_ex(m_sess, uin, GG_USER_NORMAL);

 		gg_LeaveCriticalSection(&sess_mutex, "contactdeleted", 25, 1, "sess_mutex", 1);

 	}

-

-	return 0;

 }

 

 ////////////////////////////////////////////////////////////

diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index 3851e4ce7a..c78ca2ea95 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -737,9 +737,6 @@ int GaduProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam)
 	case EV_PROTO_ONMENU:

 		menus_init();

 		break;

-

-	case EV_PROTO_ONCONTACTDELETED:

-		return contactdeleted(wParam, lParam);

 	}

 

 	return TRUE;

diff --git a/protocols/Gadu-Gadu/src/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h
index 8445e52499..3d2dd02d07 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.h
+++ b/protocols/Gadu-Gadu/src/gg_proto.h
@@ -57,6 +57,7 @@ struct GaduProto : public PROTO<GaduProto>
 	int      UserIsTyping(MCONTACT hContact, int type) override;

 				

 	int      OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam) override;

+	void     OnContactDeleted(MCONTACT) override;

 	void     OnModulesLoaded() override;

 	void     OnShutdown() override;

 

@@ -112,7 +113,6 @@ struct GaduProto : public PROTO<GaduProto>
 

 	void broadcastnewstatus(int newStatus);

 	void cleanuplastplugin(DWORD version);

-	int contactdeleted(WPARAM wParam, LPARAM lParam);

 	void notifyall();

 	void changecontactstatus(uin_t uin, int status, const wchar_t *idescr, int time, uint32_t remote_ip, uint16_t remote_port, uint32_t version);

 	wchar_t *getstatusmsg(int status);

diff --git a/protocols/Gadu-Gadu/src/libgadu/dcc7.cpp b/protocols/Gadu-Gadu/src/libgadu/dcc7.cpp
index b9f6ef2faa..eb50fec1b5 100644
--- a/protocols/Gadu-Gadu/src/libgadu/dcc7.cpp
+++ b/protocols/Gadu-Gadu/src/libgadu/dcc7.cpp
@@ -1643,8 +1643,6 @@ struct gg_event *gg_dcc7_watch_fd(struct gg_dcc7 *dcc)
 			return e;
 		}
 	}
-
-	return e;
 }
 
 /**