[gnome-packagekit/polkit1: 28/30] Merge branch 'master' into polkit1

[Richard Hughes <rhughes src gnome org>]

commit ddf5871516a1b4bff67dbc6882f47e94b13ea082
Merge: 4d39a93... 9d325f1...
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jun 22 12:21:03 2009 +0100

    Merge branch 'master' into polkit1

 configure.ac                            |    2 +-
 data/gpk-application.ui                 |    2 +-
 data/gpk-prefs.ui                       |   69 +-
 help/C/figures/gpk-log.png              |  Bin 36600 -> 44282 bytes
 help/C/figures/gpk-prefs.png            |  Bin 28148 -> 24802 bytes
 help/C/figures/gpk-updates-overview.png |  Bin 25797 -> 66312 bytes
 help/C/figures/gpk-updates.png          |  Bin 59640 -> 83421 bytes
 help/de/de.po                           |  192 ++-
 help/es/es.po                           |   29 +-
 po/as.po                                | 3846 +++++++++++++++----------------
 po/es.po                                | 1860 ++++++++-------
 po/gu.po                                | 1099 ++++++---
 po/he.po                                | 1845 +++++++++-------
 po/kn.po                                |  176 +-
 po/pt_BR.po                             | 1536 +++++++------
 src/gpk-application.c                   |   35 +-
 src/gpk-check-update.c                  |   40 +-
 src/gpk-common.c                        |   25 +
 src/gpk-common.h                        |    4 +
 src/gpk-dbus-task.c                     |   43 +-
 src/gpk-enum.c                          |   18 +
 src/gpk-enum.h                          |   12 +-
 src/gpk-firmware.c                      |    4 +
 src/gpk-gnome.c                         |   49 +-
 src/gpk-hardware.c                      |    4 +
 src/gpk-helper-untrusted.c              |   30 +-
 src/gpk-prefs.c                         |    9 -
 src/gpk-update-viewer.c                 |   34 +-
 src/gpk-watch.c                         |   26 +-
 29 files changed, 5977 insertions(+), 5012 deletions(-)
---
diff --cc src/gpk-watch.c
index ae986f2,1ad3a5c..b572a3d
--- a/src/gpk-watch.c
+++ b/src/gpk-watch.c
@@@ -73,8 -74,10 +73,9 @@@ struct GpkWatchPrivat
  	PkTaskList		*tlist;
  	PkRestartEnum		 restart;
  	GConfClient		*gconf_client;
 -	PolKitGnomeAction	*restart_action;
  	guint			 set_proxy_timeout;
  	gchar			*error_details;
+ 	gboolean		 hide_warning;
  };
  
  typedef struct {