Mercurial > pidgin.yaz
comparison pidgin/gtkstatusbox.c @ 21300:abbf74f4732b
propagate from branch 'im.pidgin.pidgin' (head e3fd21e6dabb99e5604e8337380353fcbe1a7279)
to branch 'im.pidgin.elb.make' (head 7422b9a549f752c05cc75f0c8e56fdd2bced034a)
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Sat, 10 Nov 2007 16:17:54 +0000 |
| parents | 6de09629f091 |
| children | 665e04562de0 |
comparison
equal
deleted
inserted
replaced
| 21132:f2dcad9572b2 | 21300:abbf74f4732b |
|---|---|
| 274 if (box->buddy_icon_sel) { | 274 if (box->buddy_icon_sel) { |
| 275 gtk_window_present(GTK_WINDOW(box->buddy_icon_sel)); | 275 gtk_window_present(GTK_WINDOW(box->buddy_icon_sel)); |
| 276 return FALSE; | 276 return FALSE; |
| 277 } | 277 } |
| 278 | 278 |
| 279 box->buddy_icon_sel = pidgin_buddy_icon_chooser_new(NULL, icon_choose_cb, box); | 279 box->buddy_icon_sel = pidgin_buddy_icon_chooser_new(GTK_WINDOW(gtk_widget_get_toplevel(widget)), icon_choose_cb, box); |
| 280 gtk_widget_show_all(box->buddy_icon_sel); | 280 gtk_widget_show_all(box->buddy_icon_sel); |
| 281 } | 281 } |
| 282 return FALSE; | 282 return FALSE; |
| 283 } | 283 } |
| 284 | 284 |
| 1067 } | 1067 } |
| 1068 | 1068 |
| 1069 add_popular_statuses(status_box); | 1069 add_popular_statuses(status_box); |
| 1070 | 1070 |
| 1071 pidgin_status_box_add_separator(PIDGIN_STATUS_BOX(status_box)); | 1071 pidgin_status_box_add_separator(PIDGIN_STATUS_BOX(status_box)); |
| 1072 pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_CUSTOM, NULL, _("New..."), NULL, NULL); | 1072 pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_CUSTOM, NULL, _("New status..."), NULL, NULL); |
| 1073 pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_SAVED, NULL, _("Saved..."), NULL, NULL); | 1073 pidgin_status_box_add(PIDGIN_STATUS_BOX(status_box), PIDGIN_STATUS_BOX_TYPE_SAVED, NULL, _("Saved statuses..."), NULL, NULL); |
| 1074 if (pixbuf) g_object_unref(G_OBJECT(pixbuf)); | 1074 if (pixbuf) g_object_unref(G_OBJECT(pixbuf)); |
| 1075 | 1075 |
| 1076 status_menu_refresh_iter(status_box); | 1076 status_menu_refresh_iter(status_box); |
| 1077 pidgin_status_box_refresh(status_box); | 1077 pidgin_status_box_refresh(status_box); |
| 1078 | 1078 |
| 1584 if (saved == purple_savedstatus_get_current()) | 1584 if (saved == purple_savedstatus_get_current()) |
| 1585 return; | 1585 return; |
| 1586 | 1586 |
| 1587 msg = g_strdup_printf(_("Are you sure you want to delete %s?"), purple_savedstatus_get_title(saved)); | 1587 msg = g_strdup_printf(_("Are you sure you want to delete %s?"), purple_savedstatus_get_title(saved)); |
| 1588 | 1588 |
| 1589 purple_request_action(saved, NULL, msg, NULL, 0, | 1589 purple_request_action_with_hint(saved, NULL, msg, NULL, 0, |
| 1590 NULL, NULL, NULL, | 1590 NULL, NULL, NULL, |
| 1591 data, 2, | 1591 "pidgin-statusbox", data, 2, |
| 1592 _("Delete"), tree_view_delete_current_selection_cb, | 1592 _("Delete"), tree_view_delete_current_selection_cb, |
| 1593 _("Cancel"), NULL); | 1593 _("Cancel"), NULL); |
| 1594 | 1594 |
| 1595 g_free(msg); | 1595 g_free(msg); |
| 1596 | 1596 |