Menu
▾
▴
[Gaim-commits] CVS: gaim/src conversation.c,1.544,1.545 server.c,1.357,1.358 signals.c,1.3,1.4 signals.h,1.2,1.3
|
From: Ethan B. <ebl...@us...> - 2003-08-20 01:43:25
|
Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14301/src
Modified Files:
conversation.c server.c signals.c signals.h
Log Message:
This changes the sending and receiving signals to use GaimAccounts and
recipient/sender usernames rather than GaimConversations. The display*
signals aren't changed yet because I'm not sure I fully grok them.
Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -d -r1.544 -r1.545
--- conversation.c 18 Aug 2003 21:16:31 -0000 1.544
+++ conversation.c 19 Aug 2003 23:52:07 -0000 1.545
@@ -259,7 +259,8 @@
buffy = g_strdup(buf);
gaim_signal_emit(gaim_conversations_get_handle(), "sending-im-msg",
- conv, &buffy);
+ gaim_conversation_get_account(conv),
+ gaim_conversation_get_name(conv), &buffy);
if (buffy != NULL) {
int imflags = 0;
@@ -392,7 +393,8 @@
}
gaim_signal_emit(gaim_conversations_get_handle(), "sent-im-msg",
- conv, buffy);
+ gaim_conversation_get_account(conv),
+ gaim_conversation_get_name(conv), buffy);
g_free(buffy);
}
@@ -401,13 +403,15 @@
buffy = g_strdup(buf);
gaim_signal_emit(gaim_conversations_get_handle(), "sending-chat-msg",
- conv, &buffy);
+ gaim_conversation_get_account(conv), &buffy,
+ gaim_chat_get_id(GAIM_CHAT(conv)));
if (buffy != NULL) {
err = serv_chat_send(gc, gaim_chat_get_id(GAIM_CHAT(conv)), buffy);
gaim_signal_emit(gaim_conversations_get_handle(), "sent-chat-msg",
- conv, buf);
+ gaim_conversation_get_account(conv), buf,
+ gaim_chat_get_id(GAIM_CHAT(conv)));
g_free(buffy);
}
@@ -2621,22 +2625,22 @@
gaim_signal_register(handle, "displayed-im-msg",
gaim_marshal_VOID__POINTER_POINTER);
gaim_signal_register(handle, "sending-im-msg",
- gaim_marshal_VOID__POINTER_POINTER);
+ gaim_marshal_VOID__POINTER_POINTER_POINTER);
gaim_signal_register(handle, "sent-im-msg",
- gaim_marshal_VOID__POINTER_POINTER);
+ gaim_marshal_VOID__POINTER_POINTER_POINTER);
gaim_signal_register(handle, "received-im-msg",
- gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER);
+ gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER);
gaim_signal_register(handle, "displaying-chat-msg",
- gaim_marshal_BOOLEAN__POINTER_POINTER);
+ gaim_marshal_BOOLEAN__POINTER_POINTER_UINT);
gaim_signal_register(handle, "displayed-chat-msg",
- gaim_marshal_VOID__POINTER_POINTER);
+ gaim_marshal_VOID__POINTER_POINTER_UINT);
gaim_signal_register(handle, "sending-chat-msg",
- gaim_marshal_VOID__POINTER_POINTER);
+ gaim_marshal_VOID__POINTER_POINTER_UINT);
gaim_signal_register(handle, "sent-chat-msg",
- gaim_marshal_VOID__POINTER_POINTER);
+ gaim_marshal_VOID__POINTER_POINTER_UINT);
gaim_signal_register(handle, "received-chat-msg",
- gaim_marshal_VOID__POINTER_POINTER_POINTER_POINTER);
+ gaim_marshal_VOID__POINTER_POINTER_POINTER_UINT);
gaim_signal_register(handle, "conversation-switching",
gaim_marshal_VOID__POINTER_POINTER);
Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -d -r1.357 -r1.358
--- server.c 19 Aug 2003 20:43:11 -0000 1.357
+++ server.c 19 Aug 2003 23:52:07 -0000 1.358
@@ -858,8 +858,8 @@
plugin_return = GPOINTER_TO_INT(
gaim_signal_emit_return_1(gaim_conversations_get_handle(),
- "received-im-msg",
- cnv, &angel, &buffy, &flags));
+ "received-im-msg", gc->account,
+ &angel, &buffy, &flags));
if (!buffy || !angel || plugin_return) {
if (buffy)
@@ -1472,8 +1472,9 @@
plugin_return = GPOINTER_TO_INT(
gaim_signal_emit_return_1(gaim_conversations_get_handle(),
- "received-chat-msg",
- conv, &angel, &buffy));
+ "received-chat-msg", g->account,
+ &angel, &buffy,
+ gaim_chat_get_id(GAIM_CHAT(conv))));
if (!buffy || !angel || plugin_return) {
if (buffy)
Index: signals.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/signals.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- signals.c 19 Aug 2003 19:46:58 -0000 1.3
+++ signals.c 19 Aug 2003 23:52:07 -0000 1.4
@@ -491,6 +491,21 @@
((void (*)(void *, void *, void *, void *, void *))cb)(arg1, arg2, arg3, arg4, data);
}
+
+void
+gaim_marshal_VOID__POINTER_POINTER_POINTER_UINT(GaimCallback cb,
+ va_list args,
+ void *data,
+ void **return_val)
+{
+ void *arg1 = va_arg(args, void *);
+ void *arg2 = va_arg(args, void *);
+ void *arg3 = va_arg(args, void *);
+ guint arg4 = va_arg(args, guint);
+
+ ((void (*)(void *, void *, void *, guint, void *))cb)(arg1, arg2, arg3, arg4, data);
+}
+
void
gaim_marshal_VOID__POINTER_POINTER_POINTER_UINT_UINT(GaimCallback cb,
va_list args,
@@ -529,6 +544,40 @@
void *arg2 = va_arg(args, void *);
ret_val = ((gboolean (*)(void *, void *, void *))cb)(arg1, arg2, data);
+
+ if (return_val != NULL)
+ *return_val = GINT_TO_POINTER(ret_val);
+}
+
+void
+gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER(GaimCallback cb, va_list args,
+ void *data, void **return_val)
+{
+ gboolean ret_val;
+ void *arg1 = va_arg(args, void *);
+ void *arg2 = va_arg(args, void *);
+ void *arg3 = va_arg(args, void *);
+
+ ret_val = ((gboolean (*)(void *, void *, void *, void *))cb)(arg1, arg2,
+ arg3, data);
+
+ if (return_val != NULL)
+ *return_val = GINT_TO_POINTER(ret_val);
+}
+
+void
+gaim_marshal_BOOLEAN__POINTER_POINTER_UINT(GaimCallback cb,
+ va_list args,
+ void *data,
+ void **return_val)
+{
+ gboolean ret_val;
+ void *arg1 = va_arg(args, void *);
+ void *arg2 = va_arg(args, void *);
+ guint arg3 = va_arg(args, guint);
+
+ ret_val = ((gboolean (*)(void *, void *, guint, void *))cb)(
+ arg1, arg2, arg3, data);
if (return_val != NULL)
*return_val = GINT_TO_POINTER(ret_val);
Index: signals.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/signals.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- signals.h 18 Aug 2003 10:08:26 -0000 1.2
+++ signals.h 19 Aug 2003 23:52:07 -0000 1.3
@@ -228,12 +228,18 @@
GaimCallback cb, va_list args, void *data, void **return_val);
void gaim_marshal_VOID__POINTER_POINTER_POINTER_POINTER(
GaimCallback cb, va_list args, void *data, void **return_val);
+void gaim_marshal_VOID__POINTER_POINTER_POINTER_UINT(
+ GaimCallback cb, va_list args, void *data, void **return_val);
void gaim_marshal_VOID__POINTER_POINTER_POINTER_UINT_UINT(
GaimCallback cb, va_list args, void *data, void **return_val);
void gaim_marshal_BOOLEAN__POINTER(
GaimCallback cb, va_list args, void *data, void **return_val);
void gaim_marshal_BOOLEAN__POINTER_POINTER(
+ GaimCallback cb, va_list args, void *data, void **return_val);
+void gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER(
+ GaimCallback cb, va_list args, void *data, void **return_val);
+void gaim_marshal_BOOLEAN__POINTER_POINTER_UINT(
GaimCallback cb, va_list args, void *data, void **return_val);
void gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_UINT(
GaimCallback cb, va_list args, void *data, void **return_val);
|