[PolicyKit-gnome] Drop marshaller complications
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [PolicyKit-gnome] Drop marshaller complications
- Date: Tue, 13 Sep 2011 23:13:31 +0000 (UTC)
commit 1d019a66f9eaf6cd472eecfa38ce462a1b12906c
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Sep 5 09:22:25 2011 -0400
Drop marshaller complications
GLib provides a generic marshaller nowadays, lets use it.
https://bugzilla.gnome.org/show_bug.cgi?id=658256
src/Makefile.am | 9 ---------
src/polkitgnomeauthenticator.c | 3 +--
src/polkitgnomemarshal.list | 1 -
3 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 909624e..6f12d4c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,13 +5,6 @@ FULL_LIBEXECDIR=$(libexecdir)
libexec_PROGRAMS = polkit-gnome-authentication-agent-1
-polkitgnomemarshal.h polkitgnomemarshal.c : Makefile.am $(srcdir)/polkitgnomemarshal.list
- glib-genmarshal --prefix=_polkit_gnome_marshal $(srcdir)/polkitgnomemarshal.list --header > polkitgnomemarshal.h.tmp && mv polkitgnomemarshal.h.tmp polkitgnomemarshal.h
- (echo "#include \"polkitgnomemarshal.h\""; glib-genmarshal --prefix=_polkit_gnome_marshal $(srcdir)/polkitgnomemarshal.list --body) > polkitgnomemarshal.c.tmp && mv polkitgnomemarshal.c.tmp polkitgnomemarshal.c
- touch polkitgnomemarshal.stamp
-
-BUILT_SOURCES = polkitgnomemarshal.h polkitgnomemarshal.c
-
polkit_gnome_authentication_agent_1_SOURCES = \
polkitgnomelistener.h polkitgnomelistener.c \
polkitgnomeauthenticator.h polkitgnomeauthenticator.c \
@@ -47,7 +40,5 @@ polkit_gnome_authentication_agent_1_LDADD = \
$(POLKIT_GOBJECT_LIBS) \
$(INTLLIBS)
-EXTRA_DIST = polkitgnomemarshal.list
-
clean-local :
rm -f *~
diff --git a/src/polkitgnomeauthenticator.c b/src/polkitgnomeauthenticator.c
index 698796f..3eeb604 100644
--- a/src/polkitgnomeauthenticator.c
+++ b/src/polkitgnomeauthenticator.c
@@ -32,7 +32,6 @@
#include "polkitgnomeauthenticator.h"
#include "polkitgnomeauthenticationdialog.h"
-#include "polkitgnomemarshal.h"
struct _PolkitGnomeAuthenticator
{
@@ -138,7 +137,7 @@ polkit_gnome_authenticator_class_init (PolkitGnomeAuthenticatorClass *klass)
0, /* class offset */
NULL, /* accumulator */
NULL, /* accumulator data */
- _polkit_gnome_marshal_VOID__BOOLEAN_BOOLEAN,
+ NULL, /* use generic marshaller */
G_TYPE_NONE,
2,
G_TYPE_BOOLEAN,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]