author | Alan Coopersmith <Alan.Coopersmith@Oracle.COM> |
Fri, 10 Feb 2017 10:03:57 -0800 | |
changeset 7661 | aff9737ef6ba |
parent 6334 | 0df352371b20 |
permissions | -rw-r--r-- |
7661
aff9737ef6ba
25534788 Resync gnome/desktop patches with upstream efforts
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
6334
diff
changeset
|
1 |
Without this, the compiler complains about a prototype mismatch between the |
aff9737ef6ba
25534788 Resync gnome/desktop patches with upstream efforts
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
6334
diff
changeset
|
2 |
*.h prototype and *.c definition of these functions and the build fails. |
aff9737ef6ba
25534788 Resync gnome/desktop patches with upstream efforts
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
6334
diff
changeset
|
3 |
|
aff9737ef6ba
25534788 Resync gnome/desktop patches with upstream efforts
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
6334
diff
changeset
|
4 |
Submitted upstream: https://bugzilla.gnome.org/show_bug.cgi?id=777282 |
aff9737ef6ba
25534788 Resync gnome/desktop patches with upstream efforts
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
6334
diff
changeset
|
5 |
Accepted for a release after 3.20.0: |
aff9737ef6ba
25534788 Resync gnome/desktop patches with upstream efforts
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
6334
diff
changeset
|
6 |
https://git.gnome.org/browse/gcr/commit/?id=bb05b11bef51ce54d125da4ecee15f1fda8fe66f |
6334
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
7 |
|
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
8 |
--- gcr-3.16.0/gcr/gcr-certificate-chain.h 2015-04-06 11:28:46.000000000 -0700 |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
9 |
+++ gcr-3.16.0/gcr/gcr-certificate-chain.h 2015-05-27 15:23:54.276255958 -0700 |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
10 |
@@ -90,14 +90,14 @@ |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
11 |
gboolean gcr_certificate_chain_build (GcrCertificateChain *self, |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
12 |
const gchar *purpose, |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
13 |
const gchar *peer, |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
14 |
- guint flags, |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
15 |
+ GcrCertificateChainFlags flags, |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
16 |
GCancellable *cancellable, |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
17 |
GError **error); |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
18 |
|
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
19 |
void gcr_certificate_chain_build_async (GcrCertificateChain *self, |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
20 |
const gchar *purpose, |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
21 |
const gchar *peer, |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
22 |
- guint flags, |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
23 |
+ GcrCertificateChainFlags flags, |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
24 |
GCancellable *cancellable, |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
25 |
GAsyncReadyCallback callback, |
0df352371b20
23634967 Deliver gcr 3.18.0 in Solaris
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff
changeset
|
26 |
gpointer user_data); |