Mercurial > pidgin
comparison src/protocols/novell/novell.c @ 8782:5a2b5e4abf3a
[gaim-migrate @ 9544]
Compiles again with gcc 2.96. Patch by Ignacio J. Elia.
committer: Tailor Script <tailor@pidgin.im>
author | Christian Hammond <chipx86@chipx86.com> |
---|---|
date | Fri, 23 Apr 2004 23:10:10 +0000 |
parents | d3c0203d4961 |
children | 518455386538 |
comparison
equal
deleted
inserted
replaced
8781:d3c0203d4961 | 8782:5a2b5e4abf3a |
---|---|
891 _add_contacts_to_gaim_blist(NMUser * user, NMFolder * folder) | 891 _add_contacts_to_gaim_blist(NMUser * user, NMFolder * folder) |
892 { | 892 { |
893 NMUserRecord *user_record = NULL; | 893 NMUserRecord *user_record = NULL; |
894 NMContact *contact = NULL; | 894 NMContact *contact = NULL; |
895 GaimBuddy *buddy = NULL; | 895 GaimBuddy *buddy = NULL; |
896 GaimGroup *group; | |
896 NMERR_T cnt = 0, i; | 897 NMERR_T cnt = 0, i; |
897 const char *text = NULL; | 898 const char *text = NULL; |
898 const char *name = NULL; | 899 const char *name = NULL; |
899 int status = 0; | 900 int status = 0; |
900 | 901 |
910 buddy = gaim_buddy_new(user->client_data, | 911 buddy = gaim_buddy_new(user->client_data, |
911 name, | 912 name, |
912 nm_contact_get_display_name(contact)); | 913 nm_contact_get_display_name(contact)); |
913 | 914 |
914 /* Does the Gaim group exist already? */ | 915 /* Does the Gaim group exist already? */ |
915 GaimGroup *group = gaim_find_group(nm_folder_get_name(folder)); | 916 group = gaim_find_group(nm_folder_get_name(folder)); |
916 | 917 |
917 if (group == NULL) { | 918 if (group == NULL) { |
918 group = gaim_group_new(nm_folder_get_name(folder)); | 919 group = gaim_group_new(nm_folder_get_name(folder)); |
919 gaim_blist_add_group(group, NULL); | 920 gaim_blist_add_group(group, NULL); |
920 } | 921 } |
2059 static void | 2060 static void |
2060 novell_rename_group(GaimConnection * gc, const char *old_name, | 2061 novell_rename_group(GaimConnection * gc, const char *old_name, |
2061 const char *new_name, GList * tobemoved) | 2062 const char *new_name, GList * tobemoved) |
2062 { | 2063 { |
2063 NMERR_T rc = NM_OK; | 2064 NMERR_T rc = NM_OK; |
2065 NMFolder *folder; | |
2064 NMUser *user; | 2066 NMUser *user; |
2065 | 2067 |
2066 if (gc == NULL || old_name == NULL || new_name == NULL || tobemoved == NULL) { | 2068 if (gc == NULL || old_name == NULL || new_name == NULL || tobemoved == NULL) { |
2067 return; | 2069 return; |
2068 } | 2070 } |
2076 * need to worry about this situation. | 2078 * need to worry about this situation. |
2077 */ | 2079 */ |
2078 return; | 2080 return; |
2079 } | 2081 } |
2080 | 2082 |
2081 NMFolder *folder = nm_find_folder(user, old_name); | 2083 folder = nm_find_folder(user, old_name); |
2082 | 2084 |
2083 if (folder) { | 2085 if (folder) { |
2084 rc = nm_send_rename_folder(user, folder, new_name, | 2086 rc = nm_send_rename_folder(user, folder, new_name, |
2085 _rename_folder_resp_cb, NULL); | 2087 _rename_folder_resp_cb, NULL); |
2086 _check_for_disconnect(user, rc); | 2088 _check_for_disconnect(user, rc); |