[gnome-packagekit: 32/32] Merge branch 'glib2-merge-candidate'

[Richard Hughes <rhughes src gnome org>]

commit df55ed41fb1ea7553ed537cb47e0bc6030bf720c
Merge: a70a6c2... 49b2736...
Author: Richard Hughes <richard hughsie com>
Date:   Mon Oct 12 11:14:44 2009 +0100

    Merge branch 'glib2-merge-candidate'

 configure.ac                    |    4 +-
 data/gpk-update-viewer.ui       |   19 +-
 po/POTFILES.in                  |    7 +-
 src/Makefile.am                 |   35 +-
 src/gpk-animated-icon.c         |    5 +-
 src/gpk-application.c           | 2713 ++++++++++++++----------------
 src/gpk-auto-refresh.c          |  208 ++-
 src/gpk-backend-status.c        |  207 ++--
 src/gpk-cell-renderer-info.c    |    5 +-
 src/gpk-cell-renderer-info.h    |    2 +-
 src/gpk-cell-renderer-restart.c |    7 +-
 src/gpk-cell-renderer-restart.h |    2 +-
 src/gpk-cell-renderer-size.c    |    3 -
 src/gpk-check-update.c          | 1021 +++++-------
 src/gpk-common.c                |  272 ++--
 src/gpk-common.h                |   16 +-
 src/gpk-dbus-task.c             | 3547 +++++++++++++--------------------------
 src/gpk-dbus-task.h             |   32 +-
 src/gpk-dbus.c                  |   11 +-
 src/gpk-desktop.c               |    8 +-
 src/gpk-desktop.h               |    2 +-
 src/gpk-dialog.c                |   63 +-
 src/gpk-dialog.h                |    4 +-
 src/gpk-enum.c                  |   74 +-
 src/gpk-enum.h                  |   99 +-
 src/gpk-error.c                 |    7 +-
 src/gpk-firmware.c              |  589 +++----
 src/gpk-hardware.c              |  127 +-
 src/gpk-helper-chooser.c        |   31 +-
 src/gpk-helper-chooser.h        |    4 +-
 src/gpk-helper-deps-install.c   |  213 ---
 src/gpk-helper-deps-install.h   |   65 -
 src/gpk-helper-deps-remove.c    |  200 ---
 src/gpk-helper-deps-remove.h    |   65 -
 src/gpk-helper-deps-update.c    |  207 ---
 src/gpk-helper-deps-update.h    |   65 -
 src/gpk-helper-eula.c           |  242 ---
 src/gpk-helper-eula.h           |   67 -
 src/gpk-helper-media-change.c   |  187 --
 src/gpk-helper-media-change.h   |   68 -
 src/gpk-helper-repo-signature.c |  252 ---
 src/gpk-helper-repo-signature.h |   71 -
 src/gpk-helper-run.c            |   14 +-
 src/gpk-helper-untrusted.c      |  252 ---
 src/gpk-helper-untrusted.h      |   64 -
 src/gpk-inhibit.c               |    2 +-
 src/gpk-install-catalog.c       |    2 +-
 src/gpk-language.c              |    2 +-
 src/gpk-log.c                   |  143 +-
 src/gpk-modal-dialog.c          |   62 +-
 src/gpk-modal-dialog.h          |    6 +-
 src/gpk-prefs.c                 |  140 ++-
 src/gpk-repo.c                  |  484 +++---
 src/gpk-self-test.c             |    2 +
 src/gpk-service-pack.c          |  414 +++--
 src/gpk-task.c                  |  717 ++++++++
 src/gpk-task.h                  |   63 +
 src/gpk-update-icon.c           |    4 +-
 src/gpk-update-viewer-main.c    |  139 ++
 src/gpk-update-viewer.c         | 3245 +++++++++++++++++-------------------
 src/gpk-update-viewer.h         |   57 +
 src/gpk-watch.c                 | 1350 ++++++++--------
 62 files changed, 7699 insertions(+), 10289 deletions(-)
---