comparison: src/protocols/novell/novell.c
src/protocols/novell/novell.c
- changeset 9554
- 1609ba3612c3
- parent 9475
- 8c8d4ac992a6
- child 9620
- fe99fcea5c1c
equal
deleted
inserted
replaced
| 9553:146d83b7512b | 9554:1609ba3612c3 |
|---|---|
| 647 count = nm_conference_get_participant_count(conference); | 647 count = nm_conference_get_participant_count(conference); |
| 648 for (i = 0; i < count; i++) { | 648 for (i = 0; i < count; i++) { |
| 649 ur = nm_conference_get_participant(conference, i); | 649 ur = nm_conference_get_participant(conference, i); |
| 650 if (ur) { | 650 if (ur) { |
| 651 name = nm_user_record_get_display_id(ur); | 651 name = nm_user_record_get_display_id(ur); |
| 652 gaim_conv_chat_add_user(GAIM_CONV_CHAT(chat), name, NULL); | 652 gaim_conv_chat_add_user(GAIM_CONV_CHAT(chat), name, NULL, GAIM_CBFLAGS_NONE); |
| 653 } | 653 } |
| 654 } | 654 } |
| 655 } | 655 } |
| 656 } | 656 } |
| 657 } | 657 } |
| 1856 GaimConnection *gc; | 1856 GaimConnection *gc; |
| 1857 NMConference *conference = NULL; | 1857 NMConference *conference = NULL; |
| 1858 NMUserRecord *ur = NULL; | 1858 NMUserRecord *ur = NULL; |
| 1859 const char *name; | 1859 const char *name; |
| 1860 const char *conf_name; | 1860 const char *conf_name; |
| 1861 GList *list = NULL; | |
| 1862 | 1861 |
| 1863 gc = gaim_account_get_connection(user->client_data); | 1862 gc = gaim_account_get_connection(user->client_data); |
| 1864 if (gc == NULL) | 1863 if (gc == NULL) |
| 1865 return; | 1864 return; |
| 1866 | 1865 |
| 1876 if (chat) { | 1875 if (chat) { |
| 1877 | 1876 |
| 1878 nm_conference_set_data(conference, (gpointer) chat); | 1877 nm_conference_set_data(conference, (gpointer) chat); |
| 1879 | 1878 |
| 1880 name = nm_user_record_get_display_id(ur); | 1879 name = nm_user_record_get_display_id(ur); |
| 1881 gaim_conv_chat_add_user(GAIM_CONV_CHAT(chat), name, NULL); | 1880 gaim_conv_chat_add_user(GAIM_CONV_CHAT(chat), name, NULL, GAIM_CBFLAGS_NONE); |
| 1882 | 1881 |
| 1883 } | 1882 } |
| 1884 } | 1883 } |
| 1885 } | 1884 } |
| 1886 | 1885 |
| 1887 if (chat != NULL) { | 1886 if (chat != NULL) { |
| 1888 ur = nm_find_user_record(user, nm_event_get_source(event)); | 1887 ur = nm_find_user_record(user, nm_event_get_source(event)); |
| 1889 if (ur) { | 1888 if (ur) { |
| 1890 name = nm_user_record_get_display_id(ur); | 1889 name = nm_user_record_get_display_id(ur); |
| 1891 list = gaim_conv_chat_get_users(GAIM_CONV_CHAT(chat)); | 1890 if (!gaim_conv_chat_find_user(GAIM_CONV_CHAT(chat), name)) { |
| 1892 if (!g_list_find_custom(list, name, (GCompareFunc)nm_utf8_strcasecmp)) { | 1891 gaim_conv_chat_add_user(GAIM_CONV_CHAT(chat), name, NULL, GAIM_CBFLAGS_NONE); |
| 1893 gaim_conv_chat_add_user(GAIM_CONV_CHAT(chat), name, NULL); | |
| 1894 } | 1892 } |
| 1895 } | 1893 } |
| 1896 } | 1894 } |
| 1897 } | 1895 } |
| 1898 } | 1896 } |
