Mercurial > pidgin.yaz

comparison src/gtkconv.c @ 10359:242b5482910e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 11577] leak & compile warning fixes, and death-to-extra-typing-notification-pixels from Gary. I noticed we were installing core header files twice, so now we don't. committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 13 Dec 2004 14:58:33 +0000
parents 393750603513
children f608b72a7611
comparison
equal deleted inserted replaced
10358:524674a4f6bb 10359:242b5482910e
2922 if(gtkwin->menu.typing_icon) { 2922 if(gtkwin->menu.typing_icon) {
2923 gtk_widget_destroy(gtkwin->menu.typing_icon); 2923 gtk_widget_destroy(gtkwin->menu.typing_icon);
2924 gtkwin->menu.typing_icon = NULL; 2924 gtkwin->menu.typing_icon = NULL;
2925 } 2925 }
2926 if(im && gaim_conv_im_get_typing_state(im) == GAIM_TYPING) { 2926 if(im && gaim_conv_im_get_typing_state(im) == GAIM_TYPING) {
2927 gtkwin->menu.typing_icon = gtk_image_menu_item_new(); 2927 gtkwin->menu.typing_icon = gtk_image_new_from_stock(GAIM_STOCK_TYPING,
2928 gtk_image_menu_item_set_image( 2928 GTK_ICON_SIZE_MENU);
2929 GTK_IMAGE_MENU_ITEM(gtkwin->menu.typing_icon),
2930 gtk_image_new_from_stock(GAIM_STOCK_TYPING,
2931 GTK_ICON_SIZE_MENU));
2932 gtk_tooltips_set_tip(gtkconv->tooltips, gtkwin->menu.typing_icon, 2929 gtk_tooltips_set_tip(gtkconv->tooltips, gtkwin->menu.typing_icon,
2933 _("User is typing..."), NULL); 2930 _("User is typing..."), NULL);
2934 } else if(im && gaim_conv_im_get_typing_state(im) == GAIM_TYPED) { 2931 } else if(im && gaim_conv_im_get_typing_state(im) == GAIM_TYPED) {
2935 gtkwin->menu.typing_icon = gtk_image_menu_item_new(); 2932 gtkwin->menu.typing_icon = gtk_image_new_from_stock(GAIM_STOCK_TYPED,
2936 gtk_image_menu_item_set_image( 2933 GTK_ICON_SIZE_MENU);
2937 GTK_IMAGE_MENU_ITEM(gtkwin->menu.typing_icon),
2938 gtk_image_new_from_stock(GAIM_STOCK_TYPED,
2939 GTK_ICON_SIZE_MENU));
2940 gtk_tooltips_set_tip(gtkconv->tooltips, gtkwin->menu.typing_icon, 2934 gtk_tooltips_set_tip(gtkconv->tooltips, gtkwin->menu.typing_icon,
2941 _("User has typed something and paused"), NULL); 2935 _("User has typed something and paused"), NULL);
2942 } 2936 }
2943 2937
2944 if(gtkwin->menu.typing_icon) { 2938 if(gtkwin->menu.typing_icon) {
2945 gtk_menu_item_set_right_justified( 2939 gtk_widget_show(gtkwin->menu.typing_icon);
2946 GTK_MENU_ITEM(gtkwin->menu.typing_icon), TRUE); 2940 gtk_box_pack_end(GTK_BOX(gtkwin->menu.menubox), gtkwin->menu.typing_icon,
2947 gtk_widget_show_all(gtkwin->menu.typing_icon); 2941 FALSE, FALSE, 0);
2948 gtk_menu_shell_append(GTK_MENU_SHELL(gtkwin->menu.menubar),
2949 gtkwin->menu.typing_icon);
2950 } 2942 }
2951 } 2943 }
2952 2944
2953 static gboolean 2945 static gboolean
2954 update_send_as_selection(GaimConvWindow *win) 2946 update_send_as_selection(GaimConvWindow *win)
3563 static GtkWidget * 3555 static GtkWidget *
3564 setup_menubar(GaimConvWindow *win) 3556 setup_menubar(GaimConvWindow *win)
3565 { 3557 {
3566 GaimGtkWindow *gtkwin; 3558 GaimGtkWindow *gtkwin;
3567 GtkAccelGroup *accel_group; 3559 GtkAccelGroup *accel_group;
3560 GtkWidget *box_item;
3561
3568 gtkwin = GAIM_GTK_WINDOW(win); 3562 gtkwin = GAIM_GTK_WINDOW(win);
3569 3563
3570 accel_group = gtk_accel_group_new (); 3564 accel_group = gtk_accel_group_new ();
3571 gtk_window_add_accel_group (GTK_WINDOW (gtkwin->window), accel_group); 3565 gtk_window_add_accel_group (GTK_WINDOW (gtkwin->window), accel_group);
3572 g_object_unref (accel_group); 3566 g_object_unref (accel_group);
3657 gtkwin->menu.show_timestamps = 3651 gtkwin->menu.show_timestamps =
3658 gtk_item_factory_get_widget(gtkwin->menu.item_factory, 3652 gtk_item_factory_get_widget(gtkwin->menu.item_factory,
3659 N_("/Options/Show Timestamps")); 3653 N_("/Options/Show Timestamps"));
3660 3654
3661 generate_send_as_items(win, NULL); 3655 generate_send_as_items(win, NULL);
3656
3657 box_item = gtk_menu_item_new();
3658 gtk_menu_item_set_right_justified(GTK_MENU_ITEM(box_item), TRUE);
3659 gtk_menu_shell_append(GTK_MENU_SHELL(gtkwin->menu.menubar), box_item);
3660 gtk_widget_show(box_item);
3661
3662 gtkwin->menu.menubox = gtk_hbox_new(FALSE, 0);
3663 gtk_container_add(GTK_CONTAINER(box_item), gtkwin->menu.menubox);
3664 gtk_widget_show(gtkwin->menu.menubox);
3662 3665
3663 gtk_widget_show(gtkwin->menu.menubar); 3666 gtk_widget_show(gtkwin->menu.menubar);
3664 3667
3665 return gtkwin->menu.menubar; 3668 return gtkwin->menu.menubar;
3666 } 3669 }