[seahorse] pgp: ComboKeys: Don't free keyid
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse] pgp: ComboKeys: Don't free keyid
- Date: Fri, 10 Jan 2020 07:27:26 +0000 (UTC)
commit 3f033a6c1607bcd41cbf2ea4dec9a7952df00b91
Author: Niels De Graef <nielsdegraef gmail com>
Date: Fri Jan 10 08:26:47 2020 +0100
pgp: ComboKeys: Don't free keyid
The return type is `(transfer none)`, so don't free it afterwards.
pgp/seahorse-combo-keys.c | 48 +++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/pgp/seahorse-combo-keys.c b/pgp/seahorse-combo-keys.c
index 00ba2fff..3c73d6a4 100644
--- a/pgp/seahorse-combo-keys.c
+++ b/pgp/seahorse-combo-keys.c
@@ -70,36 +70,36 @@ refresh_all_markup_in_combo (GtkComboBox *combo)
}
static gchar *
-calculate_markup_for_object (GtkComboBox *combo,
- const gchar *label,
+calculate_markup_for_object (GtkComboBox *combo,
+ const char *label,
SeahorseObject *object)
{
- ComboClosure *closure;
- const gchar *keyid;
- gchar *ident;
- const char *markup;
+ ComboClosure *closure;
+ char *markup;
- closure = g_object_get_data (G_OBJECT (combo), "combo-keys-closure");
+ closure = g_object_get_data (G_OBJECT (combo), "combo-keys-closure");
- if (!closure->collision) {
- if (g_hash_table_lookup (closure->labels, label)) {
- closure->collision = TRUE;
- refresh_all_markup_in_combo (combo);
- } else {
- g_hash_table_insert (closure->labels, g_strdup (label), "X");
- }
- }
+ if (!closure->collision) {
+ if (g_hash_table_lookup (closure->labels, label)) {
+ closure->collision = TRUE;
+ refresh_all_markup_in_combo (combo);
+ } else {
+ g_hash_table_insert (closure->labels, g_strdup (label), "X");
+ }
+ }
- if (closure->collision && SEAHORSE_PGP_IS_KEY (object)) {
- keyid = seahorse_pgp_key_get_keyid (SEAHORSE_PGP_KEY (object));
- ident = seahorse_pgp_key_calc_identifier (keyid);
- markup = g_markup_printf_escaped ("%s <span size='small'>[%s]</span>", label, ident);
- g_free (ident);
- } else {
- markup = g_markup_escape_text (label, -1);
- }
+ if (closure->collision && SEAHORSE_PGP_IS_KEY (object)) {
+ const char *keyid;
+ const char *ident;
+
+ keyid = seahorse_pgp_key_get_keyid (SEAHORSE_PGP_KEY (object));
+ ident = seahorse_pgp_key_calc_identifier (keyid);
+ markup = g_markup_printf_escaped ("%s <span size='small'>[%s]</span>", label, ident);
+ } else {
+ markup = g_markup_escape_text (label, -1);
+ }
- return markup;
+ return markup;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]