|
0 |
From 197edf65526c6595c3860f9989fe99e56f6adc45 Mon Sep 17 00:00:00 2001
|
|
1 |
From: Michael Biebl <biebl@debian.org>
|
|
2 |
Date: Tue, 25 Oct 2011 16:53:22 +0200
|
|
3 |
Subject: [PATCH] Revert "Drop marshaller complications"
|
|
4 |
|
|
5 |
This reverts commit 1d019a66f9eaf6cd472eecfa38ce462a1b12906c.
|
|
6 |
---
|
|
7 |
src/Makefile.am | 9 +++++++++
|
|
8 |
src/polkitgnomeauthenticator.c | 3 ++-
|
|
9 |
src/polkitgnomemarshal.list | 1 +
|
|
10 |
3 files changed, 12 insertions(+), 1 deletions(-)
|
|
11 |
create mode 100644 src/polkitgnomemarshal.list
|
|
12 |
|
|
13 |
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
14 |
index 6f12d4c..909624e 100644
|
|
15 |
--- a/src/Makefile.am
|
|
16 |
+++ b/src/Makefile.am
|
|
17 |
@@ -5,6 +5,13 @@ FULL_LIBEXECDIR=$(libexecdir)
|
|
18 |
|
|
19 |
libexec_PROGRAMS = polkit-gnome-authentication-agent-1
|
|
20 |
|
|
21 |
+polkitgnomemarshal.h polkitgnomemarshal.c : Makefile.am $(srcdir)/polkitgnomemarshal.list
|
|
22 |
+ glib-genmarshal --prefix=_polkit_gnome_marshal $(srcdir)/polkitgnomemarshal.list --header > polkitgnomemarshal.h.tmp && mv polkitgnomemarshal.h.tmp polkitgnomemarshal.h
|
|
23 |
+ (echo "#include \"polkitgnomemarshal.h\""; glib-genmarshal --prefix=_polkit_gnome_marshal $(srcdir)/polkitgnomemarshal.list --body) > polkitgnomemarshal.c.tmp && mv polkitgnomemarshal.c.tmp polkitgnomemarshal.c
|
|
24 |
+ touch polkitgnomemarshal.stamp
|
|
25 |
+
|
|
26 |
+BUILT_SOURCES = polkitgnomemarshal.h polkitgnomemarshal.c
|
|
27 |
+
|
|
28 |
polkit_gnome_authentication_agent_1_SOURCES = \
|
|
29 |
polkitgnomelistener.h polkitgnomelistener.c \
|
|
30 |
polkitgnomeauthenticator.h polkitgnomeauthenticator.c \
|
|
31 |
@@ -40,5 +47,7 @@ polkit_gnome_authentication_agent_1_LDADD = \
|
|
32 |
$(POLKIT_GOBJECT_LIBS) \
|
|
33 |
$(INTLLIBS)
|
|
34 |
|
|
35 |
+EXTRA_DIST = polkitgnomemarshal.list
|
|
36 |
+
|
|
37 |
clean-local :
|
|
38 |
rm -f *~
|
|
39 |
diff --git a/src/polkitgnomeauthenticator.c b/src/polkitgnomeauthenticator.c
|
|
40 |
index 3eeb604..698796f 100644
|
|
41 |
--- a/src/polkitgnomeauthenticator.c
|
|
42 |
+++ b/src/polkitgnomeauthenticator.c
|
|
43 |
@@ -32,6 +32,7 @@
|
|
44 |
|
|
45 |
#include "polkitgnomeauthenticator.h"
|
|
46 |
#include "polkitgnomeauthenticationdialog.h"
|
|
47 |
+#include "polkitgnomemarshal.h"
|
|
48 |
|
|
49 |
struct _PolkitGnomeAuthenticator
|
|
50 |
{
|
|
51 |
@@ -137,7 +138,7 @@ polkit_gnome_authenticator_class_init (PolkitGnomeAuthenticatorClass *klass)
|
|
52 |
0, /* class offset */
|
|
53 |
NULL, /* accumulator */
|
|
54 |
NULL, /* accumulator data */
|
|
55 |
- NULL, /* use generic marshaller */
|
|
56 |
+ _polkit_gnome_marshal_VOID__BOOLEAN_BOOLEAN,
|
|
57 |
G_TYPE_NONE,
|
|
58 |
2,
|
|
59 |
G_TYPE_BOOLEAN,
|
|
60 |
diff --git a/src/polkitgnomemarshal.list b/src/polkitgnomemarshal.list
|
|
61 |
new file mode 100644
|
|
62 |
index 0000000..3259d90
|
|
63 |
--- /dev/null
|
|
64 |
+++ b/src/polkitgnomemarshal.list
|
|
65 |
@@ -0,0 +1 @@
|
|
66 |
+VOID:BOOLEAN,BOOLEAN
|
|
67 |
--
|
|
68 |
1.7.7
|
|
69 |
|