comparison: finch/gntstatus.c
finch/gntstatus.c
- branch
- gtkdoc-conversion
- changeset 35475
- ec0d44434ba8
- parent 35454
- cf2a24d01503
- parent 35378
- 5d9e2581005b
- child 38240
- 0552f69f1996
equal
deleted
inserted
replaced
| 35474:ff5eccb9f797 | 35475:ec0d44434ba8 |
|---|---|
| 92 | 92 |
| 93 if (purple_savedstatus_is_transient(saved)) | 93 if (purple_savedstatus_is_transient(saved)) |
| 94 continue; | 94 continue; |
| 95 | 95 |
| 96 title = purple_savedstatus_get_title(saved); | 96 title = purple_savedstatus_get_title(saved); |
| 97 type = purple_primitive_get_name_from_type(purple_savedstatus_get_type(saved)); | 97 type = purple_primitive_get_name_from_type(purple_savedstatus_get_primitive_type(saved)); |
| 98 message = purple_savedstatus_get_message(saved); /* XXX: Strip possible markups */ | 98 message = purple_savedstatus_get_message(saved); /* XXX: Strip possible markups */ |
| 99 | 99 |
| 100 gnt_tree_add_row_last(tree, saved, | 100 gnt_tree_add_row_last(tree, saved, |
| 101 gnt_tree_create_row(tree, title, type, message), NULL); | 101 gnt_tree_create_row(tree, title, type, message), NULL); |
| 102 } | 102 } |
| 320 purple_primitive_get_name_from_type(prim), message), NULL); | 320 purple_primitive_get_name_from_type(prim), message), NULL); |
| 321 } | 321 } |
| 322 else | 322 else |
| 323 { | 323 { |
| 324 purple_savedstatus_set_title(edit->saved, title); | 324 purple_savedstatus_set_title(edit->saved, title); |
| 325 purple_savedstatus_set_type(edit->saved, prim); | 325 purple_savedstatus_set_primitive_type(edit->saved, prim); |
| 326 purple_savedstatus_set_message(edit->saved, message); | 326 purple_savedstatus_set_message(edit->saved, message); |
| 327 if (statuses.tree) | 327 if (statuses.tree) |
| 328 { | 328 { |
| 329 gnt_tree_change_text(GNT_TREE(statuses.tree), edit->saved, 0, title); | 329 gnt_tree_change_text(GNT_TREE(statuses.tree), edit->saved, 0, title); |
| 330 gnt_tree_change_text(GNT_TREE(statuses.tree), edit->saved, 1, | 330 gnt_tree_change_text(GNT_TREE(statuses.tree), edit->saved, 1, |
| 356 key = g_new0(RowInfo, 1); | 356 key = g_new0(RowInfo, 1); |
| 357 key->account = account; | 357 key->account = account; |
| 358 | 358 |
| 359 if (sub) | 359 if (sub) |
| 360 { | 360 { |
| 361 key->type = purple_savedstatus_substatus_get_type(sub); | 361 key->type = purple_savedstatus_substatus_get_status_type(sub); |
| 362 type = purple_status_type_get_name(key->type); | 362 type = purple_status_type_get_name(key->type); |
| 363 message = purple_savedstatus_substatus_get_message(sub); | 363 message = purple_savedstatus_substatus_get_message(sub); |
| 364 key->message = g_strdup(message); | 364 key->message = g_strdup(message); |
| 365 } | 365 } |
| 366 | 366 |
| 543 gnt_box_add_widget(GNT_BOX(box), label = gnt_label_new(_("Status"))); | 543 gnt_box_add_widget(GNT_BOX(box), label = gnt_label_new(_("Status"))); |
| 544 gnt_widget_set_size(label, 0, 1); | 544 gnt_widget_set_size(label, 0, 1); |
| 545 | 545 |
| 546 edit->type = combo = gnt_combo_box_new(); | 546 edit->type = combo = gnt_combo_box_new(); |
| 547 gnt_box_add_widget(GNT_BOX(box), combo); | 547 gnt_box_add_widget(GNT_BOX(box), combo); |
| 548 current = saved ? purple_savedstatus_get_type(saved) : PURPLE_STATUS_UNSET; | 548 current = saved ? purple_savedstatus_get_primitive_type(saved) : PURPLE_STATUS_UNSET; |
| 549 for (i = 0; prims[i] != PURPLE_STATUS_UNSET; i++) | 549 for (i = 0; prims[i] != PURPLE_STATUS_UNSET; i++) |
| 550 { | 550 { |
| 551 gnt_combo_box_add_data(GNT_COMBO_BOX(combo), GINT_TO_POINTER(prims[i]), | 551 gnt_combo_box_add_data(GNT_COMBO_BOX(combo), GINT_TO_POINTER(prims[i]), |
| 552 purple_primitive_get_name_from_type(prims[i])); | 552 purple_primitive_get_name_from_type(prims[i])); |
| 553 if (prims[i] == current) | 553 if (prims[i] == current) |
