Mercurial > pidgin.yaz
comparison src/gtkconv.c @ 4515:9b9737a00a96
[gaim-migrate @ 4793]
The "Hide Icon" on a buddy icon right-click shouldn't crash gaim anymore.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Tue, 04 Feb 2003 07:49:25 +0000 |
parents | adb0245e1dfc |
children | e5b024352f9e |
comparison
equal
deleted
inserted
replaced
4514:7521e29658bc | 4515:9b9737a00a96 |
---|---|
3721 conv->history = g_string_append(conv->history, buf); | 3721 conv->history = g_string_append(conv->history, buf); |
3722 conv->history = g_string_append(conv->history, "<BR>\n"); | 3722 conv->history = g_string_append(conv->history, "<BR>\n"); |
3723 } | 3723 } |
3724 | 3724 |
3725 if (!(flags & WFLAG_NOLOG) && gaim_conversation_is_logging(conv)) { | 3725 if (!(flags & WFLAG_NOLOG) && gaim_conversation_is_logging(conv)) { |
3726 /* | |
3727 XXX | |
3728 ((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT && | |
3729 (logging_options & OPT_LOG_CHATS)) || | |
3730 (gaim_conversation_get_type(conv) == GAIM_CONV_IM && | |
3731 (logging_options & OPT_LOG_CONVOS)) || | |
3732 find_log_info(gaim_conversation_get_name(conv)))) { | |
3733 */ | |
3734 | 3726 |
3735 char *t1; | 3727 char *t1; |
3736 char nm[256]; | 3728 char nm[256]; |
3737 | 3729 |
3738 if (logging_options & OPT_LOG_STRIP_HTML) | 3730 if (logging_options & OPT_LOG_STRIP_HTML) |
3885 g_free(t2); | 3877 g_free(t2); |
3886 } | 3878 } |
3887 | 3879 |
3888 /* XXX This needs to be updated for the new length argument. */ | 3880 /* XXX This needs to be updated for the new length argument. */ |
3889 if (gaim_conversation_is_logging(conv)) { | 3881 if (gaim_conversation_is_logging(conv)) { |
3890 /* | |
3891 XXX | |
3892 if ((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT && | |
3893 (logging_options & OPT_LOG_CHATS)) || | |
3894 (gaim_conversation_get_type(conv) == GAIM_CONV_IM && | |
3895 (logging_options & OPT_LOG_CONVOS)) || | |
3896 find_log_info(gaim_conversation_get_name(conv))) { | |
3897 */ | |
3898 | |
3899 char *t1, *t2; | 3882 char *t1, *t2; |
3900 char nm[256]; | 3883 char nm[256]; |
3901 | 3884 |
3902 if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) | 3885 if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) |
3903 g_snprintf(nm, sizeof(nm), "%s.chat", | 3886 g_snprintf(nm, sizeof(nm), "%s.chat", |
4442 gtk_widget_show(button); | 4425 gtk_widget_show(button); |
4443 } | 4426 } |
4444 | 4427 |
4445 button = gtk_menu_item_new_with_label(_("Hide Icon")); | 4428 button = gtk_menu_item_new_with_label(_("Hide Icon")); |
4446 g_signal_connect_swapped(GTK_OBJECT(button), "activate", | 4429 g_signal_connect_swapped(GTK_OBJECT(button), "activate", |
4447 G_CALLBACK(remove_icon), conv); | 4430 G_CALLBACK(remove_icon), gtkconv); |
4448 gtk_menu_shell_append(GTK_MENU_SHELL(menu), button); | 4431 gtk_menu_shell_append(GTK_MENU_SHELL(menu), button); |
4449 gtk_widget_show(button); | 4432 gtk_widget_show(button); |
4450 | 4433 |
4451 button = gtk_menu_item_new_with_label(_("Save Icon As...")); | 4434 button = gtk_menu_item_new_with_label(_("Save Icon As...")); |
4452 g_signal_connect(GTK_OBJECT(button), "activate", | 4435 g_signal_connect(GTK_OBJECT(button), "activate", |