# HG changeset patch
# User Gary Kramlich <grim@reaperworld.com>
# Date 1126928707 0
# Node ID f8443218b7fe01991d4e1b3c801b0233b0f303a5
# Parent  5c8210f7cbe257f22150194b994c35c9d8f6c03e
[gaim-migrate @ 13814]
integration of the GaimGtkMenuTray widget into GaimGtkWindow

committer: Tailor Script <tailor@pidgin.im>

diff -r 5c8210f7cbe2 -r f8443218b7fe src/gtkconv.c
--- a/src/gtkconv.c	Sat Sep 17 03:23:50 2005 +0000
+++ b/src/gtkconv.c	Sat Sep 17 03:45:07 2005 +0000
@@ -57,6 +57,7 @@
 #include "gtkimhtml.h"
 #include "gtkimhtmltoolbar.h"
 #include "gtklog.h"
+#include "gtkmenutray.h"
 #include "gtkpounce.h"
 #include "gtkprefs.h"
 #include "gtkprivacy.h"
@@ -3093,8 +3094,8 @@
 
 	if(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);
+		gaim_gtk_menu_tray_append(GAIM_GTK_MENU_TRAY(gtkwin->menu.tray),
+								  gtkwin->menu.typing_icon);
 	}
 }
 
@@ -3764,7 +3765,6 @@
 {
 	GaimGtkWindow *gtkwin;
 	GtkAccelGroup *accel_group;
-	GtkWidget *box_item;
 
 	gtkwin = GAIM_GTK_WINDOW(win);
 
@@ -3861,15 +3861,10 @@
 
 	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);
-	gtk_widget_set_size_request(box_item, -1, 16);
-
-	gtkwin->menu.menubox = gtk_hbox_new(FALSE, 0);
-	gtk_container_add(GTK_CONTAINER(box_item), gtkwin->menu.menubox);
-	gtk_widget_show(gtkwin->menu.menubox);
+	gtkwin->menu.tray = gaim_gtk_menu_tray_new();
+	gtk_menu_shell_append(GTK_MENU_SHELL(gtkwin->menu.menubar),
+						  gtkwin->menu.tray);
+	gtk_widget_show(gtkwin->menu.tray);
 
 	gtk_widget_show(gtkwin->menu.menubar);
 
diff -r 5c8210f7cbe2 -r f8443218b7fe src/gtkconv.h
--- a/src/gtkconv.h	Sat Sep 17 03:23:50 2005 +0000
+++ b/src/gtkconv.h	Sat Sep 17 03:45:07 2005 +0000
@@ -72,7 +72,6 @@
 
 	struct
 	{
-		GtkWidget *menubox;
 		GtkWidget *menubar;
 
 		GtkWidget *view_log;
@@ -98,6 +97,8 @@
 
 		GtkWidget *send_as;
 
+		GtkWidget *tray;
+
 		GtkWidget *typing_icon;
 
 		GtkItemFactory *item_factory;