comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- branch
- cpw.qulogic.gtk3
- changeset 32907
- aeb18e260785
- parent 32905
- 5a0d150931dd
- child 32909
- 9f72435c0950
equal
deleted
inserted
replaced
| 32906:0256335d1557 | 32907:aeb18e260785 |
|---|---|
| 1144 | 1144 |
| 1145 cursor = gdk_cursor_new(GDK_WATCH); | 1145 cursor = gdk_cursor_new(GDK_WATCH); |
| 1146 gdk_window_set_cursor(gtkblist->window->window, cursor); | 1146 gdk_window_set_cursor(gtkblist->window->window, cursor); |
| 1147 gdk_window_set_cursor(win->window->window, cursor); | 1147 gdk_window_set_cursor(win->window->window, cursor); |
| 1148 gdk_cursor_unref(cursor); | 1148 gdk_cursor_unref(cursor); |
| 1149 #if GTK_CHECK_VERSION(2,4,0) && !GTK_CHECK_VERSION(2,6,0) //FIXME: What? | |
| 1150 gdk_display_flush(gdk_drawable_get_display(GDK_DRAWABLE(widget->window))); | |
| 1151 #endif | |
| 1152 | 1149 |
| 1153 name = purple_conversation_get_name(conv); | 1150 name = purple_conversation_get_name(conv); |
| 1154 account = purple_conversation_get_account(conv); | 1151 account = purple_conversation_get_account(conv); |
| 1155 | 1152 |
| 1156 buddies = purple_find_buddies(account, name); | 1153 buddies = purple_find_buddies(account, name); |
| 3465 regenerate_options_items(PidginWindow *win) | 3462 regenerate_options_items(PidginWindow *win) |
| 3466 { | 3463 { |
| 3467 GtkWidget *menu; | 3464 GtkWidget *menu; |
| 3468 PidginConversation *gtkconv; | 3465 PidginConversation *gtkconv; |
| 3469 GList *list; | 3466 GList *list; |
| 3470 #if GTK_CHECK_VERSION(2,6,0) | |
| 3471 GtkWidget *more_menu; | 3467 GtkWidget *more_menu; |
| 3472 | 3468 |
| 3473 gtkconv = pidgin_conv_window_get_active_gtkconv(win); | 3469 gtkconv = pidgin_conv_window_get_active_gtkconv(win); |
| 3474 more_menu = gtk_ui_manager_get_widget(win->menu.ui, | 3470 more_menu = gtk_ui_manager_get_widget(win->menu.ui, |
| 3475 "/Conversation/ConversationMenu/MoreMenu"); | 3471 "/Conversation/ConversationMenu/MoreMenu"); |
| 3476 gtk_widget_show(more_menu); | 3472 gtk_widget_show(more_menu); |
| 3477 menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(more_menu)); | 3473 menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(more_menu)); |
| 3478 #else | |
| 3479 gtkconv = pidgin_conv_window_get_active_gtkconv(win); | |
| 3480 menu = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/More")); | |
| 3481 #endif | |
| 3482 | 3474 |
| 3483 /* Remove the previous entries */ | 3475 /* Remove the previous entries */ |
| 3484 for (list = gtk_container_get_children(GTK_CONTAINER(menu)); list; ) | 3476 for (list = gtk_container_get_children(GTK_CONTAINER(menu)); list; ) |
| 3485 { | 3477 { |
| 3486 GtkWidget *w = list->data; | 3478 GtkWidget *w = list->data; |
| 3532 G_CALLBACK(remove_from_list), win); | 3524 G_CALLBACK(remove_from_list), win); |
| 3533 gtk_widget_destroy(action_items->data); | 3525 gtk_widget_destroy(action_items->data); |
| 3534 action_items = g_list_delete_link(action_items, action_items); | 3526 action_items = g_list_delete_link(action_items, action_items); |
| 3535 } | 3527 } |
| 3536 | 3528 |
| 3537 #if GTK_CHECK_VERSION(2,6,0) | |
| 3538 item = gtk_ui_manager_get_widget(win->menu.ui, "/Conversation/OptionsMenu"); | 3529 item = gtk_ui_manager_get_widget(win->menu.ui, "/Conversation/OptionsMenu"); |
| 3539 menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(item)); | 3530 menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(item)); |
| 3540 #else | |
| 3541 menu = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Options")); | |
| 3542 #endif | |
| 3543 | 3531 |
| 3544 list = purple_conversation_get_extended_menu(conv); | 3532 list = purple_conversation_get_extended_menu(conv); |
| 3545 if (list) { | 3533 if (list) { |
| 3546 action_items = g_list_prepend(NULL, (item = pidgin_separator(menu))); | 3534 action_items = g_list_prepend(NULL, (item = pidgin_separator(menu))); |
| 3547 g_signal_connect(G_OBJECT(item), "destroy", G_CALLBACK(remove_from_list), win); | 3535 g_signal_connect(G_OBJECT(item), "destroy", G_CALLBACK(remove_from_list), win); |
| 10128 { | 10116 { |
| 10129 unsigned int index; | 10117 unsigned int index; |
| 10130 | 10118 |
| 10131 index = gtk_notebook_page_num(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont); | 10119 index = gtk_notebook_page_num(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont); |
| 10132 | 10120 |
| 10133 #if GTK_CHECK_VERSION(2,10,0) | |
| 10134 g_object_ref_sink(G_OBJECT(gtkconv->tab_cont)); | 10121 g_object_ref_sink(G_OBJECT(gtkconv->tab_cont)); |
| 10135 #else | |
| 10136 g_object_ref(gtkconv->tab_cont); | |
| 10137 gtk_object_sink(GTK_OBJECT(gtkconv->tab_cont)); | |
| 10138 #endif | |
| 10139 | 10122 |
| 10140 gtk_notebook_remove_page(GTK_NOTEBOOK(win->notebook), index); | 10123 gtk_notebook_remove_page(GTK_NOTEBOOK(win->notebook), index); |
| 10141 | 10124 |
| 10142 win->gtkconvs = g_list_remove(win->gtkconvs, gtkconv); | 10125 win->gtkconvs = g_list_remove(win->gtkconvs, gtkconv); |
| 10143 | 10126 |
