comparison: plugins/gevolution/gevo-util.c
plugins/gevolution/gevo-util.c
- changeset 10081
- 64e398f0eaa3
- parent 9825
- 85a5ebe9315f
- child 10246
- aa5bff72f94c
equal
deleted
inserted
replaced
| 10080:d562573fff16 | 10081:64e398f0eaa3 |
|---|---|
| 53 } | 53 } |
| 54 | 54 |
| 55 GList * | 55 GList * |
| 56 gevo_get_groups(void) | 56 gevo_get_groups(void) |
| 57 { | 57 { |
| 58 GList *tmp = NULL; | 58 GList *list = NULL; |
| 59 char *tmp2; | |
| 60 GaimGroup *g; | 59 GaimGroup *g; |
| 61 GaimBlistNode *gnode; | 60 GaimBlistNode *gnode; |
| 62 | 61 |
| 63 if (gaim_get_blist()->root == NULL) | 62 if (gaim_get_blist()->root == NULL) |
| 64 { | 63 { |
| 65 tmp2 = g_strdup(_("Buddies")); | 64 list = g_list_append(list, _("Buddies")); |
| 66 tmp = g_list_append(tmp, tmp2); | |
| 67 } | 65 } |
| 68 else | 66 else |
| 69 { | 67 { |
| 70 for (gnode = gaim_get_blist()->root; | 68 for (gnode = gaim_get_blist()->root; |
| 71 gnode != NULL; | 69 gnode != NULL; |
| 72 gnode = gnode->next) | 70 gnode = gnode->next) |
| 73 { | 71 { |
| 74 if (GAIM_BLIST_NODE_IS_GROUP(gnode)) | 72 if (GAIM_BLIST_NODE_IS_GROUP(gnode)) |
| 75 { | 73 { |
| 76 g = (GaimGroup *)gnode; | 74 g = (GaimGroup *)gnode; |
| 77 tmp2 = g->name; | 75 list = g_list_append(list, g->name); |
| 78 tmp = g_list_append(tmp, tmp2); | |
| 79 } | 76 } |
| 80 } | 77 } |
| 81 } | 78 } |
| 82 | 79 |
| 83 return tmp; | 80 return list; |
| 84 } | 81 } |
| 85 | 82 |
| 86 EContactField | 83 EContactField |
| 87 gevo_prpl_get_field(GaimAccount *account, GaimBuddy *buddy) | 84 gevo_prpl_get_field(GaimAccount *account, GaimBuddy *buddy) |
| 88 { | 85 { |
| 124 { | 121 { |
| 125 return (gevo_prpl_get_field(account, buddy) != 0); | 122 return (gevo_prpl_get_field(account, buddy) != 0); |
| 126 } | 123 } |
| 127 | 124 |
| 128 gboolean | 125 gboolean |
| 129 gevo_load_addressbook(EBook **book, GError **error) | 126 gevo_load_addressbook(const gchar* uri, EBook **book, GError **error) |
| 130 { | 127 { |
| 131 gboolean result = FALSE; | 128 gboolean result = FALSE; |
| 132 | 129 |
| 133 g_return_val_if_fail(book != NULL, FALSE); | 130 g_return_val_if_fail(book != NULL, FALSE); |
| 134 | 131 |
| 135 #if EBOOK_CHECK_VERSION(0, 0, 94) | 132 if (uri == NULL) |
| 136 *book = e_book_new_system_addressbook(NULL); | 133 *book = e_book_new_system_addressbook(NULL); |
| 134 else | |
| 135 *book = e_book_new_from_uri(uri, error); | |
| 137 | 136 |
| 138 result = e_book_open(*book, FALSE, NULL); | 137 result = e_book_open(*book, FALSE, NULL); |
| 139 #else | |
| 140 *book = e_book_new(); | |
| 141 | |
| 142 result = e_book_load_local_addressbook(*book, error); | |
| 143 #endif | |
| 144 | 138 |
| 145 if (!result && *book != NULL) | 139 if (!result && *book != NULL) |
| 146 { | 140 { |
| 147 g_object_unref(*book); | 141 g_object_unref(*book); |
| 148 *book = NULL; | 142 *book = NULL; |
