Mercurial > pidgin.yaz

comparison src/gtkconv.c @ 11787:c9188d3eb9d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 14078] GtkMenuTray now set's it's minimum height to the height of GTK_ICON_SIZE_MENU. This removes the need for the blank menu item which ended up leaving an empty space when other items were added. committer: Tailor Script <tailor@pidgin.im>
author Gary Kramlich <grim@reaperworld.com>
date Mon, 24 Oct 2005 03:37:31 +0000
parents 8cb75ba77f9d
children a3c28707ef4d
comparison
equal deleted inserted replaced
11786:2c8216659a84 11787:c9188d3eb9d3
2512 win->menu.tray = gaim_gtk_menu_tray_new(); 2512 win->menu.tray = gaim_gtk_menu_tray_new();
2513 gtk_menu_shell_append(GTK_MENU_SHELL(win->menu.menubar), 2513 gtk_menu_shell_append(GTK_MENU_SHELL(win->menu.menubar),
2514 win->menu.tray); 2514 win->menu.tray);
2515 gtk_widget_show(win->menu.tray); 2515 gtk_widget_show(win->menu.tray);
2516 2516
2517 win->menu.typing_icon = gtk_image_new_from_stock(GAIM_STOCK_MENU_ICON_BLANK,
2518 GTK_ICON_SIZE_MENU);
2519 gtk_widget_show(win->menu.typing_icon);
2520 gaim_gtk_menu_tray_append(GAIM_GTK_MENU_TRAY(win->menu.tray),
2521 win->menu.typing_icon);
2522
2523 gtk_widget_show(win->menu.menubar); 2517 gtk_widget_show(win->menu.menubar);
2524 2518
2525 return win->menu.menubar; 2519 return win->menu.menubar;
2526 } 2520 }
2527 2521
2572 gtkwin = gtkconv->win; 2566 gtkwin = gtkconv->win;
2573 2567
2574 if(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) 2568 if(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
2575 im = GAIM_CONV_IM(conv); 2569 im = GAIM_CONV_IM(conv);
2576 2570
2571 if(gtkwin->menu.typing_icon) {
2572 gtk_widget_destroy(gtkwin->menu.typing_icon);
2573 gtkwin->menu.typing_icon = NULL;
2574 }
2575
2577 if(im && gaim_conv_im_get_typing_state(im) == GAIM_TYPING) { 2576 if(im && gaim_conv_im_get_typing_state(im) == GAIM_TYPING) {
2578 gtk_image_set_from_stock(GTK_IMAGE(gtkwin->menu.typing_icon), 2577 gtkwin->menu.typing_icon =
2579 GAIM_STOCK_TYPING, 2578 gtk_image_new_from_stock(GAIM_STOCK_TYPING, GTK_ICON_SIZE_MENU);
2580 GTK_ICON_SIZE_MENU);
2581 gtk_tooltips_set_tip(gtkconv->tooltips, gtkwin->menu.typing_icon, 2579 gtk_tooltips_set_tip(gtkconv->tooltips, gtkwin->menu.typing_icon,
2582 _("User is typing..."), NULL); 2580 _("User is typing..."), NULL);
2583 } else if(im && gaim_conv_im_get_typing_state(im) == GAIM_TYPED) { 2581 } else if(im && gaim_conv_im_get_typing_state(im) == GAIM_TYPED) {
2584 gtk_image_set_from_stock(GTK_IMAGE(gtkwin->menu.typing_icon), 2582 gtkwin->menu.typing_icon =
2585 GAIM_STOCK_TYPED, 2583 gtk_image_new_from_stock(GAIM_STOCK_TYPED, GTK_ICON_SIZE_MENU);
2586 GTK_ICON_SIZE_MENU);
2587 gtk_tooltips_set_tip(gtkconv->tooltips, gtkwin->menu.typing_icon, 2584 gtk_tooltips_set_tip(gtkconv->tooltips, gtkwin->menu.typing_icon,
2588 _("User has typed something and paused"), NULL); 2585 _("User has typed something and paused"), NULL);
2589 } else { 2586 }
2590 gtk_image_set_from_stock(GTK_IMAGE(gtkwin->menu.typing_icon), 2587
2591 GAIM_STOCK_MENU_ICON_BLANK, 2588 if(gtkwin->menu.typing_icon) {
2592 GTK_ICON_SIZE_MENU); 2589 gtk_widget_show(gtkwin->menu.typing_icon);
2593 gtk_tooltips_set_tip(gtkconv->tooltips, gtkwin->menu.typing_icon, 2590 gaim_gtk_menu_tray_append(GAIM_GTK_MENU_TRAY(gtkwin->menu.tray),
2594 "", NULL); 2591 gtkwin->menu.typing_icon);
2595 } 2592 }
2596 } 2593 }
2597 2594
2598 static gboolean 2595 static gboolean
2599 update_send_to_selection(GaimGtkWindow *win) 2596 update_send_to_selection(GaimGtkWindow *win)