1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
From b6ba8bcc6db7765667cd6c49b7edc9a2073bc74f Mon Sep 17 00:00:00 2001
Message-ID: <b6ba8bcc6db7765667cd6c49b7edc9a2073bc74f.1754900600.git.sam@gentoo.org>
In-Reply-To: <aa63712b18b79b983e3d9cd7ce5105d0ec7ac262.1754900600.git.sam@gentoo.org>
References: <aa63712b18b79b983e3d9cd7ce5105d0ec7ac262.1754900600.git.sam@gentoo.org>
From: Werner Koch <wk@gnupg.org>
Date: Fri, 18 Jul 2025 09:45:23 +0200
Subject: [PATCH 2/3] Remove trust_item stuff to make it build with gpgme 2.x
* src/gpacontext.h (struct _GpaContextClass): Remove next_trust_item.
* src/gpacontext.c (NEXT_TRUST_ITEM): Remove
(gpa_context_class_init): Remove assignment.
(gpa_context_event_cb): Remove handler.
(gpa_context_next_trust_item): Remove.
--
Note that the trust item feature worked only for a very short period
in 2003.
--- a/src/gpacontext.c
+++ b/src/gpacontext.c
@@ -38,8 +38,6 @@ static void gpa_context_finalize (GObject *object);
static void gpa_context_start (GpaContext *context);
static void gpa_context_done (GpaContext *context, gpg_error_t err);
static void gpa_context_next_key (GpaContext *context, gpgme_key_t key);
-static void gpa_context_next_trust_item (GpaContext *context,
- gpgme_trust_item_t item);
static void gpa_context_progress (GpaContext *context, int current, int total);
/* The GPGME I/O callbacks */
@@ -65,7 +63,6 @@ enum
START,
DONE,
NEXT_KEY,
- NEXT_TRUST_ITEM,
PROGRESS,
LAST_SIGNAL
};
@@ -113,7 +110,6 @@ gpa_context_class_init (GpaContextClass *klass)
klass->start = gpa_context_start;
klass->done = gpa_context_done;
klass->next_key = gpa_context_next_key;
- klass->next_trust_item = gpa_context_next_trust_item;
klass->progress = gpa_context_progress;
/* Signals */
@@ -143,15 +139,6 @@ gpa_context_class_init (GpaContextClass *klass)
g_cclosure_marshal_VOID__POINTER,
G_TYPE_NONE, 1,
G_TYPE_POINTER);
- signals[NEXT_TRUST_ITEM] =
- g_signal_new ("next_trust_item",
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (GpaContextClass, next_trust_item),
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE, 1,
- G_TYPE_POINTER);
signals[PROGRESS] =
g_signal_new ("progress",
G_TYPE_FROM_CLASS (object_class),
@@ -496,10 +483,6 @@ gpa_context_event_cb (void *data, gpgme_event_io_t type, void *type_data)
case GPGME_EVENT_NEXT_KEY:
g_signal_emit (context, signals[NEXT_KEY], 0, type_data);
break;
- case GPGME_EVENT_NEXT_TRUSTITEM:
- g_signal_emit (context, signals[NEXT_TRUST_ITEM], 0,
- type_data);
- break;
default:
/* Ignore unsupported event types */
break;
@@ -531,12 +514,6 @@ gpa_context_next_key (GpaContext *context, gpgme_key_t key)
/* Do nothing yet */
}
-static void
-gpa_context_next_trust_item (GpaContext *context, gpgme_trust_item_t item)
-{
- /* Do nothing yet */
-}
-
static void
gpa_context_progress (GpaContext *context, int current, int total)
{
--- a/src/gpacontext.h
+++ b/src/gpacontext.h
@@ -63,7 +63,6 @@ struct _GpaContextClass {
void (*start) (GpaContext *context);
void (*done) (GpaContext *context, gpg_error_t err);
void (*next_key) (GpaContext *context, gpgme_key_t key);
- void (*next_trust_item) (GpaContext *context, gpgme_trust_item_t item);
void (*progress) (GpaContext *context, int current, int total);
};
--
2.50.1
|
