Mercurial > pidgin.yaz
comparison src/savedstatuses.c @ 10426:30d9ec7d001b
[gaim-migrate @ 11678]
Some rather key fixes to accounts and saved statuses, and make
blist use our util function for reading (it's already using xmlnode).
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 26 Dec 2004 23:11:14 +0000 |
| parents | 9903182f2aac |
| children | 16d63d8c26d8 |
comparison
equal
deleted
inserted
replaced
| 10425:9903182f2aac | 10426:30d9ec7d001b |
|---|---|
| 236 return NULL; | 236 return NULL; |
| 237 } | 237 } |
| 238 | 238 |
| 239 /* Read the state */ | 239 /* Read the state */ |
| 240 node = xmlnode_get_child(substatus, "state"); | 240 node = xmlnode_get_child(substatus, "state"); |
| 241 if ((node != NULL) && ((data = xmlnode_get_data(node)) == NULL)) | 241 if ((node != NULL) && ((data = xmlnode_get_data(node)) != NULL)) |
| 242 { | 242 { |
| 243 ret->type = gaim_status_type_find_with_id( | 243 ret->type = gaim_status_type_find_with_id( |
| 244 ret->account->status_types, data); | 244 ret->account->status_types, data); |
| 245 g_free(data); | 245 g_free(data); |
| 246 } | 246 } |
| 247 | 247 |
| 248 /* Read the message */ | 248 /* Read the message */ |
| 249 node = xmlnode_get_child(substatus, "message"); | 249 node = xmlnode_get_child(substatus, "message"); |
| 250 if ((node != NULL) && ((data = xmlnode_get_data(node)) == NULL)) | 250 if ((node != NULL) && ((data = xmlnode_get_data(node)) != NULL)) |
| 251 { | 251 { |
| 252 ret->message = data; | 252 ret->message = data; |
| 253 } | 253 } |
| 254 | 254 |
| 255 return ret; | 255 return ret; |
| 304 i++; | 304 i++; |
| 305 } | 305 } |
| 306 | 306 |
| 307 /* Read the primitive status type */ | 307 /* Read the primitive status type */ |
| 308 node = xmlnode_get_child(status, "state"); | 308 node = xmlnode_get_child(status, "state"); |
| 309 if ((node != NULL) && ((data = xmlnode_get_data(node)) == NULL)) | 309 if ((node != NULL) && ((data = xmlnode_get_data(node)) != NULL)) |
| 310 { | 310 { |
| 311 ret->type = gaim_primitive_get_type_from_id(data); | 311 ret->type = gaim_primitive_get_type_from_id(data); |
| 312 g_free(data); | 312 g_free(data); |
| 313 } | 313 } |
| 314 | 314 |
| 315 /* Read the message */ | 315 /* Read the message */ |
| 316 node = xmlnode_get_child(status, "message"); | 316 node = xmlnode_get_child(status, "message"); |
| 317 if ((node != NULL) && ((data = xmlnode_get_data(node)) == NULL)) | 317 if ((node != NULL) && ((data = xmlnode_get_data(node)) != NULL)) |
| 318 { | 318 { |
| 319 ret->message = data; | 319 ret->message = data; |
| 320 } | 320 } |
| 321 | 321 |
| 322 /* Read substatuses */ | 322 /* Read substatuses */ |
| 341 static void | 341 static void |
| 342 load_statuses(void) | 342 load_statuses(void) |
| 343 { | 343 { |
| 344 xmlnode *statuses, *status; | 344 xmlnode *statuses, *status; |
| 345 | 345 |
| 346 statuses_loaded = TRUE; | |
| 347 | |
| 346 statuses = gaim_util_read_xml_from_file("status.xml", _("saved statuses")); | 348 statuses = gaim_util_read_xml_from_file("status.xml", _("saved statuses")); |
| 347 | 349 |
| 348 if (statuses == NULL) | 350 if (statuses == NULL) |
| 349 return; | 351 return; |
| 350 | 352 |