diff src/gtkconv.c @ 10359:242b5482910e

[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 <[e-mail]>

--- a/src/gtkconv.c	Mon Dec 13 06:29:45 2004 +0000
+++ b/src/gtkconv.c	Mon Dec 13 14:58:33 2004 +0000
@@ -2924,29 +2924,21 @@
 		gtkwin->menu.typing_icon = NULL;
 	}
 	if(im && gaim_conv_im_get_typing_state(im) == GAIM_TYPING) {
-		gtkwin->menu.typing_icon = gtk_image_menu_item_new();
-		gtk_image_menu_item_set_image(
-				GTK_IMAGE_MENU_ITEM(gtkwin->menu.typing_icon),
-				gtk_image_new_from_stock(GAIM_STOCK_TYPING,
-					GTK_ICON_SIZE_MENU));
+		gtkwin->menu.typing_icon = gtk_image_new_from_stock(GAIM_STOCK_TYPING,
+															GTK_ICON_SIZE_MENU);
 		gtk_tooltips_set_tip(gtkconv->tooltips, gtkwin->menu.typing_icon,
 				_("User is typing..."), NULL);
 	} else if(im && gaim_conv_im_get_typing_state(im) == GAIM_TYPED) {
-		gtkwin->menu.typing_icon = gtk_image_menu_item_new();
-		gtk_image_menu_item_set_image(
-				GTK_IMAGE_MENU_ITEM(gtkwin->menu.typing_icon),
-				gtk_image_new_from_stock(GAIM_STOCK_TYPED,
-					GTK_ICON_SIZE_MENU));
+		gtkwin->menu.typing_icon = gtk_image_new_from_stock(GAIM_STOCK_TYPED,
+															GTK_ICON_SIZE_MENU);
 		gtk_tooltips_set_tip(gtkconv->tooltips, gtkwin->menu.typing_icon,
 				_("User has typed something and paused"), NULL);
 	}
 
 	if(gtkwin->menu.typing_icon) {
-		gtk_menu_item_set_right_justified(
-				GTK_MENU_ITEM(gtkwin->menu.typing_icon), TRUE);
-		gtk_widget_show_all(gtkwin->menu.typing_icon);
-		gtk_menu_shell_append(GTK_MENU_SHELL(gtkwin->menu.menubar),
-				gtkwin->menu.typing_icon);
+		gtk_widget_show(gtkwin->menu.typing_icon);
+		gtk_box_pack_end(GTK_BOX(gtkwin->menu.menubox), gtkwin->menu.typing_icon,
+						 FALSE, FALSE, 0);
 	}
 }
 
@@ -3565,6 +3557,8 @@
 {
 	GaimGtkWindow *gtkwin;
 	GtkAccelGroup *accel_group;
+	GtkWidget *box_item;
+
 	gtkwin = GAIM_GTK_WINDOW(win);
 
 	accel_group = gtk_accel_group_new ();
@@ -3660,6 +3654,15 @@
 
 	generate_send_as_items(win, NULL);
 
+	box_item = gtk_menu_item_new();
+	gtk_menu_item_set_right_justified(GTK_MENU_ITEM(box_item), TRUE);
+	gtk_menu_shell_append(GTK_MENU_SHELL(gtkwin->menu.menubar), box_item);
+	gtk_widget_show(box_item);
+
+	gtkwin->menu.menubox = gtk_hbox_new(FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(box_item), gtkwin->menu.menubox);
+	gtk_widget_show(gtkwin->menu.menubox);
+
 	gtk_widget_show(gtkwin->menu.menubar);
 
 	return gtkwin->menu.menubar;