Mercurial > pidgin.yaz
comparison src/gtkconv.c @ 8319:a2c5537a814b
[gaim-migrate @ 9043]
This fixes the symbol collision, incorrect data types, lack of casting,
unused variables, and comments inside comments that were preventing the new
toolbar code from compiling in some cases here.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Mon, 23 Feb 2004 22:13:43 +0000 |
parents | 6f549c1d0829 |
children | 9dd7c75ed433 |
comparison
equal
deleted
inserted
replaced
8318:e45e19951e55 | 8319:a2c5537a814b |
---|---|
2279 gtk_widget_set_sensitive(gtkconv->u.chat->invite, | 2279 gtk_widget_set_sensitive(gtkconv->u.chat->invite, |
2280 (prpl_info->chat_invite != NULL)); | 2280 (prpl_info->chat_invite != NULL)); |
2281 } | 2281 } |
2282 | 2282 |
2283 /* Deal with the toolbar */ | 2283 /* Deal with the toolbar */ |
2284 /*gtk_widget_set_sensitive(gtkconv->toolbar.link, TRUE); | 2284 #if 0 |
2285 gtk_widget_set_sensitive(gtkconv->toolbar.link, TRUE); | |
2285 gtk_widget_set_sensitive(gtkconv->toolbar.image, | 2286 gtk_widget_set_sensitive(gtkconv->toolbar.image, |
2286 (prpl_info->options & OPT_PROTO_IM_IMAGE)); | 2287 (prpl_info->options & OPT_PROTO_IM_IMAGE)); |
2287 gtk_widget_set_sensitive(gtkconv->toolbar.bgcolor, | 2288 gtk_widget_set_sensitive(gtkconv->toolbar.bgcolor, |
2288 !(gc->flags & GAIM_CONNECTION_NO_BGCOLOR)); | 2289 !(gc->flags & GAIM_CONNECTION_NO_BGCOLOR)); |
2289 | 2290 |
2290 /* Deal with menu items | 2291 /* Deal with menu items */ |
2291 gtk_widget_set_sensitive(gtkwin->menu.view_log, TRUE); | 2292 gtk_widget_set_sensitive(gtkwin->menu.view_log, TRUE); |
2292 gtk_widget_set_sensitive(gtkwin->menu.add_pounce, TRUE); | 2293 gtk_widget_set_sensitive(gtkwin->menu.add_pounce, TRUE); |
2293 gtk_widget_set_sensitive(gtkwin->menu.get_info, (prpl_info->get_info != NULL)); | 2294 gtk_widget_set_sensitive(gtkwin->menu.get_info, (prpl_info->get_info != NULL)); |
2294 gtk_widget_set_sensitive(gtkwin->menu.warn, (prpl_info->warn != NULL)); | 2295 gtk_widget_set_sensitive(gtkwin->menu.warn, (prpl_info->warn != NULL)); |
2295 gtk_widget_set_sensitive(gtkwin->menu.invite, | 2296 gtk_widget_set_sensitive(gtkwin->menu.invite, |
2296 (prpl_info->chat_invite != NULL)); | 2297 (prpl_info->chat_invite != NULL)); |
2297 */ | 2298 #endif |
2299 | |
2298 if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) { | 2300 if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) { |
2299 if (gaim_find_buddy(gaim_conversation_get_account(conv), | 2301 if (gaim_find_buddy(gaim_conversation_get_account(conv), |
2300 gaim_conversation_get_name(conv)) == NULL) | 2302 gaim_conversation_get_name(conv)) == NULL) |
2301 gtk_widget_set_sensitive(gtkwin->menu.alias, FALSE); | 2303 gtk_widget_set_sensitive(gtkwin->menu.alias, FALSE); |
2302 else | 2304 else |
3738 if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck")) | 3740 if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck")) |
3739 gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(gtkconv->entry)); | 3741 gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(gtkconv->entry)); |
3740 | 3742 |
3741 gtk_container_add(GTK_CONTAINER(sw), GTK_WIDGET(gtkconv->entry)); | 3743 gtk_container_add(GTK_CONTAINER(sw), GTK_WIDGET(gtkconv->entry)); |
3742 gtk_widget_show(gtkconv->entry); | 3744 gtk_widget_show(gtkconv->entry); |
3743 gtk_imhtmltoolbar_attach(gtkconv->toolbar, gtkconv->entry); | 3745 gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(gtkconv->toolbar), |
3746 gtkconv->entry); | |
3744 | 3747 |
3745 gtkconv->bbox = gtk_hbox_new(FALSE, 6); | 3748 gtkconv->bbox = gtk_hbox_new(FALSE, 6); |
3746 gtk_box_pack_start(GTK_BOX(vbox2), gtkconv->bbox, FALSE, FALSE, 0); | 3749 gtk_box_pack_start(GTK_BOX(vbox2), gtkconv->bbox, FALSE, FALSE, 0); |
3747 gtk_widget_show(gtkconv->bbox); | 3750 gtk_widget_show(gtkconv->bbox); |
3748 | 3751 |