Mercurial > pidgin.yaz
diff plugins/docklet/docklet.c @ 13175:488619ad7ed5
[gaim-migrate @ 15538]
If you're not using a saved status and you select "New..." in the
gtkstatusbox then the new status dialog will be seeded with your
current message and stuff. rlaager told me to do this.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 08 Feb 2006 05:36:13 +0000 |
| parents | f1ed04b5aa30 |
| children | c97c76d9d347 |
line wrap: on
line diff
--- a/plugins/docklet/docklet.c Wed Feb 08 05:07:43 2006 +0000 +++ b/plugins/docklet/docklet.c Wed Feb 08 05:36:13 2006 +0000 @@ -360,7 +360,10 @@ static void show_custom_status_editor_cb(GtkMenuItem *menuitem, gpointer user_data) { - gaim_gtk_status_editor_show(NULL); + GaimSavedStatus *saved_status; + saved_status = gaim_savedstatus_get_current(); + gaim_gtk_status_editor_show(FALSE, + gaim_savedstatus_is_transient(saved_status) ? saved_status : NULL); } static void @@ -458,8 +461,8 @@ gaim_separator(submenu); - new_menu_item_with_gaim_icon(submenu, _("New Status..."), GAIM_STATUS_AVAILABLE, G_CALLBACK(show_custom_status_editor_cb), NULL, 0, 0, NULL); - new_menu_item_with_gaim_icon(submenu, _("Saved Status..."), GAIM_STATUS_AVAILABLE, G_CALLBACK(gaim_gtk_status_window_show), NULL, 0, 0, NULL); + new_menu_item_with_gaim_icon(submenu, _("New..."), GAIM_STATUS_AVAILABLE, G_CALLBACK(show_custom_status_editor_cb), NULL, 0, 0, NULL); + new_menu_item_with_gaim_icon(submenu, _("Saved..."), GAIM_STATUS_AVAILABLE, G_CALLBACK(gaim_gtk_status_window_show), NULL, 0, 0, NULL); return menuitem; }