← Back to branch summary

~ted/pidgin/11_buddy_list_really_show.patch

« back to all changes in this revision

Viewing changes to libpurple/protocols/silc/pk.c

  • Committer: Bazaar Package Importer
  • Date: 2008-10-13 20:37:35 UTC
  • Revision ID: jamesw@ubuntu.com-20081013203735-pi5e6u963tydsu0r
Tags: upstream-ubuntu-2.4.2
Import upstream version 2.4.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/protocols/silc/pk.c
56
56
                                          SILC_PKCS_FILE_BASE64);
57
57
        }
58
58
 
59
 
        silc_free(verify->filename);
60
 
        silc_free(verify->entity);
61
 
        silc_free(verify->entity_name);
 
59
        g_free(verify->filename);
 
60
        g_free(verify->entity);
 
61
        g_free(verify->entity_name);
62
62
        silc_free(verify->fingerprint);
63
63
        silc_free(verify->babbleprint);
64
64
        silc_pkcs_public_key_free(verify->public_key);
211
211
                return;
212
212
        verify->client = client;
213
213
        verify->conn = conn;
214
 
        verify->filename = strdup(ipf);
215
 
        verify->entity = strdup(entity);
 
214
        verify->filename = g_strdup(ipf);
 
215
        verify->entity = g_strdup(entity);
216
216
        verify->entity_name = (conn_type != SILC_CONN_CLIENT ?
217
 
                               (name ? strdup(name) : strdup(hostname))
 
217
                               (name ? g_strdup(name) : g_strdup(hostname))
218
218
                               : NULL);
219
219
        verify->public_key = silc_pkcs_public_key_copy(public_key);
220
220
        verify->completion = completion;
262
262
                /* Local copy matched */
263
263
                if (completion)
264
264
                        completion(TRUE, context);
265
 
                silc_free(verify->filename);
266
 
                silc_free(verify->entity);
267
 
                silc_free(verify->entity_name);
 
265
                g_free(verify->filename);
 
266
                g_free(verify->entity);
 
267
                g_free(verify->entity_name);
268
268
                silc_free(verify->fingerprint);
269
269
                silc_free(verify->babbleprint);
270
270
                silc_pkcs_public_key_free(verify->public_key);