Mercurial > pidgin.yaz
comparison src/gtkconv.c @ 8329:9dd7c75ed433
[gaim-migrate @ 9053]
Handle the display of the formatting toolbar correctly. Only the first tab
was getting a toolbar. Now it should work for all conversations.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Tue, 24 Feb 2004 04:27:58 +0000 |
| parents | a2c5537a814b |
| children | 80915fd16349 |
comparison
equal
deleted
inserted
replaced
| 8328:645a3d07ee45 | 8329:9dd7c75ed433 |
|---|---|
| 270 GaimGtkConversation *gtkconv; | 270 GaimGtkConversation *gtkconv; |
| 271 char *buf; | 271 char *buf; |
| 272 GaimConnection *gc = gaim_conversation_get_gc(conv); | 272 GaimConnection *gc = gaim_conversation_get_gc(conv); |
| 273 | 273 |
| 274 gtkconv = GAIM_GTK_CONVERSATION(conv); | 274 gtkconv = GAIM_GTK_CONVERSATION(conv); |
| 275 | 275 |
| 276 if (gc && gc->flags & GAIM_CONNECTION_HTML) | 276 if (gc && gc->flags & GAIM_CONNECTION_HTML) |
| 277 buf = gtk_imhtml_get_markup(GTK_IMHTML(gtkconv->entry)); | 277 buf = gtk_imhtml_get_markup(GTK_IMHTML(gtkconv->entry)); |
| 278 else | 278 else |
| 279 buf = gtk_imhtml_get_text(GTK_IMHTML(gtkconv->entry)); | 279 buf = gtk_imhtml_get_text(GTK_IMHTML(gtkconv->entry)); |
| 280 | 280 |
| 4062 | 4062 |
| 4063 gtkconv->make_sound = TRUE; | 4063 gtkconv->make_sound = TRUE; |
| 4064 | 4064 |
| 4065 gtkconv->show_formatting_toolbar = gaim_prefs_get_bool( | 4065 gtkconv->show_formatting_toolbar = gaim_prefs_get_bool( |
| 4066 "/gaim/gtk/conversations/show_formatting_toolbar"); | 4066 "/gaim/gtk/conversations/show_formatting_toolbar"); |
| 4067 | |
| 4068 if (gtkconv->show_formatting_toolbar) | |
| 4069 gtk_widget_show(gtkconv->toolbar); | |
| 4067 | 4070 |
| 4068 g_signal_connect_swapped(G_OBJECT(pane), "focus", | 4071 g_signal_connect_swapped(G_OBJECT(pane), "focus", |
| 4069 G_CALLBACK(gtk_widget_grab_focus), | 4072 G_CALLBACK(gtk_widget_grab_focus), |
| 4070 gtkconv->entry); | 4073 gtkconv->entry); |
| 4071 } | 4074 } |