Mercurial > pidgin
comparison libpurple/prefs.c @ 30578:0accc8adb18a
merge of '2f6318bd834113559a405ec68cdb178f2180b680'
and '64e02b98551e11e093e4649f1516f3aceaa321e2'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 26 Sep 2010 20:16:15 +0000 |
| parents | 351d07aefb09 |
| children | 6da9e43e17d8 |
comparison
equal
deleted
inserted
replaced
| 30577:7b761c8601f7 | 30578:0accc8adb18a |
|---|---|
| 504 | 504 |
| 505 if(pref == &prefs) | 505 if(pref == &prefs) |
| 506 return g_strdup("/"); | 506 return g_strdup("/"); |
| 507 | 507 |
| 508 name = g_string_new(pref->name); | 508 name = g_string_new(pref->name); |
| 509 parent = pref->parent; | |
| 510 | 509 |
| 511 for(parent = pref->parent; parent && parent->name; parent = parent->parent) { | 510 for(parent = pref->parent; parent && parent->name; parent = parent->parent) { |
| 512 name = g_string_prepend_c(name, '/'); | 511 name = g_string_prepend_c(name, '/'); |
| 513 name = g_string_prepend(name, parent->name); | 512 name = g_string_prepend(name, parent->name); |
| 514 } | 513 } |