ACK
Christophe
On Tue, Aug 28, 2012 at 10:10:35AM -0700, Marc-André Lureau wrote:
> gtk/channel-smartcard.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> New commits:
> commit 88ee2d1f5dcccdb6f92092292d86c5e2413cf2cf
> Author: Marc-Andr?? Lureau <marcandre.lureau@xxxxxxxxxx>
> Date: Tue Aug 28 19:02:46 2012 +0200
>
> misc build fix when --disable-smartcard
>
> diff --git a/gtk/channel-smartcard.c b/gtk/channel-smartcard.c
> index 41d9554..5dafd29 100644
> --- a/gtk/channel-smartcard.c
> +++ b/gtk/channel-smartcard.c
> @@ -133,12 +133,14 @@ static void spice_smartcard_channel_init(SpiceSmartcardChannel *channel)
> static void spice_smartcard_channel_constructed(GObject *object)
> {
> SpiceSession *s = spice_channel_get_session(SPICE_CHANNEL(object));
> - SpiceSmartcardChannel *channel = SPICE_SMARTCARD_CHANNEL(object);
> - SpiceSmartcardManager *manager = spice_smartcard_manager_get();
> -
>
> g_return_if_fail(s != NULL);
> +
> +#ifdef USE_SMARTCARD
> if (!s->priv->migration_copy) {
> + SpiceSmartcardChannel *channel = SPICE_SMARTCARD_CHANNEL(object);
> + SpiceSmartcardManager *manager = spice_smartcard_manager_get();
> +
> g_signal_connect(G_OBJECT(manager), "reader-added",
> (GCallback)reader_added_cb, channel);
> g_signal_connect(G_OBJECT(manager), "reader-removed",
> @@ -148,6 +150,7 @@ static void spice_smartcard_channel_constructed(GObject *object)
> g_signal_connect(G_OBJECT(manager), "card-removed",
> (GCallback)card_removed_cb, channel);
> }
> +#endif
>
> if (G_OBJECT_CLASS(spice_smartcard_channel_parent_class)->constructed)
> G_OBJECT_CLASS(spice_smartcard_channel_parent_class)->constructed(object);
> _______________________________________________
> Spice-commits mailing list
> Spice-commits@xxxxxxxxxxxxxxxxxxxxx
> http://lists.freedesktop.org/mailman/listinfo/spice-commits
Attachment:
pgpK8w8iENOUq.pgp
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel