Mercurial > pidgin
comparison src/gtkconv.c @ 13233:f09c6e8df82c
[gaim-migrate @ 15598]
SF Patch #1417225 from Sadrul
This reworks the conversation signals.
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 11 Feb 2006 19:16:38 +0000 |
parents | 21ee457d479c |
children | 3de53fe8345f |
comparison
equal
deleted
inserted
replaced
13232:c9f536f771d0 | 13233:f09c6e8df82c |
---|---|
4620 | 4620 |
4621 displaying = g_strdup(message); | 4621 displaying = g_strdup(message); |
4622 plugin_return = GPOINTER_TO_INT(gaim_signal_emit_return_1( | 4622 plugin_return = GPOINTER_TO_INT(gaim_signal_emit_return_1( |
4623 gaim_gtk_conversations_get_handle(), (type == GAIM_CONV_TYPE_IM ? | 4623 gaim_gtk_conversations_get_handle(), (type == GAIM_CONV_TYPE_IM ? |
4624 "displaying-im-msg" : "displaying-chat-msg"), | 4624 "displaying-im-msg" : "displaying-chat-msg"), |
4625 account, conv, &displaying, flags)); | 4625 account, name, &displaying, conv, flags)); |
4626 if (plugin_return) | 4626 if (plugin_return) |
4627 { | 4627 { |
4628 g_free(displaying); | 4628 g_free(displaying); |
4629 return; | 4629 return; |
4630 } | 4630 } |
4914 gtkconv_set_unseen(gtkconv, unseen); | 4914 gtkconv_set_unseen(gtkconv, unseen); |
4915 } | 4915 } |
4916 | 4916 |
4917 gaim_signal_emit(gaim_gtk_conversations_get_handle(), | 4917 gaim_signal_emit(gaim_gtk_conversations_get_handle(), |
4918 (type == GAIM_CONV_TYPE_IM ? "displayed-im-msg" : "displayed-chat-msg"), | 4918 (type == GAIM_CONV_TYPE_IM ? "displayed-im-msg" : "displayed-chat-msg"), |
4919 account, conv, message, flags); | 4919 account, name, message, conv, flags); |
4920 g_free(displaying); | 4920 g_free(displaying); |
4921 } | 4921 } |
4922 | 4922 |
4923 static void | 4923 static void |
4924 gaim_gtkconv_chat_add_users(GaimConversation *conv, GList *users, GList *flags, GList *aliases, gboolean new_arrivals) | 4924 gaim_gtkconv_chat_add_users(GaimConversation *conv, GList *users, GList *flags, GList *aliases, gboolean new_arrivals) |
5841 GDK_INTERP_BILINEAR); | 5841 GDK_INTERP_BILINEAR); |
5842 | 5842 |
5843 gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 100); | 5843 gdk_pixbuf_render_pixmap_and_mask(scale, &pm, &bm, 100); |
5844 g_object_unref(G_OBJECT(scale)); | 5844 g_object_unref(G_OBJECT(scale)); |
5845 | 5845 |
5846 | |
5847 gtkconv->u.im->icon_container = gtk_vbox_new(FALSE, 0); | 5846 gtkconv->u.im->icon_container = gtk_vbox_new(FALSE, 0); |
5848 | 5847 |
5849 frame = gtk_frame_new(NULL); | 5848 frame = gtk_frame_new(NULL); |
5850 gtk_frame_set_shadow_type(GTK_FRAME(frame), | 5849 gtk_frame_set_shadow_type(GTK_FRAME(frame), |
5851 (bm ? GTK_SHADOW_NONE : GTK_SHADOW_IN)); | 5850 (bm ? GTK_SHADOW_NONE : GTK_SHADOW_IN)); |
5873 | 5872 |
5874 gtk_widget_show(gtkconv->u.im->icon_container); | 5873 gtk_widget_show(gtkconv->u.im->icon_container); |
5875 gtk_widget_show(frame); | 5874 gtk_widget_show(frame); |
5876 | 5875 |
5877 /* The buddy icon code needs badly to be fixed. */ | 5876 /* The buddy icon code needs badly to be fixed. */ |
5878 buf = gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim); | |
5879 if(gaim_gtk_conv_window_is_active_conversation(conv)) | 5877 if(gaim_gtk_conv_window_is_active_conversation(conv)) |
5878 { | |
5879 buf = gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim); | |
5880 gtk_window_set_icon(GTK_WINDOW(win->window), buf); | 5880 gtk_window_set_icon(GTK_WINDOW(win->window), buf); |
5881 } | |
5881 } | 5882 } |
5882 | 5883 |
5883 void | 5884 void |
5884 gaim_gtkconv_update_buttons_by_protocol(GaimConversation *conv) | 5885 gaim_gtkconv_update_buttons_by_protocol(GaimConversation *conv) |
5885 { | 5886 { |
6462 gaim_value_new(GAIM_TYPE_SUBTYPE, | 6463 gaim_value_new(GAIM_TYPE_SUBTYPE, |
6463 GAIM_SUBTYPE_CONVERSATION), | 6464 GAIM_SUBTYPE_CONVERSATION), |
6464 gaim_value_new(GAIM_TYPE_POINTER)); | 6465 gaim_value_new(GAIM_TYPE_POINTER)); |
6465 | 6466 |
6466 gaim_signal_register(handle, "displaying-im-msg", | 6467 gaim_signal_register(handle, "displaying-im-msg", |
6467 gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_UINT, | 6468 gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, |
6468 gaim_value_new(GAIM_TYPE_BOOLEAN), 4, | 6469 gaim_value_new(GAIM_TYPE_BOOLEAN), 5, |
6469 gaim_value_new(GAIM_TYPE_SUBTYPE, | 6470 gaim_value_new(GAIM_TYPE_SUBTYPE, |
6470 GAIM_SUBTYPE_ACCOUNT), | 6471 GAIM_SUBTYPE_ACCOUNT), |
6472 gaim_value_new(GAIM_TYPE_STRING), | |
6473 gaim_value_new_outgoing(GAIM_TYPE_STRING), | |
6471 gaim_value_new(GAIM_TYPE_SUBTYPE, | 6474 gaim_value_new(GAIM_TYPE_SUBTYPE, |
6472 GAIM_SUBTYPE_CONVERSATION), | 6475 GAIM_SUBTYPE_CONVERSATION), |
6473 gaim_value_new_outgoing(GAIM_TYPE_STRING), | 6476 gaim_value_new(GAIM_TYPE_INT)); |
6474 gaim_value_new(G_TYPE_INT)); | |
6475 | 6477 |
6476 gaim_signal_register(handle, "displayed-im-msg", | 6478 gaim_signal_register(handle, "displayed-im-msg", |
6477 gaim_marshal_VOID__POINTER_POINTER_POINTER_UINT, | 6479 gaim_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, |
6478 NULL, 4, | 6480 NULL, 5, |
6479 gaim_value_new(GAIM_TYPE_SUBTYPE, | 6481 gaim_value_new(GAIM_TYPE_SUBTYPE, |
6480 GAIM_SUBTYPE_ACCOUNT), | 6482 GAIM_SUBTYPE_ACCOUNT), |
6483 gaim_value_new(GAIM_TYPE_STRING), | |
6484 gaim_value_new(GAIM_TYPE_STRING), | |
6481 gaim_value_new(GAIM_TYPE_SUBTYPE, | 6485 gaim_value_new(GAIM_TYPE_SUBTYPE, |
6482 GAIM_SUBTYPE_CONVERSATION), | 6486 GAIM_SUBTYPE_CONVERSATION), |
6483 gaim_value_new(GAIM_TYPE_STRING), | 6487 gaim_value_new(GAIM_TYPE_INT)); |
6484 gaim_value_new(G_TYPE_INT)); | |
6485 | 6488 |
6486 gaim_signal_register(handle, "displaying-chat-msg", | 6489 gaim_signal_register(handle, "displaying-chat-msg", |
6487 gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_UINT, | 6490 gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, |
6488 gaim_value_new(GAIM_TYPE_BOOLEAN), 4, | 6491 gaim_value_new(GAIM_TYPE_BOOLEAN), 5, |
6489 gaim_value_new(GAIM_TYPE_SUBTYPE, | 6492 gaim_value_new(GAIM_TYPE_SUBTYPE, |
6490 GAIM_SUBTYPE_ACCOUNT), | 6493 GAIM_SUBTYPE_ACCOUNT), |
6494 gaim_value_new(GAIM_TYPE_STRING), | |
6495 gaim_value_new_outgoing(GAIM_TYPE_STRING), | |
6491 gaim_value_new(GAIM_TYPE_SUBTYPE, | 6496 gaim_value_new(GAIM_TYPE_SUBTYPE, |
6492 GAIM_SUBTYPE_CONVERSATION), | 6497 GAIM_SUBTYPE_CONVERSATION), |
6493 gaim_value_new_outgoing(GAIM_TYPE_STRING), | 6498 gaim_value_new(GAIM_TYPE_INT)); |
6494 gaim_value_new(G_TYPE_INT)); | |
6495 | 6499 |
6496 gaim_signal_register(handle, "displayed-chat-msg", | 6500 gaim_signal_register(handle, "displayed-chat-msg", |
6497 gaim_marshal_VOID__POINTER_POINTER_POINTER_UINT, | 6501 gaim_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, |
6498 NULL, 4, | 6502 NULL, 5, |
6499 gaim_value_new(GAIM_TYPE_SUBTYPE, | 6503 gaim_value_new(GAIM_TYPE_SUBTYPE, |
6500 GAIM_SUBTYPE_ACCOUNT), | 6504 GAIM_SUBTYPE_ACCOUNT), |
6505 gaim_value_new(GAIM_TYPE_STRING), | |
6506 gaim_value_new(GAIM_TYPE_STRING), | |
6501 gaim_value_new(GAIM_TYPE_SUBTYPE, | 6507 gaim_value_new(GAIM_TYPE_SUBTYPE, |
6502 GAIM_SUBTYPE_CONVERSATION), | 6508 GAIM_SUBTYPE_CONVERSATION), |
6503 gaim_value_new(GAIM_TYPE_STRING), | 6509 gaim_value_new(GAIM_TYPE_INT)); |
6504 gaim_value_new(G_TYPE_INT)); | |
6505 | 6510 |
6506 gaim_signal_register(handle, "conversation-switched", | 6511 gaim_signal_register(handle, "conversation-switched", |
6507 gaim_marshal_VOID__POINTER_POINTER, NULL, 1, | 6512 gaim_marshal_VOID__POINTER_POINTER, NULL, 1, |
6508 gaim_value_new(GAIM_TYPE_SUBTYPE, | 6513 gaim_value_new(GAIM_TYPE_SUBTYPE, |
6509 GAIM_SUBTYPE_CONVERSATION)); | 6514 GAIM_SUBTYPE_CONVERSATION)); |