comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- changeset 20623
- bc3d2a1eb54a
- parent 20422
- 49be7bdacd56
- parent 20622
- 30e148be3e2c
- child 20818
- 2f1201e67666
equal
deleted
inserted
replaced
| 20423:6fe2af91fac4 | 20623:bc3d2a1eb54a |
|---|---|
| 3632 | 3632 |
| 3633 if (win->menu.send_to != NULL) | 3633 if (win->menu.send_to != NULL) |
| 3634 gtk_widget_destroy(win->menu.send_to); | 3634 gtk_widget_destroy(win->menu.send_to); |
| 3635 | 3635 |
| 3636 /* Build the Send To menu */ | 3636 /* Build the Send To menu */ |
| 3637 win->menu.send_to = gtk_menu_item_new_with_mnemonic(_("_Send To")); | 3637 win->menu.send_to = gtk_menu_item_new_with_mnemonic(_("S_end To")); |
| 3638 gtk_widget_show(win->menu.send_to); | 3638 gtk_widget_show(win->menu.send_to); |
| 3639 | 3639 |
| 3640 menu = gtk_menu_new(); | 3640 menu = gtk_menu_new(); |
| 3641 gtk_menu_shell_insert(GTK_MENU_SHELL(win->menu.menubar), | 3641 gtk_menu_shell_insert(GTK_MENU_SHELL(win->menu.menubar), |
| 3642 win->menu.send_to, 2); | 3642 win->menu.send_to, 2); |
| 7239 * one of the contacts containing the buddy corresponding to | 7239 * one of the contacts containing the buddy corresponding to |
| 7240 * a conversation. It's easier to just update them all. */ | 7240 * a conversation. It's easier to just update them all. */ |
| 7241 /* if (purple_conversation_get_account(conv) == account) */ | 7241 /* if (purple_conversation_get_account(conv) == account) */ |
| 7242 pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON | | 7242 pidgin_conv_update_fields(conv, PIDGIN_CONV_TAB_ICON | |
| 7243 PIDGIN_CONV_MENU | PIDGIN_CONV_COLORIZE_TITLE); | 7243 PIDGIN_CONV_MENU | PIDGIN_CONV_COLORIZE_TITLE); |
| 7244 | |
| 7245 if (PURPLE_CONNECTION_IS_CONNECTED(gc) && | |
| 7246 conv->type == PURPLE_CONV_TYPE_CHAT && | |
| 7247 conv->account == gc->account && | |
| 7248 purple_conversation_get_data(conv, "want-to-rejoin")) { | |
| 7249 GHashTable *comps = NULL; | |
| 7250 PurpleChat *chat = purple_blist_find_chat(conv->account, conv->name); | |
| 7251 if (chat == NULL) { | |
| 7252 if (PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults != NULL) | |
| 7253 comps = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl)->chat_info_defaults(gc, conv->name); | |
| 7254 } else { | |
| 7255 comps = chat->components; | |
| 7256 } | |
| 7257 serv_join_chat(gc, comps); | |
| 7258 if (chat == NULL && comps != NULL) | |
| 7259 g_hash_table_destroy(comps); | |
| 7260 } | |
| 7244 } | 7261 } |
| 7245 } | 7262 } |
| 7246 | 7263 |
| 7247 static gboolean | 7264 static gboolean |
| 7248 update_buddy_status_timeout(PurpleBuddy *buddy) | 7265 update_buddy_status_timeout(PurpleBuddy *buddy) |
| 8146 GtkWidget *menu = gtk_menu_new(), *sub; | 8163 GtkWidget *menu = gtk_menu_new(), *sub; |
| 8147 gboolean populated = populate_menu_with_options(menu, gtkconv, TRUE); | 8164 gboolean populated = populate_menu_with_options(menu, gtkconv, TRUE); |
| 8148 sub = gtk_menu_item_get_submenu(GTK_MENU_ITEM(gtkconv->win->menu.send_to)); | 8165 sub = gtk_menu_item_get_submenu(GTK_MENU_ITEM(gtkconv->win->menu.send_to)); |
| 8149 | 8166 |
| 8150 if (sub && GTK_WIDGET_IS_SENSITIVE(gtkconv->win->menu.send_to)) { | 8167 if (sub && GTK_WIDGET_IS_SENSITIVE(gtkconv->win->menu.send_to)) { |
| 8151 GtkWidget *item = gtk_menu_item_new_with_mnemonic(_("_Send To")); | 8168 GtkWidget *item = gtk_menu_item_new_with_mnemonic(_("S_end To")); |
| 8152 if (populated) | 8169 if (populated) |
| 8153 pidgin_separator(menu); | 8170 pidgin_separator(menu); |
| 8154 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); | 8171 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); |
| 8155 gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), sub); | 8172 gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), sub); |
| 8156 gtk_widget_show(item); | 8173 gtk_widget_show(item); |
| 9817 } | 9834 } |
| 9818 | 9835 |
| 9819 return colors; | 9836 return colors; |
| 9820 } | 9837 } |
| 9821 | 9838 |
| 9839 |
