changeset
[gaim-migrate @ 14020]
Sun, 23 Oct 2005 00:16:03 +0000
- author
- Mark Doliner <markdoliner@pidgin.im>
- date
- Sun, 23 Oct 2005 00:16:03 +0000
- changeset 11729
- 56b1a9f35b74
- parent 11728
- 9d6b2dd687a5
- child 11730
- 649c38d2a8ab
[gaim-migrate @ 14020]
Remove the Tools->Statuses menu item from the blist.
Add "Saved..." to the gtkstatusbox, and make "Custom..." and
"Saved..." bring up the appropriate gtk saved statuses window.
Someone needs to do something so that you can select these twice
in a row (and other related functionality changes)
How do people feel about having those two things at the bottom of
the gtkstatusbox? Good idea? Bad idea?
| src/gtkblist.c | file | annotate | diff | comparison | revisions | |
| src/gtkstatusbox.c | file | annotate | diff | comparison | revisions |
--- a/src/gtkblist.c Sun Oct 23 00:09:27 2005 +0000 +++ b/src/gtkblist.c Sun Oct 23 00:16:03 2005 +0000 @@ -50,7 +50,6 @@ #include "gtkprefs.h" #include "gtkprivacy.h" #include "gtkroomlist.h" -#include "gtksavedstatuses.h" #include "gtkstatusbox.h" #include "gtkutils.h" @@ -2341,7 +2340,6 @@ { 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, "<StockItem>", GTK_STOCK_DIALOG_ERROR },
--- a/src/gtkstatusbox.c Sun Oct 23 00:09:27 2005 +0000 +++ b/src/gtkstatusbox.c Sun Oct 23 00:16:03 2005 +0000 @@ -29,6 +29,7 @@ #include "status.h" #include "gtkgaim.h" +#include "gtksavedstatuses.h" #include "gtkstock.h" #include "gtkstatusbox.h" @@ -311,6 +312,7 @@ gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), pixbuf4, _("Invisible"), NULL, "invisible"); gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), pixbuf3, _("Offline"), NULL, "offline"); gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), pixbuf, _("Custom..."), NULL, "custom"); + gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), pixbuf, _("Saved..."), NULL, "saved"); current_savedstatus_name = gaim_prefs_get_string("/core/status/current"); saved_status = gaim_savedstatus_find(current_savedstatus_name); @@ -596,6 +598,18 @@ g_source_remove(status_box->typing); status_box->typing = 0; + if (!strcmp(status_type_id, "custom")) + { + gaim_gtk_status_editor_show(NULL); + return; + } + + if (!strcmp(status_type_id, "saved")) + { + gaim_gtk_status_window_show(); + return; + } + /* * TODO: Should show the message box whenever status_type_id allows * for a message attribute on any protocol that is enabled.
