← Back to branch summary

~ubuntu-branches/ubuntu/vivid/atk1.0/vivid-proposed

« back to all changes in this revision

Viewing changes to atk/atkstateset.c

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich
  • Date: 2014-10-25 10:12:48 UTC
  • mfrom: (11.3.3 sid)
  • Revision ID: package-import@ubuntu.com-20141025101248-r41m1uvjfbri1lj4
Tags: 2.14.0-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - Build using dh-autoreconf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
atk/atkstateset.c
17
17
 * Boston, MA 02111-1307, USA.
18
18
 */
19
19
 
 
20
#include "config.h"
 
21
 
20
22
#include <glib-object.h>
21
23
 
22
24
#include "atkobject.h"
299
301
 *
300
302
 * Constructs the union of the two sets.
301
303
 *
302
 
 * Returns: (transfer full): a new #AtkStateSet which is the union of the two
303
 
 * sets, returning %NULL is empty.
 
304
 * Returns: (nullable) (transfer full): a new #AtkStateSet which is
 
305
 * the union of the two sets, returning %NULL is empty.
304
306
 **/
305
307
AtkStateSet*
306
308
atk_state_set_or_sets (AtkStateSet  *set,