Magellan Linux

Annotation of /trunk/gaim/patches/gaim-1.5.0-privacy.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 144 - (hide annotations) (download)
Tue May 8 20:06:05 2007 UTC (17 years, 1 month ago) by niro
File size: 1221 byte(s)
-import

1 niro 144 ===================================================================
2     RCS file: /cvsroot/gaim/gaim/src/privacy.c,v
3     retrieving revision 1.16
4     retrieving revision 1.18
5     diff -u -r1.16 -r1.18
6     --- gaim/gaim/src/privacy.c 2005/07/17 23:36:33 1.16
7     +++ gaim/gaim/src/privacy.c 2006/02/07 02:49:56 1.18
8     @@ -85,8 +85,8 @@
9     if (l == NULL)
10     return FALSE;
11    
12     - account->permit = g_slist_remove(account->permit, l->data);
13     g_free(l->data);
14     + account->permit = g_slist_delete_link(account->permit, l);
15    
16     if (!local_only && gaim_account_is_connected(account))
17     serv_rem_permit(gaim_account_get_connection(account), who);
18     @@ -156,15 +156,16 @@
19     if (l == NULL)
20     return FALSE;
21    
22     - account->deny = g_slist_remove(account->deny, l->data);
23     - g_free(l->data);
24     + name = l->data;
25     + account->deny = g_slist_delete_link(account->deny, l);
26    
27     if (!local_only && gaim_account_is_connected(account))
28     - serv_rem_deny(gaim_account_get_connection(account), who);
29     + serv_rem_deny(gaim_account_get_connection(account), name);
30    
31     if (privacy_ops != NULL && privacy_ops->deny_removed != NULL)
32     - privacy_ops->deny_removed(account, who);
33     + privacy_ops->deny_removed(account, name);
34    
35     + g_free(name);
36     gaim_blist_schedule_save();
37    
38     return TRUE;