diff src/gtkblist.c @ 10325:1657438d537b

[gaim-migrate @ 11532] I wanted to get this out of my local tree. I don't know how much of this we'll end up using, but I have a feeling we can use some of it. I think it's hard to know what UI will work best without actually using a few of them... I'm going to try to get reading from status.xml working again this week. I think we'll be able to use the same format, just extend it a little bit. If anyone has done any work on that please let me know so I don't duplicate anyone's work. I imagine I'll start by seeing how much of the old status.xml-reading code is usable (I'm guessing a lot of it). committer: Tailor Script <[e-mail]>

--- a/src/gtkblist.c	Mon Dec 06 01:03:38 2004 +0000
+++ b/src/gtkblist.c	Tue Dec 07 04:59:27 2004 +0000
@@ -52,11 +52,10 @@
 #include "gtkprivacy.h"
 #include "gtkroomlist.h"
 #include "gtksound.h"
+#include "gtkstatus.h"
 #include "gtkstatusselector.h"
 #include "gtkutils.h"
 
-#include "gaim.h"
-
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
@@ -107,7 +106,6 @@
 
 
 static GtkWidget *protomenu = NULL;
-static GtkWidget *awaymenu = NULL;
 static GtkWidget *pluginmenu = NULL;
 
 GSList *gaim_gtk_blist_sort_methods = NULL;
@@ -992,7 +990,7 @@
 	struct _gaim_gtk_blist_node *gtknode;
 	GtkTreeIter iter, parent;
 	GaimBlistNode *bnode;
-	GtkTreePath *path;		
+	GtkTreePath *path;
 
 	if(!GAIM_BLIST_NODE_IS_CONTACT(node))
 		return;
@@ -2378,18 +2376,18 @@
 
 	/* Tools */
 	{ N_("/_Tools"), NULL, NULL, 0, "<Branch>" },
-	{ N_("/Tools/_Away"), NULL, NULL, 0, "<Branch>" },
 	{ N_("/Tools/Buddy _Pounce"), NULL, NULL, 0, "<Branch>" },
 	{ N_("/Tools/Account Ac_tions"), NULL, NULL, 0, "<Branch>" },
 	{ N_("/Tools/Pl_ugin Actions"), NULL, NULL, 0, "<Branch>" },
 	{ "/Tools/sep1", NULL, NULL, 0, "<Separator>" },
+	{ N_("/Tools/_Statuses"), NULL, gaim_gtk_status_window_show, 0, "<StockItem>", GAIM_STOCK_ICON_AWAY },
 	{ N_("/Tools/A_ccounts"), "<CTL>A", gaim_gtk_accounts_window_show, 0, "<StockItem>", GAIM_STOCK_ACCOUNTS },
+	{ N_("/Tools/Pr_eferences"), "<CTL>P", gaim_gtk_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
+	{ N_("/Tools/Pr_ivacy"), NULL, gaim_gtk_privacy_dialog_show, 0, NULL },
 	{ N_("/Tools/_File Transfers"), "<CTL>T", gaim_show_xfer_dialog, 0, "<StockItem>", GAIM_STOCK_FILE_TRANSFER },
 	{ N_("/Tools/R_oom List"), NULL, gaim_gtk_roomlist_dialog_show, 0, NULL },
-	{ N_("/Tools/Pr_eferences"), "<CTL>P", gaim_gtk_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
-	{ N_("/Tools/Pr_ivacy"), NULL, gaim_gtk_privacy_dialog_show, 0, NULL },
+	{ "/Tools/sep2", NULL, NULL, 0, "<Separator>" },
 	{ N_("/Tools/Mute _Sounds"), "<CTL>S", gaim_gtk_blist_mute_sounds_cb, 0, "<CheckItem>"},
-	{ "/Tools/sep2", NULL, NULL, 0, "<Separator>" },
 	{ N_("/Tools/View System _Log"), NULL, gtk_blist_show_systemlog_cb, 0, NULL },
 
 	/* Help */
@@ -3143,13 +3141,6 @@
 	gtk_widget_show(menu);
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), menu, FALSE, FALSE, 0);
 
-	awaymenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Away"));
-
-	/* FIXME: Status */
-#if 0
-	do_away_menu();
-#endif
-
 	gtkblist->bpmenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Buddy Pounce"));
 	gaim_gtkpounce_menu_build(gtkblist->bpmenu);
 
@@ -3158,6 +3149,7 @@
 
 	pluginmenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Plugin Actions"));
 	gaim_gtk_blist_update_plugin_actions();
+
 	/****************************** GtkTreeView **********************************/
 	sw = gtk_scrolled_window_new(NULL,NULL);
 	gtk_widget_show(sw);
@@ -3808,7 +3800,6 @@
 	g_object_unref(G_OBJECT(gtkblist->ift));
 	protomenu = NULL;
 	pluginmenu = NULL;
-	awaymenu = NULL;
 	gtkblist = NULL;
 
 	gaim_prefs_disconnect_by_handle(gaim_gtk_blist_get_handle());
@@ -3818,9 +3809,9 @@
 {
 	if (!(gtkblist && gtkblist->window))
 		return;
-	
+
 	gaim_prefs_set_bool("/gaim/gtk/blist/list_visible", show);
-	
+
 	if (show) {
 		gaim_gtk_blist_restore_position();
 		gtk_window_present(GTK_WINDOW(gtkblist->window));