Merge lp:~olivier-martin/lightdm/fixed-gasyncresultiface into lp:lightdm

Proposed by Olivier Martin
Status: Merged
Merged at revision: 2021
Proposed branch: lp:~olivier-martin/lightdm/fixed-gasyncresultiface
Merge into: lp:lightdm
Diff against target: 20 lines (+0/-7)
1 file modified
liblightdm-gobject/greeter.c (+0/-7)
To merge this branch: bzr merge lp:~olivier-martin/lightdm/fixed-gasyncresultiface
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Olivier Martin (community) Needs Resubmitting
Review via email: mp+224730@code.launchpad.net

Description of the change

configure.ac: Modules gio-2.0 needs to be at least 2.34

GAsyncResultIface.is_tagged used by liblightdm-gobject
has been added to 2.34 in commit:

commit 82d914d808c616d14d489c0272c6d5afc4bfbd5a
Author: Dan Winship <email address hidden>
Date: Thu May 10 11:09:52 2012 -0400
Title: gio: add g_async_result_is_tagged()

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

We just have this method returning FALSE. Looking at glib/gio/g_async_result_is_tagged if we just don't add this method it should have the same result. Was there anything else thatwas requiring gio 2.34?

review: Needs Information
Revision history for this message
Olivier Martin (olivier-martin) wrote :

I am building lightdm from 'Ubuntu 12.04.4 LTS'.

GAsyncResultIface.is_tagged attribute is not available in the Glib I/O
library (version 2.32.4) from this version.
./configure did not report me any issue but I had a build error when
building lightdm.

On 26 June 2014 23:25, Robert Ancell <email address hidden> wrote:

> Review: Needs Information
>
> We just have this method returning FALSE. Looking at
> glib/gio/g_async_result_is_tagged if we just don't add this method it
> should have the same result. Was there anything else thatwas requiring gio
> 2.34?
> --
>
> https://code.launchpad.net/~olivier-martin/lightdm/fixed-gasyncresultiface/+merge/224730
> You are the owner of lp:~olivier-martin/lightdm/fixed-gasyncresultiface.
>

Revision history for this message
Robert Ancell (robert-ancell) wrote :

Right - I'm just thinking the best solution might be to remove this code rather than bump the minimum requirement.

2004. By Olivier Martin

liblightdm-gobject: Enabled the library for lower Glib I/O versions

Removed GAsyncResultIface.is_tagged as this attribute was not available
in earlier versions of Glib I/O.

Revision history for this message
Olivier Martin (olivier-martin) wrote :

Anything missing in this patch?

review: Needs Resubmitting
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'liblightdm-gobject/greeter.c'
2--- liblightdm-gobject/greeter.c 2014-05-28 20:23:37 +0000
3+++ liblightdm-gobject/greeter.c 2014-06-27 08:51:28 +0000
4@@ -1916,16 +1916,9 @@
5 return NULL;
6 }
7
8-static gboolean
9-request_is_tagged (GAsyncResult *res, gpointer source_tag)
10-{
11- return FALSE;
12-}
13-
14 static void
15 request_iface_init (GAsyncResultIface *iface)
16 {
17 iface->get_user_data = request_get_user_data;
18 iface->get_source_object = request_get_source_object;
19- iface->is_tagged = request_is_tagged;
20 }

Subscribers

People subscribed via source and target branches