comparison: pidgin/plugins/gevolution/add_buddy_dialog.c
pidgin/plugins/gevolution/add_buddy_dialog.c
- changeset 30710
- b3c55bf4a7c6
- parent 30352
- 9ddeb8b03876
- child 30721
- c2175573fa90
equal
deleted
inserted
replaced
| 30709:f3011abf3e5d | 30710:b3c55bf4a7c6 |
|---|---|
| 287 | 287 |
| 288 for (c = cards; c != NULL; c = c->next) | 288 for (c = cards; c != NULL; c = c->next) |
| 289 { | 289 { |
| 290 EContact *contact = E_CONTACT(c->data); | 290 EContact *contact = E_CONTACT(c->data); |
| 291 const char *name; | 291 const char *name; |
| 292 GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells; | 292 GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs; |
| 293 | 293 |
| 294 name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); | 294 name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); |
| 295 | 295 |
| 296 aims = e_contact_get(contact, E_CONTACT_IM_AIM); | 296 aims = e_contact_get(contact, E_CONTACT_IM_AIM); |
| 297 jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER); | 297 jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER); |
| 298 yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO); | 298 yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO); |
| 299 msns = e_contact_get(contact, E_CONTACT_IM_MSN); | 299 msns = e_contact_get(contact, E_CONTACT_IM_MSN); |
| 300 icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); | 300 icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); |
| 301 novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); | 301 novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); |
| 302 ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU); | |
| 302 | 303 |
| 303 if (aims == NULL && jabbers == NULL && yahoos == NULL && | 304 if (aims == NULL && jabbers == NULL && yahoos == NULL && |
| 304 msns == NULL && icqs == NULL && novells == NULL) | 305 msns == NULL && icqs == NULL && novells == NULL && |
| 306 ggs == NULL) | |
| 305 { | 307 { |
| 306 GtkTreeIter iter; | 308 GtkTreeIter iter; |
| 307 | 309 |
| 308 gtk_list_store_append(dialog->model, &iter); | 310 gtk_list_store_append(dialog->model, &iter); |
| 309 | 311 |
| 318 add_ims(dialog, contact, name, jabbers, "prpl-jabber"); | 320 add_ims(dialog, contact, name, jabbers, "prpl-jabber"); |
| 319 add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); | 321 add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); |
| 320 add_ims(dialog, contact, name, msns, "prpl-msn"); | 322 add_ims(dialog, contact, name, msns, "prpl-msn"); |
| 321 add_ims(dialog, contact, name, icqs, "prpl-icq"); | 323 add_ims(dialog, contact, name, icqs, "prpl-icq"); |
| 322 add_ims(dialog, contact, name, novells, "prpl-novell"); | 324 add_ims(dialog, contact, name, novells, "prpl-novell"); |
| 325 add_ims(dialog, contact, name, ggs, "prpl-gg"); | |
| 323 } | 326 } |
| 324 } | 327 } |
| 325 | 328 |
| 326 dialog->contacts = cards; | 329 dialog->contacts = cards; |
| 327 dialog->book = book; | 330 dialog->book = book; |
| 363 | 366 |
| 364 for (l = dialog->contacts; l != NULL; l = l->next) | 367 for (l = dialog->contacts; l != NULL; l = l->next) |
| 365 { | 368 { |
| 366 EContact *contact = E_CONTACT(l->data); | 369 EContact *contact = E_CONTACT(l->data); |
| 367 const char *name; | 370 const char *name; |
| 368 GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells; | 371 GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs; |
| 369 | 372 |
| 370 name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); | 373 name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); |
| 371 | 374 |
| 372 if (text != NULL && *text != '\0' && name != NULL && | 375 if (text != NULL && *text != '\0' && name != NULL && |
| 373 g_ascii_strncasecmp(name, text, strlen(text))) | 376 g_ascii_strncasecmp(name, text, strlen(text))) |
| 379 jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER); | 382 jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER); |
| 380 yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO); | 383 yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO); |
| 381 msns = e_contact_get(contact, E_CONTACT_IM_MSN); | 384 msns = e_contact_get(contact, E_CONTACT_IM_MSN); |
| 382 icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); | 385 icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); |
| 383 novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); | 386 novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); |
| 387 ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU); | |
| 384 | 388 |
| 385 if (aims == NULL && jabbers == NULL && yahoos == NULL && | 389 if (aims == NULL && jabbers == NULL && yahoos == NULL && |
| 386 msns == NULL && icqs == NULL && novells == NULL) | 390 msns == NULL && icqs == NULL && novells == NULL && |
| 391 ggs == NULL) | |
| 387 { | 392 { |
| 388 GtkTreeIter iter; | 393 GtkTreeIter iter; |
| 389 | 394 |
| 390 gtk_list_store_append(dialog->model, &iter); | 395 gtk_list_store_append(dialog->model, &iter); |
| 391 | 396 |
| 400 add_ims(dialog, contact, name, jabbers, "prpl-jabber"); | 405 add_ims(dialog, contact, name, jabbers, "prpl-jabber"); |
| 401 add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); | 406 add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); |
| 402 add_ims(dialog, contact, name, msns, "prpl-msn"); | 407 add_ims(dialog, contact, name, msns, "prpl-msn"); |
| 403 add_ims(dialog, contact, name, icqs, "prpl-icq"); | 408 add_ims(dialog, contact, name, icqs, "prpl-icq"); |
| 404 add_ims(dialog, contact, name, novells, "prpl-novell"); | 409 add_ims(dialog, contact, name, novells, "prpl-novell"); |
| 410 add_ims(dialog, contact, name, ggs, "prpl-gg"); | |
| 405 } | 411 } |
| 406 } | 412 } |
| 407 } | 413 } |
| 408 | 414 |
| 409 static void | 415 static void |
