comparison: src/gtksavedstatuses.c
src/gtksavedstatuses.c
- changeset 12888
- 6fedd1f47fe0
- parent 12856
- 3615684c6f1a
- child 12951
- 300b9d0a2d48
equal
deleted
inserted
replaced
| 12887:4235bbee17b1 | 12888:6fedd1f47fe0 |
|---|---|
| 291 char *buf; | 291 char *buf; |
| 292 | 292 |
| 293 gtk_tree_model_get(model, iter, STATUS_WINDOW_COLUMN_TITLE, &title, -1); | 293 gtk_tree_model_get(model, iter, STATUS_WINDOW_COLUMN_TITLE, &title, -1); |
| 294 | 294 |
| 295 buf = g_strdup_printf(_("Are you sure you want to delete %s?"), title); | 295 buf = g_strdup_printf(_("Are you sure you want to delete %s?"), title); |
| 296 gaim_request_action(NULL, NULL, buf, NULL, 0, title, 2, | 296 gaim_request_action(status_window, NULL, buf, NULL, 0, title, 2, |
| 297 _("Delete"), status_window_delete_confirm_cb, | 297 _("Delete"), status_window_delete_confirm_cb, |
| 298 _("Cancel"), g_free); | 298 _("Cancel"), g_free); |
| 299 g_free(buf); | 299 g_free(buf); |
| 300 } | 300 } |
| 301 | 301 |
| 603 return; | 603 return; |
| 604 | 604 |
| 605 if (status_window->window != NULL) | 605 if (status_window->window != NULL) |
| 606 gtk_widget_destroy(status_window->window); | 606 gtk_widget_destroy(status_window->window); |
| 607 | 607 |
| 608 gaim_request_close_with_handle(status_window); | |
| 609 gaim_notify_close_with_handle(status_window); | |
| 608 g_free(status_window); | 610 g_free(status_window); |
| 609 status_window = NULL; | 611 status_window = NULL; |
| 610 } | 612 } |
| 611 | 613 |
| 612 | 614 |
| 655 */ | 657 */ |
| 656 if (((button == dialog->saveanduse_button) || (button == dialog->save_button)) && | 658 if (((button == dialog->saveanduse_button) || (button == dialog->save_button)) && |
| 657 (gaim_savedstatus_find(title) != NULL) && | 659 (gaim_savedstatus_find(title) != NULL) && |
| 658 ((dialog->original_title == NULL) || (strcmp(title, dialog->original_title)))) | 660 ((dialog->original_title == NULL) || (strcmp(title, dialog->original_title)))) |
| 659 { | 661 { |
| 660 gaim_notify_error(NULL, NULL, _("Title already in use. You must " | 662 gaim_notify_error(status_window, NULL, _("Title already in use. You must " |
| 661 "choose a unique title."), NULL); | 663 "choose a unique title."), NULL); |
| 662 return; | 664 return; |
| 663 } | 665 } |
| 664 | 666 |
| 665 type = gtk_option_menu_get_history(dialog->type) + (GAIM_STATUS_UNSET + 1); | 667 type = gtk_option_menu_get_history(dialog->type) + (GAIM_STATUS_UNSET + 1); |
