comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- branch
- cpw.qulogic.gtk3
- changeset 32400
- e68ef2563a05
- parent 32394
- f883709bdba4
- child 32402
- 188ce0465fb6
equal
deleted
inserted
replaced
| 32399:b3e3ffc64d91 | 32400:e68ef2563a05 |
|---|---|
| 3577 | 3577 |
| 3578 win->menu.send_file = | 3578 win->menu.send_file = |
| 3579 gtk_ui_manager_get_action(win->menu.ui, | 3579 gtk_ui_manager_get_action(win->menu.ui, |
| 3580 "/Conversation/ConversationMenu/SendFile"); | 3580 "/Conversation/ConversationMenu/SendFile"); |
| 3581 | 3581 |
| 3582 g_object_set_data(G_OBJECT(win->window), "get_attention", | |
| 3583 gtk_ui_manager_get_action(win->menu.ui, | |
| 3584 "/Conversation/ConversationMenu/GetAttention")); | |
| 3585 | |
| 3582 win->menu.add_pounce = | 3586 win->menu.add_pounce = |
| 3583 gtk_ui_manager_get_action(win->menu.ui, | 3587 gtk_ui_manager_get_action(win->menu.ui, |
| 3584 "/Conversation/ConversationMenu/AddBuddyPounce"); | 3588 "/Conversation/ConversationMenu/AddBuddyPounce"); |
| 3585 | 3589 |
| 3586 /* --- */ | 3590 /* --- */ |
| 6610 /* Show stuff that applies to IMs, hide stuff that applies to chats */ | 6614 /* Show stuff that applies to IMs, hide stuff that applies to chats */ |
| 6611 | 6615 |
| 6612 /* Deal with menu items */ | 6616 /* Deal with menu items */ |
| 6613 gtk_action_set_visible(win->menu.view_log, TRUE); | 6617 gtk_action_set_visible(win->menu.view_log, TRUE); |
| 6614 gtk_action_set_visible(win->menu.send_file, TRUE); | 6618 gtk_action_set_visible(win->menu.send_file, TRUE); |
| 6615 gtk_action_set_visible(g_object_get_data(G_OBJECT(win->window), "get_attention"), TRUE); | 6619 gtk_action_set_visible(GTK_ACTION(g_object_get_data(G_OBJECT(win->window), "get_attention")), TRUE); |
| 6616 gtk_action_set_visible(win->menu.add_pounce, TRUE); | 6620 gtk_action_set_visible(win->menu.add_pounce, TRUE); |
| 6617 gtk_action_set_visible(win->menu.get_info, TRUE); | 6621 gtk_action_set_visible(win->menu.get_info, TRUE); |
| 6618 gtk_action_set_visible(win->menu.invite, FALSE); | 6622 gtk_action_set_visible(win->menu.invite, FALSE); |
| 6619 gtk_action_set_visible(win->menu.alias, TRUE); | 6623 gtk_action_set_visible(win->menu.alias, TRUE); |
| 6620 if (purple_privacy_check(account, purple_conversation_get_name(conv))) { | 6624 if (purple_privacy_check(account, purple_conversation_get_name(conv))) { |
| 9746 | 9750 |
| 9747 /* Reset the tabs label to the new version */ | 9751 /* Reset the tabs label to the new version */ |
| 9748 gtk_notebook_set_tab_label(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, ebox); | 9752 gtk_notebook_set_tab_label(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont, ebox); |
| 9749 } | 9753 } |
| 9750 | 9754 |
| 9751 g_object_set(G_OBJECT(win->notebook), "expand", !tabs_side && !angle, | 9755 g_object_set(G_OBJECT(win->notebook), "expand", !tabs_side && !angle, NULL); |
| 9752 "fill", TRUE, NULL); | |
| 9753 | 9756 |
| 9754 if (pidgin_conv_window_get_gtkconv_count(win) == 1) | 9757 if (pidgin_conv_window_get_gtkconv_count(win) == 1) |
| 9755 gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), | 9758 gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), |
| 9756 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs") && | 9759 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs") && |
| 9757 (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons") || | 9760 (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons") || |
