Mercurial > pidgin.yaz
changeset 19978:611b3a1080a8
Fixing g(tk|nt)certmgr.c
| author | Gabriel Schulhof <nix@go-nix.ca> |
|---|---|
| date | Wed, 12 Sep 2007 20:17:17 +0000 |
| parents | a04aaab1ad12 |
| children | 11002b20eafc |
| files | finch/gntcertmgr.c pidgin/gtkcertmgr.c |
| diffstat | 2 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntcertmgr.c Wed Sep 12 20:12:08 2007 +0000 +++ b/finch/gntcertmgr.c Wed Sep 12 20:17:17 2007 +0000 @@ -89,7 +89,7 @@ _("OK"), G_CALLBACK(tls_peers_mgmt_import_ok2_cb), _("Cancel"), G_CALLBACK(tls_peers_mgmt_import_cancel2_cb), NULL, NULL, NULL, - "blist", crt); + "certmgr", crt); g_free(default_hostname); } else { gchar * secondary; @@ -111,7 +111,7 @@ FALSE, G_CALLBACK(tls_peers_mgmt_import_ok_cb), NULL, - NULL, NULL, NULL, "blist", NULL ); + NULL, NULL, NULL, "certmgr", NULL ); } /* Save certs in some file */ @@ -160,7 +160,7 @@ G_CALLBACK(tls_peers_mgmt_export_ok_cb), G_CALLBACK(purple_certificate_destroy), NULL, NULL, NULL, - "blist", crt); + "certmgr", crt); } /* Show information about a cert */ @@ -235,7 +235,7 @@ purple_request_yes_no((void *)key, _("Confirm certificate delete"), primary, NULL, 2, - NULL, NULL, NULL, "blist", + NULL, NULL, NULL, "certmgr", g_strdup(key), tls_peers_mgmt_delete_confirm_cb, g_free);
--- a/pidgin/gtkcertmgr.c Wed Sep 12 20:12:08 2007 +0000 +++ b/pidgin/gtkcertmgr.c Wed Sep 12 20:17:17 2007 +0000 @@ -196,7 +196,7 @@ _("Cancel"), G_CALLBACK(tls_peers_mgmt_import_cancel2_cb), NULL, NULL, NULL, /* No account/who/conv*/ - crt /* Pass cert instance to callback*/ + "certmgr", crt /* Pass cert instance to callback*/ ); g_free(default_hostname); @@ -225,7 +225,7 @@ FALSE, /* Not a save dialog */ G_CALLBACK(tls_peers_mgmt_import_ok_cb), NULL, /* Do nothing if cancelled */ - NULL, NULL, NULL, NULL );/* No account,conv,etc. */ + NULL, NULL, NULL, "certmgr", NULL );/* No account,conv,etc. */ } static void @@ -301,7 +301,7 @@ G_CALLBACK(tls_peers_mgmt_export_ok_cb), G_CALLBACK(tls_peers_mgmt_export_cancel_cb), NULL, NULL, NULL, /* No account,conv,etc. */ - crt); /* Pass the certificate on to the callback */ + "certmgr", crt); /* Pass the certificate on to the callback */ } static void @@ -394,6 +394,7 @@ primary, NULL, /* Can this be NULL? */ 2, /* NO is default action */ NULL, NULL, NULL, + "certmgr", id, /* id ownership passed to callback */ tls_peers_mgmt_delete_confirm_cb, tls_peers_mgmt_delete_confirm_cb );