comparison: src/conversation.c
src/conversation.c
- changeset 1597
- 7fb8796b9b24
- parent 1596
- 75d9fb73637e
- child 1608
- feb3ef1d062b
equal
deleted
inserted
replaced
| 1596:75d9fb73637e | 1597:7fb8796b9b24 |
|---|---|
| 1438 | 1438 |
| 1439 if ((c->is_chat && (general_options & OPT_GEN_POPUP_CHAT)) || | 1439 if ((c->is_chat && (general_options & OPT_GEN_POPUP_CHAT)) || |
| 1440 (!c->is_chat && (general_options & OPT_GEN_POPUP_WINDOWS))) | 1440 (!c->is_chat && (general_options & OPT_GEN_POPUP_WINDOWS))) |
| 1441 gdk_window_show(c->window->window); | 1441 gdk_window_show(c->window->window); |
| 1442 | 1442 |
| 1443 if ((flags & WFLAG_RECV) && !c->is_chat && (display_options & OPT_DISP_ONE_WINDOW) && | 1443 if (((flags & WFLAG_RECV) || (flags & WFLAG_SYSTEM)) && !c->is_chat && |
| 1444 (gtk_notebook_get_current_page(GTK_NOTEBOOK(convo_notebook)) | 1444 (display_options & OPT_DISP_ONE_WINDOW) && |
| 1445 (gtk_notebook_get_current_page(GTK_NOTEBOOK(convo_notebook)) | |
| 1445 != g_list_index(conversations, c))) { | 1446 != g_list_index(conversations, c))) { |
| 1446 GtkWidget *label = gtk_notebook_get_tab_label(GTK_NOTEBOOK(convo_notebook), | 1447 GtkWidget *label = gtk_notebook_get_tab_label(GTK_NOTEBOOK(convo_notebook), |
| 1447 gtk_notebook_get_nth_page(GTK_NOTEBOOK(convo_notebook), | 1448 gtk_notebook_get_nth_page(GTK_NOTEBOOK(convo_notebook), |
| 1448 g_list_index(conversations, c))); | 1449 g_list_index(conversations, c))); |
| 1449 GtkStyle *style = gtk_style_new(); | 1450 GtkStyle *style = gtk_style_new(); |
| 1919 gtk_signal_connect(GTK_OBJECT(win), "delete_event", | 1920 gtk_signal_connect(GTK_OBJECT(win), "delete_event", |
| 1920 GTK_SIGNAL_FUNC(delete_all_convo), NULL); | 1921 GTK_SIGNAL_FUNC(delete_all_convo), NULL); |
| 1921 | 1922 |
| 1922 convo_notebook = gtk_notebook_new(); | 1923 convo_notebook = gtk_notebook_new(); |
| 1923 gtk_notebook_set_scrollable(GTK_NOTEBOOK(convo_notebook), TRUE); | 1924 gtk_notebook_set_scrollable(GTK_NOTEBOOK(convo_notebook), TRUE); |
| 1925 gtk_notebook_popup_enable(GTK_NOTEBOOK(convo_notebook)); | |
| 1924 gtk_container_add(GTK_CONTAINER(win), convo_notebook); | 1926 gtk_container_add(GTK_CONTAINER(win), convo_notebook); |
| 1925 gtk_signal_connect(GTK_OBJECT(convo_notebook), "switch-page", | 1927 gtk_signal_connect(GTK_OBJECT(convo_notebook), "switch-page", |
| 1926 GTK_SIGNAL_FUNC(convo_switch), NULL); | 1928 GTK_SIGNAL_FUNC(convo_switch), NULL); |
| 1927 gtk_widget_show(convo_notebook); | 1929 gtk_widget_show(convo_notebook); |
| 1928 } else | 1930 } else |
