[libwnck: 17/17] Merge branch 'gtk3'

[Vincent Untz <vuntz src gnome org>]

commit c9a156b1d68a4c04f0a86f1b048fe9e1c1a06003
Merge: fd3f079 d1f711d
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Jan 19 14:18:57 2011 +0100

    Merge branch 'gtk3'
    
    Conflicts:
    	configure.ac

 Makefile.am                                        |    8 +-
 configure.ac                                       |   14 +-
 doc/Makefile.am                                    |    3 +-
 doc/libwnck-docs.sgml                              |    2 +-
 doc/tmpl/misc.sgml                                 |    8 -
 doc/tmpl/pager.sgml                                |   11 +-
 doc/tmpl/screen.sgml                               |   21 -
 doc/tmpl/tasklist.sgml                             |   47 +--
 doc/tmpl/window-action-menu.sgml                   |    9 -
 ...nstalled.pc.in => libwnck-3.0-uninstalled.pc.in |    4 +-
 libwnck-1.0.pc.in => libwnck-3.0.pc.in             |    6 +-
 libwnck/Makefile.am                                |   28 +-
 libwnck/application.c                              |   90 ++--
 libwnck/class-group.c                              |   22 +-
 libwnck/pager-accessible-factory.c                 |    4 +-
 libwnck/pager-accessible.c                         |   56 +-
 libwnck/pager.c                                    |  399 +++++-----
 libwnck/pager.h                                    |   10 +-
 libwnck/screen.c                                   |  382 ++++------
 libwnck/screen.h                                   |    7 -
 libwnck/selector.c                                 |   22 +-
 libwnck/tasklist.c                                 |  824 +++++++-------------
 libwnck/tasklist.h                                 |   16 +-
 libwnck/test-pager.c                               |   25 +-
 libwnck/test-selector.c                            |   16 +-
 libwnck/test-tasklist.c                            |   43 +-
 libwnck/util.c                                     |   57 +-
 libwnck/util.h                                     |    7 -
 libwnck/window-action-menu.c                       |   21 +-
 libwnck/window-action-menu.h                       |    4 -
 libwnck/window.c                                   |  160 ++--
 libwnck/wnckprop.c                                 |   12 +-
 libwnck/workspace-accessible.c                     |   22 +-
 libwnck/workspace.c                                |   38 +-
 libwnck/xutils.c                                   |  503 ++++++-------
 libwnck/xutils.h                                   |    9 +-
 36 files changed, 1159 insertions(+), 1751 deletions(-)
---