[gnome-packagekit/polkit1: 21/92] fix conflicts

[Richard Hughes <rhughes src gnome org>]

commit dcf80f999293f667c14aa069393077d5320c2c21
Merge: 501035e... 164cfcf...
Author: Richard Hughes <richard hughsie com>
Date:   Tue May 26 18:23:37 2009 +0100

    fix conflicts

 configure.ac                       |    2 +-
 contrib/gnome-packagekit.spec.in   |    5 +-
 po/es.po                           |  498 +++---
 po/he.po                           | 2635 +++++++++++++++-------------
 po/hu.po                           | 3441 ++++++++++++++++--------------------
 po/mr.po                           | 3307 +++++++++++++++-------------------
 po/pt_BR.po                        |  502 +++---
 po/zh_CN.po                        | 2510 ++++++++++++++-------------
 src/Makefile.am                    |    2 -
 src/gpk-application.c              |    4 +
 src/gpk-check-update.c             |   43 +-
 src/gpk-common.c                   |   31 +
 src/gpk-common.h                   |    1 +
 src/gpk-dbus-task.c                |   29 +-
 src/gpk-dbus.c                     |   11 +
 src/gpk-dbus.h                     |   11 +-
 src/gpk-enum.c                     |    6 +
 src/gpk-enum.h                     |   26 +
 src/gpk-helper-media-change.h      |    2 +
 src/gpk-install-catalog.c          |    9 +-
 src/gpk-install-local-file.c       |    7 +-
 src/gpk-install-mime-type.c        |    7 +-
 src/gpk-install-package-name.c     |    7 +-
 src/gpk-install-provide-file.c     |    7 +-
 src/gpk-modal-dialog.h             |   36 +-
 src/gpk-service-pack.c             |   97 +-
 src/gpk-smart-icon.c               |  185 --
 src/gpk-smart-icon.h               |   59 -
 src/gpk-update-viewer.c            |    2 +-
 src/gpk-watch.c                    |   33 +-
 src/org.freedesktop.PackageKit.xml |   40 +
 31 files changed, 6490 insertions(+), 7065 deletions(-)
---
diff --cc src/gpk-watch.c
index a97dfa8,639dd82..d7772b6
--- a/src/gpk-watch.c
+++ b/src/gpk-watch.c
@@@ -1550,8 -1554,9 +1556,6 @@@ gpk_watch_button_cancel_cb (GtkWidget *
  static void
  gpk_watch_init (GpkWatch *watch)
  {
- 	GtkStatusIcon *status_icon;
- 
 -	PolKitAction *pk_action;
 -	PolKitGnomeAction *restart_action;
 -
  	watch->priv = GPK_WATCH_GET_PRIVATE (watch);
  	watch->priv->error_details = NULL;
  	watch->priv->notification_cached_messages = NULL;