gnome-packagekit r359 - in trunk: data src

[rhughes svn gnome org]

Author: rhughes
Date: Thu Oct 16 10:05:21 2008
New Revision: 359
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=359&view=rev

Log:
from git

Modified:
   trunk/data/gnome-packagekit.schemas.in
   trunk/data/gpk-application.glade
   trunk/src/Makefile.am
   trunk/src/gpk-animated-icon.c
   trunk/src/gpk-application.c
   trunk/src/gpk-auto-refresh.c
   trunk/src/gpk-backend-status.c
   trunk/src/gpk-check-update.c
   trunk/src/gpk-client-chooser.c
   trunk/src/gpk-client-chooser.h
   trunk/src/gpk-client-dialog.c
   trunk/src/gpk-client-dialog.h
   trunk/src/gpk-client-eula.c
   trunk/src/gpk-client-eula.h
   trunk/src/gpk-client-run.c
   trunk/src/gpk-client-run.h
   trunk/src/gpk-client-signature.c
   trunk/src/gpk-client-signature.h
   trunk/src/gpk-client-untrusted.c
   trunk/src/gpk-client-untrusted.h
   trunk/src/gpk-client.c
   trunk/src/gpk-client.h
   trunk/src/gpk-common.c
   trunk/src/gpk-common.h
   trunk/src/gpk-dbus.c
   trunk/src/gpk-dialog.c
   trunk/src/gpk-dialog.h
   trunk/src/gpk-enum.c
   trunk/src/gpk-enum.h
   trunk/src/gpk-error.c
   trunk/src/gpk-firmware.c
   trunk/src/gpk-hardware.c
   trunk/src/gpk-inhibit.c
   trunk/src/gpk-install-catalog.c
   trunk/src/gpk-install-local-file.c
   trunk/src/gpk-install-mime-type.c
   trunk/src/gpk-install-package-name.c
   trunk/src/gpk-install-provide-file.c
   trunk/src/gpk-log.c
   trunk/src/gpk-prefs.c
   trunk/src/gpk-repo.c
   trunk/src/gpk-service-pack.c
   trunk/src/gpk-smart-icon.c
   trunk/src/gpk-update-icon.c
   trunk/src/gpk-update-viewer.c
   trunk/src/gpk-watch.c

Modified: trunk/data/gnome-packagekit.schemas.in
==============================================================================
--- trunk/data/gnome-packagekit.schemas.in	(original)
+++ trunk/data/gnome-packagekit.schemas.in	Thu Oct 16 10:05:21 2008
@@ -14,6 +14,18 @@
     </schema>
 
     <schema>
+      <key>/schemas/apps/gnome-packagekit/skip_confirm_no_deps</key>
+      <applyto>/apps/gnome-packagekit/skip_confirm_no_deps</applyto>
+      <owner>gnome-packagekit</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Skip the confirm dialog if there are no dependencies</short>
+        <long>Skip the confirm dialog when installing and removing packages if there are no dependencies</long>
+      </locale>
+    </schema>
+
+    <schema>
       <key>/schemas/apps/gnome-packagekit/banned_firmware</key>
       <applyto>/apps/gnome-packagekit/banned_firmware</applyto>
       <owner>gnome-packagekit</owner>

Modified: trunk/data/gpk-application.glade
==============================================================================
--- trunk/data/gpk-application.glade	(original)
+++ trunk/data/gpk-application.glade	Thu Oct 16 10:05:21 2008
@@ -55,6 +55,34 @@
               </widget>
             </child>
             <child>
+              <widget class="GtkMenuItem" id="menuitem_view">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_View</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="menu10">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkCheckMenuItem" id="menuitem_group_type">
+                        <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Use the complicated group selector</property>
+                        <property name="label" translatable="yes">Use category group list</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckMenuItem" id="menuitem_autocomplete">
+                        <property name="visible">True</property>
+                        <property name="tooltip" translatable="yes">Use the system package list to autocomplete package selections</property>
+                        <property name="label" translatable="yes">Use auto-completion</property>
+                        <property name="use_underline">True</property>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
               <widget class="GtkMenuItem" id="menuitem2">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Oct 16 10:05:21 2008
@@ -55,6 +55,8 @@
 	egg-unique.h					\
 	egg-obj-list.c					\
 	egg-obj-list.h					\
+	egg-console-kit.c				\
+	egg-console-kit.h				\
 	egg-dbus-monitor.c				\
 	egg-dbus-monitor.h				\
 	gpk-enum.c					\

Modified: trunk/src/gpk-animated-icon.c
==============================================================================
--- trunk/src/gpk-animated-icon.c	(original)
+++ trunk/src/gpk-animated-icon.c	Thu Oct 16 10:05:21 2008
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <pk-common.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"

Modified: trunk/src/gpk-application.c
==============================================================================
--- trunk/src/gpk-application.c	(original)
+++ trunk/src/gpk-application.c	Thu Oct 16 10:05:21 2008
@@ -31,18 +31,7 @@
 #include <math.h>
 #include <string.h>
 #include <polkit-gnome/polkit-gnome.h>
-
-#include <pk-enum.h>
-#include <pk-client.h>
-#include <pk-control.h>
-#include <pk-common.h>
-#include <pk-connection.h>
-#include <pk-package-id.h>
-#include <pk-package-ids.h>
-#include <pk-package-list.h>
-#include <pk-extra.h>
-#include <pk-details-obj.h>
-#include <pk-category-obj.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"
@@ -105,6 +94,7 @@
 	gchar			*package;
 	gchar			*group;
 	gchar			*url;
+	gchar			*search_text;
 	guint			 details_event_id;
 	GHashTable		*repos;
 	PkBitfield		 roles;
@@ -915,6 +905,41 @@
 }
 
 /**
+ * egg_strreplace_indirect:
+ **/
+static gboolean
+egg_strreplace_indirect (gchar **text, const gchar *find, const gchar *replace)
+{
+	gchar *new;
+
+	/* is needle even in string? */
+	if (g_strrstr (*text, find) == NULL)
+		return FALSE;
+
+	/* replace */
+	new = egg_strreplace (*text, find, replace);
+
+	/* replace old string with new string */
+	g_free (*text);
+	*text = new;
+	return TRUE;
+}
+
+/**
+ * gpk_application_text_format_display:
+ **/
+static gchar *
+gpk_application_text_format_display (const gchar *ascii)
+{
+	gchar *text;
+	text = g_strdup (ascii);
+	egg_strreplace_indirect (&text, "``", "â");
+	egg_strreplace_indirect (&text, "''", "â");
+	egg_strreplace_indirect (&text, "'", "â");
+	return text;
+}
+
+/**
  * gpk_application_details_cb:
  **/
 static void
@@ -924,21 +949,13 @@
 	gchar *text;
 	gchar *value;
 	const gchar *repo_name;
-	const gchar *icon;
 	const gchar *group;
-	gboolean valid;
 	gboolean installed;
 
 	g_return_if_fail (PK_IS_APPLICATION (application));
 
 	installed = egg_strequal (details->id->data, "installed");
 
-	/* get the icon */
-	icon = pk_extra_get_icon_name (application->priv->extra, details->id->name);
-
-	/* check icon actually exists and is valid in this theme */
-	valid = gpk_check_icon_valid (icon);
-
 	/* hide to start */
 	widget = glade_xml_get_widget (application->priv->glade_xml, "scrolledwindow_detail");
 	gtk_widget_show (widget);
@@ -983,7 +1000,7 @@
 	}
 
 	/* set the description */
-	text = g_markup_escape_text (details->description, -1);
+	text = gpk_application_text_format_display (details->description);
 	widget = glade_xml_get_widget (application->priv->glade_xml, "textview_description");
 	gpk_application_set_text_buffer (widget, text);
 	g_free (text);
@@ -1016,7 +1033,9 @@
 gpk_application_package_cb (PkClient *client, const PkPackageObj *obj, GpkApplication *application)
 {
 	GtkTreeIter iter;
-	const gchar *summary_new;
+	GtkTreeSelection *selection;
+	GtkWidget *widget;
+	gchar *summary;
 	const gchar *icon = NULL;
 	gchar *text;
 	gchar *package_id;
@@ -1036,10 +1055,8 @@
 	    obj->info != PK_INFO_ENUM_COLLECTION_INSTALLED && obj->info != PK_INFO_ENUM_COLLECTION_AVAILABLE)
 		return;
 
-	/* use the localised summary if available */
-	summary_new = pk_extra_get_summary (application->priv->extra, obj->id->name);
-	if (TRUE || summary_new == NULL)
-		summary_new = obj->summary;
+	/* format if required */
+	summary = gpk_application_text_format_display (obj->summary);
 
 	/* mark as got so we don't warn */
 	application->priv->has_package = TRUE;
@@ -1065,7 +1082,7 @@
 	checkbox = gpk_application_state_get_checkbox (state);
 
 	/* use two lines */
-	text = gpk_package_id_format_twoline (obj->id, summary_new);
+	text = gpk_package_id_format_twoline (obj->id, summary);
 
 	/* can we modify this? */
 	enabled = gpk_application_get_checkbox_enable (application, state);
@@ -1081,7 +1098,15 @@
 			    PACKAGES_COLUMN_IMAGE, icon,
 			    -1);
 
+	/* if it's an exact match, select it */
+	if (egg_strequal (obj->id->name, application->priv->search_text)) {
+		widget = glade_xml_get_widget (application->priv->glade_xml, "treeview_packages");
+		selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
+		gtk_tree_selection_select_iter (selection, &iter);
+	}
+
 	g_free (package_id);
+	g_free (summary);
 	g_free (text);
 
 	/* only process every n events else we re-order too many times */
@@ -1244,20 +1269,20 @@
 gpk_application_perform_search_name_details_file (GpkApplication *application)
 {
 	GtkWidget *widget;
-	const gchar *package;
 	GError *error = NULL;
 	gboolean ret;
 
 	widget = glade_xml_get_widget (application->priv->glade_xml, "entry_text");
-	package = gtk_entry_get_text (GTK_ENTRY (widget));
+	g_free (application->priv->search_text);
+	application->priv->search_text = g_strdup (gtk_entry_get_text (GTK_ENTRY (widget)));
 
 	/* have we got input? */
-	if (egg_strzero (package)) {
+	if (egg_strzero (application->priv->search_text)) {
 		egg_debug ("no input");
 		return FALSE;
 	}
 
-	ret = pk_strvalidate (package);
+	ret = pk_strvalidate (application->priv->search_text);
 	if (!ret) {
 		egg_debug ("invalid input text, will fail");
 		/* TODO - make the dialog turn red... */
@@ -1266,7 +1291,7 @@
 					_("The search text contains invalid characters"), NULL);
 		return FALSE;
 	}
-	egg_debug ("find %s", package);
+	egg_debug ("find %s", application->priv->search_text);
 
 	/* reset */
 	ret = pk_client_reset (application->priv->client_search, &error);
@@ -1278,11 +1303,17 @@
 
 	/* do the search */
 	if (application->priv->search_type == PK_SEARCH_NAME) {
-		ret = pk_client_search_name (application->priv->client_search, application->priv->filters_current, package, &error);
+		ret = pk_client_search_name (application->priv->client_search,
+					     application->priv->filters_current,
+					     application->priv->search_text, &error);
 	} else if (application->priv->search_type == PK_SEARCH_DETAILS) {
-		ret = pk_client_search_details (application->priv->client_search, application->priv->filters_current, package, &error);
+		ret = pk_client_search_details (application->priv->client_search,
+					     application->priv->filters_current,
+					     application->priv->search_text, &error);
 	} else if (application->priv->search_type == PK_SEARCH_FILE) {
-		ret = pk_client_search_file (application->priv->client_search, application->priv->filters_current, package, &error);
+		ret = pk_client_search_file (application->priv->client_search,
+					     application->priv->filters_current,
+					     application->priv->search_text, &error);
 	} else {
 		egg_warning ("invalid search type");
 		return FALSE;
@@ -2457,6 +2488,40 @@
 }
 
 /**
+ * gpk_application_menu_group_type_cb:
+ * @widget: The GtkWidget object
+ **/
+static void
+gpk_application_menu_group_type_cb (GtkWidget *widget, GpkApplication *application)
+{
+	gboolean enabled;
+
+	g_return_if_fail (PK_IS_APPLICATION (application));
+
+	/* save users preference to gconf */
+	enabled = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
+	gconf_client_set_bool (application->priv->gconf_client,
+			       GPK_CONF_APPLICATION_CATEGORY_GROUPS, enabled, NULL);
+}
+
+/**
+ * gpk_application_menu_autocompletion_cb:
+ * @widget: The GtkWidget object
+ **/
+static void
+gpk_application_menu_autocompletion_cb (GtkWidget *widget, GpkApplication *application)
+{
+	gboolean enabled;
+
+	g_return_if_fail (PK_IS_APPLICATION (application));
+
+	/* save users preference to gconf */
+	enabled = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
+	gconf_client_set_bool (application->priv->gconf_client,
+			       GPK_CONF_AUTOCOMPLETE, enabled, NULL);
+}
+
+/**
  * gpk_application_status_changed_cb:
  **/
 static void
@@ -2662,12 +2727,15 @@
 	if (application->priv->groups == 0)
 		return FALSE;
 
-	/* add this at the top of the list */
+	/* add these at the top of the list */
 	if (pk_bitfield_contain (application->priv->groups, PK_GROUP_ENUM_COLLECTIONS))
 		gpk_application_group_add_data (application, PK_GROUP_ENUM_COLLECTIONS);
+	if (pk_bitfield_contain (application->priv->groups, PK_GROUP_ENUM_NEWEST))
+		gpk_application_group_add_data (application, PK_GROUP_ENUM_NEWEST);
 
 	/* add a separator only if we can do both */
 	if ((pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_GET_PACKAGES) ||
+	     pk_bitfield_contain (application->priv->roles, PK_GROUP_ENUM_NEWEST) ||
 	     pk_bitfield_contain (application->priv->groups, PK_GROUP_ENUM_COLLECTIONS)) &&
 	     pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_SEARCH_GROUP)) {
 		gtk_tree_store_append (application->priv->groups_store, &iter, NULL);
@@ -2683,7 +2751,7 @@
 		/* add all the groups supported (except collections, which we handled above */
 		for (i=0; i<PK_GROUP_ENUM_UNKNOWN; i++) {
 			if (pk_bitfield_contain (application->priv->groups, i) &&
-			    i != PK_GROUP_ENUM_COLLECTIONS)
+			    i != PK_GROUP_ENUM_COLLECTIONS && i != PK_GROUP_ENUM_NEWEST)
 				gpk_application_group_add_data (application, i);
 		}
 	}
@@ -2725,12 +2793,15 @@
 				    GROUPS_COLUMN_ICON, icon_name, -1);
 	}
 
-	/* add this at the top of the list */
+	/* add these at the top of the list */
 	if (pk_bitfield_contain (application->priv->groups, PK_GROUP_ENUM_COLLECTIONS))
 		gpk_application_group_add_data (application, PK_GROUP_ENUM_COLLECTIONS);
+	if (pk_bitfield_contain (application->priv->groups, PK_GROUP_ENUM_NEWEST))
+		gpk_application_group_add_data (application, PK_GROUP_ENUM_NEWEST);
 
 	/* add a separator only if we can do both */
 	if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_GET_PACKAGES) ||
+	    pk_bitfield_contain (application->priv->roles, PK_GROUP_ENUM_NEWEST) ||
 	    pk_bitfield_contain (application->priv->groups, PK_GROUP_ENUM_COLLECTIONS)) {
 		gtk_tree_store_append (application->priv->groups_store, &iter, NULL);
 		gtk_tree_store_set (application->priv->groups_store, &iter,
@@ -2837,8 +2908,11 @@
 static void
 gpk_application_gconf_key_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, GpkApplication *application)
 {
+	GtkEntryCompletion *completion;
 	GConfValue *value;
 	gboolean ret;
+	GtkWidget *widget;
+
 	value = gconf_entry_get_value (entry);
 	if (value == NULL)
 		return;
@@ -2850,6 +2924,16 @@
 			gpk_application_create_group_list_categories (application);
 		else
 			gpk_application_create_group_list_enum (application);
+	} else if (egg_strequal (entry->key, GPK_CONF_AUTOCOMPLETE)) {
+		ret = gconf_value_get_bool (value);
+		widget = glade_xml_get_widget (application->priv->glade_xml, "entry_text");
+		if (ret) {
+			completion = gpk_package_entry_completion_new ();
+			gtk_entry_set_completion (GTK_ENTRY (widget), completion);
+			g_object_unref (completion);
+		} else {
+			gtk_entry_set_completion (GTK_ENTRY (widget), NULL);
+		}
 	}
 }
 
@@ -2871,6 +2955,7 @@
 	application->priv->package = NULL;
 	application->priv->group = NULL;
 	application->priv->url = NULL;
+	application->priv->search_text = NULL;
 	application->priv->has_package = FALSE;
 	application->priv->details_event_id = 0;
 	application->priv->package_list = pk_package_list_new ();
@@ -3143,6 +3228,16 @@
 	g_signal_connect (widget, "toggled",
 			  G_CALLBACK (gpk_application_menu_filter_newest_cb), application);
 
+	/* category menu / simple menu */
+	widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_group_type");
+	g_signal_connect (widget, "toggled",
+			  G_CALLBACK (gpk_application_menu_group_type_cb), application);
+
+	/* autocompletion */
+	widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_autocomplete");
+	g_signal_connect (widget, "toggled",
+			  G_CALLBACK (gpk_application_menu_autocompletion_cb), application);
+
 	/* Remove description/file list if needed. */
 	if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_GET_DETAILS) == FALSE) {
 		widget = glade_xml_get_widget (application->priv->glade_xml, "scrolledwindow2");
@@ -3263,6 +3358,23 @@
 		gtk_widget_hide (widget);
 	}
 
+	/* Group type, set, or hide */
+	widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_group_type");
+	if (pk_bitfield_contain (application->priv->roles, PK_ROLE_ENUM_GET_CATEGORIES)) {
+		/* set from remembered state */
+		enabled = gconf_client_get_bool (application->priv->gconf_client,
+						 GPK_CONF_APPLICATION_CATEGORY_GROUPS, NULL);
+		gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), enabled);
+	} else {
+		gtk_widget_hide (widget);
+	}
+
+	/* Set autocompletion */
+	widget = glade_xml_get_widget (application->priv->glade_xml, "menuitem_autocomplete");
+	enabled = gconf_client_get_bool (application->priv->gconf_client,
+					 GPK_CONF_AUTOCOMPLETE, NULL);
+	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), enabled);
+
 	widget = glade_xml_get_widget (application->priv->glade_xml, "entry_text");
 	g_signal_connect (widget, "key-press-event",
 			  G_CALLBACK (gpk_application_text_changed_cb), application);
@@ -3381,6 +3493,7 @@
 	g_free (application->priv->url);
 	g_free (application->priv->group);
 	g_free (application->priv->package);
+	g_free (application->priv->search_text);
 	g_hash_table_destroy (application->priv->repos);
 
 	G_OBJECT_CLASS (gpk_application_parent_class)->finalize (object);

Modified: trunk/src/gpk-auto-refresh.c
==============================================================================
--- trunk/src/gpk-auto-refresh.c	(original)
+++ trunk/src/gpk-auto-refresh.c	Thu Oct 16 10:05:21 2008
@@ -35,7 +35,7 @@
 #include <glib/gi18n.h>
 #include <dbus/dbus-glib.h>
 #include <gconf/gconf-client.h>
-#include <pk-control.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"

Modified: trunk/src/gpk-backend-status.c
==============================================================================
--- trunk/src/gpk-backend-status.c	(original)
+++ trunk/src/gpk-backend-status.c	Thu Oct 16 10:05:21 2008
@@ -30,7 +30,7 @@
 #include <dbus/dbus-glib.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <pk-control.h>
+#include <packagekit-glib/packagekit.h>
 #include <locale.h>
 
 #include "egg-debug.h"

Modified: trunk/src/gpk-check-update.c
==============================================================================
--- trunk/src/gpk-check-update.c	(original)
+++ trunk/src/gpk-check-update.c	Thu Oct 16 10:05:21 2008
@@ -37,16 +37,7 @@
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 #include <libnotify/notify.h>
-
-#include <pk-client.h>
-#include <pk-control.h>
-#include <pk-common.h>
-#include <pk-task-list.h>
-#include <pk-connection.h>
-#include <pk-package-id.h>
-#include <pk-package-ids.h>
-#include <pk-package-list.h>
-#include <pk-distro-upgrade-obj.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"

Modified: trunk/src/gpk-client-chooser.c
==============================================================================
--- trunk/src/gpk-client-chooser.c	(original)
+++ trunk/src/gpk-client-chooser.c	Thu Oct 16 10:05:21 2008
@@ -27,12 +27,7 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <polkit-gnome/polkit-gnome.h>
-
-#include <pk-common.h>
-#include <pk-client.h>
-#include <pk-enum.h>
-#include <pk-extra.h>
-#include <pk-package-id.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"

Modified: trunk/src/gpk-client-chooser.h
==============================================================================
--- trunk/src/gpk-client-chooser.h	(original)
+++ trunk/src/gpk-client-chooser.h	Thu Oct 16 10:05:21 2008
@@ -23,7 +23,7 @@
 #define __GPK_CLIENT_CHOOSER_H
 
 #include <glib-object.h>
-#include <pk-enum.h>
+#include <packagekit-glib/packagekit.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gpk-client-dialog.c
==============================================================================
--- trunk/src/gpk-client-dialog.c	(original)
+++ trunk/src/gpk-client-dialog.c	Thu Oct 16 10:05:21 2008
@@ -35,12 +35,7 @@
 #include <fcntl.h>
 #include <glib/gi18n.h>
 #include <glade/glade.h>
-
-#include <pk-common.h>
-#include <pk-client.h>
-#include <pk-package-list.h>
-#include <pk-extra.h>
-#include <pk-enum.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"

Modified: trunk/src/gpk-client-dialog.h
==============================================================================
--- trunk/src/gpk-client-dialog.h	(original)
+++ trunk/src/gpk-client-dialog.h	Thu Oct 16 10:05:21 2008
@@ -24,9 +24,7 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include <pk-enum.h>
-#include <pk-bitfield.h>
-#include <pk-package-list.h>
+#include <packagekit-glib/packagekit.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gpk-client-eula.c
==============================================================================
--- trunk/src/gpk-client-eula.c	(original)
+++ trunk/src/gpk-client-eula.c	Thu Oct 16 10:05:21 2008
@@ -26,9 +26,10 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
-#include <pk-package-id.h>
+
 #include "gpk-gnome.h"
 #include "gpk-common.h"
 

Modified: trunk/src/gpk-client-eula.h
==============================================================================
--- trunk/src/gpk-client-eula.h	(original)
+++ trunk/src/gpk-client-eula.h	Thu Oct 16 10:05:21 2008
@@ -23,7 +23,7 @@
 #define __GPK_CLIENT_EULA_H
 
 #include <glib-object.h>
-#include <pk-enum.h>
+#include <packagekit-glib/packagekit.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gpk-client-run.c
==============================================================================
--- trunk/src/gpk-client-run.c	(original)
+++ trunk/src/gpk-client-run.c	Thu Oct 16 10:05:21 2008
@@ -26,11 +26,7 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-
-#include <pk-common.h>
-#include <pk-client.h>
-#include <pk-enum.h>
-#include <pk-package-id.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"

Modified: trunk/src/gpk-client-run.h
==============================================================================
--- trunk/src/gpk-client-run.h	(original)
+++ trunk/src/gpk-client-run.h	Thu Oct 16 10:05:21 2008
@@ -23,7 +23,7 @@
 #define __GPK_CLIENT_RUN_H
 
 #include <glib-object.h>
-#include <pk-enum.h>
+#include <packagekit-glib/packagekit.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gpk-client-signature.c
==============================================================================
--- trunk/src/gpk-client-signature.c	(original)
+++ trunk/src/gpk-client-signature.c	Thu Oct 16 10:05:21 2008
@@ -26,9 +26,10 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
-#include <pk-package-id.h>
+
 #include "gpk-gnome.h"
 #include "gpk-common.h"
 

Modified: trunk/src/gpk-client-signature.h
==============================================================================
--- trunk/src/gpk-client-signature.h	(original)
+++ trunk/src/gpk-client-signature.h	Thu Oct 16 10:05:21 2008
@@ -23,7 +23,6 @@
 #define __GPK_CLIENT_SIGNATURE_H
 
 #include <glib-object.h>
-#include <pk-enum.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gpk-client-untrusted.c
==============================================================================
--- trunk/src/gpk-client-untrusted.c	(original)
+++ trunk/src/gpk-client-untrusted.c	Thu Oct 16 10:05:21 2008
@@ -27,9 +27,7 @@
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <polkit-gnome/polkit-gnome.h>
-
-#include <pk-enum.h>
-#include <pk-package-id.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 

Modified: trunk/src/gpk-client-untrusted.h
==============================================================================
--- trunk/src/gpk-client-untrusted.h	(original)
+++ trunk/src/gpk-client-untrusted.h	Thu Oct 16 10:05:21 2008
@@ -23,7 +23,7 @@
 #define __GPK_CLIENT_UNTRUSTED_H
 
 #include <glib-object.h>
-#include <pk-enum.h>
+#include <packagekit-glib/packagekit.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gpk-client.c
==============================================================================
--- trunk/src/gpk-client.c	(original)
+++ trunk/src/gpk-client.c	Thu Oct 16 10:05:21 2008
@@ -38,15 +38,7 @@
 #include <gconf/gconf-client.h>
 #include <polkit-gnome/polkit-gnome.h>
 #include <libnotify/notify.h>
-
-#include <pk-client.h>
-#include <pk-package-id.h>
-#include <pk-package-ids.h>
-#include <pk-extra.h>
-#include <pk-common.h>
-#include <pk-control.h>
-#include <pk-catalog.h>
-#include <pk-distro-upgrade-obj.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"
@@ -204,7 +196,7 @@
 		egg_debug ("set %s to FALSE", GPK_CONF_NOTIFY_UPDATE_STARTED);
 		gconf_client_set_bool (gclient->priv->gconf_client, GPK_CONF_NOTIFY_UPDATE_STARTED, FALSE, NULL);
 	} else if (egg_strequal (action, "show-error-details")) {
-		gpk_error_dialog (_("Error details"), NULL, gclient->priv->error_details);
+		gpk_error_dialog (_("Error details"), _("Package Manager error details"), gclient->priv->error_details);
 	} else if (egg_strequal (action, "cancel")) {
 		/* try to cancel */
 		ret = pk_client_cancel (gclient->priv->client_action, &error);
@@ -1246,7 +1238,8 @@
 
 	/* no deps */
 	length = pk_package_list_get_size (list);
-	if (length == 0)
+	ret = gconf_client_get_bool (gclient->priv->gconf_client, GPK_CONF_SKIP_CONFIRM_NO_DEPS, NULL);
+	if (length == 0 && ret)
 		goto skip_checks;
 
 	/* sort by package_id */
@@ -1394,7 +1387,8 @@
 	/* these are the new packages */
 	list = pk_client_get_package_list (gclient->priv->client_resolve);
 	length = pk_package_list_get_size (list);
-	if (length == 0)
+	ret = gconf_client_get_bool (gclient->priv->gconf_client, GPK_CONF_SKIP_CONFIRM_NO_DEPS, NULL);
+	if (length == 0 && ret)
 		goto skip_checks;
 
 	/* title */
@@ -2692,7 +2686,7 @@
 		gpk_client_error_msg (gclient, _("Failed to reset action client"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
-		return FALSE;
+		return NULL;
 	}
 
 	/* wrap get files */
@@ -2703,7 +2697,7 @@
 		gpk_client_error_msg (gclient, _("Getting file list failed"), error_local);
 		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, error_local->message);
 		g_error_free (error_local);
-		goto out;
+		return NULL;
 	}
 
 	/* setup the UI */
@@ -2717,8 +2711,15 @@
 
 	/* fail the transaction and set the correct error */
 	ret = gpk_client_set_error_from_exit_enum (gclient->priv->exit, error);
+	if (!ret)
+		return NULL;
+
+	/* no files? */
+	if (gclient->priv->files_array == NULL) {
+		gpk_client_error_set (error, GPK_CLIENT_ERROR_FAILED, "no files were found");
+		return NULL;
+	}
 
-out:
 	/* return the file list */
 	return g_strdupv (gclient->priv->files_array);
 }

Modified: trunk/src/gpk-client.h
==============================================================================
--- trunk/src/gpk-client.h	(original)
+++ trunk/src/gpk-client.h	Thu Oct 16 10:05:21 2008
@@ -24,8 +24,7 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include <pk-bitfield.h>
-#include <pk-package-list.h>
+#include <packagekit-glib/packagekit.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gpk-common.c
==============================================================================
--- trunk/src/gpk-common.c	(original)
+++ trunk/src/gpk-common.c	Thu Oct 16 10:05:21 2008
@@ -29,16 +29,12 @@
 #include <sys/types.h>
 #include <gtk/gtk.h>
 #include <dbus/dbus-glib.h>
-
 #include <polkit-gnome/polkit-gnome.h>
-
-#include <pk-package-id.h>
-#include <pk-package-list.h>
-#include <pk-enum.h>
-#include <pk-common.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"
+#include "egg-console-kit.h"
 
 #include "gpk-enum.h"
 #include "gpk-common.h"
@@ -148,7 +144,9 @@
 gboolean
 gpk_check_privileged_user (const gchar *application_name)
 {
+	EggConsoleKit *ck = NULL;
 	guint uid;
+	gboolean ret = FALSE;
 	gchar *message;
 	gchar *title;
 
@@ -165,9 +163,49 @@
 		g_free (title);
 		g_free (message);
 		egg_warning ("uid=%i so closing", uid);
-		return FALSE;
+		goto out;
 	}
-	return TRUE;
+
+	/* talk to ConsoleKit */
+	ck = egg_console_kit_new ();
+
+	/* we are not local */
+	ret = egg_console_kit_is_local (ck);
+	if (!ret) {
+		if (application_name == NULL)
+			title = g_strdup (_("This application is running when the session is not local"));
+		else
+			title = g_strdup_printf (_("%s is running when the session is not local"), application_name);
+		message = g_strjoin ("\n",
+				     _("These applications should be run only when on local console."),
+				     _("This normally indicates a bug with ConsoleKit or with the way your session has started."), NULL);
+		gpk_error_dialog (title, message, "");
+		g_free (title);
+		g_free (message);
+		egg_warning ("not LOCAL so closing");
+		goto out;
+	}
+
+	/* we are not active */
+	ret = egg_console_kit_is_active (ck);
+	if (!ret) {
+		if (application_name == NULL)
+			title = g_strdup (_("This application is running when the session is not active"));
+		else
+			title = g_strdup_printf (_("%s is running when the session is not active"), application_name);
+		message = g_strjoin ("\n",
+				     _("These applications should be run only when on active console."),
+				     _("This normally indicates a bug with your remote desktop implementation."), NULL);
+		gpk_error_dialog (title, message, "");
+		g_free (title);
+		g_free (message);
+		egg_warning ("not ACTIVE so closing");
+		goto out;
+	}
+out:
+	if (ck != NULL)
+		g_object_unref (ck);
+	return ret;
 }
 
 /**
@@ -371,6 +409,7 @@
 	}
 
 	length = pk_package_list_get_size (list);
+	egg_debug ("loading %i autocomplete items", length);
 	for (i=0; i<length; i++) {
 		obj = pk_package_list_get_obj (list, i);
 		if (obj == NULL || obj->id == NULL || obj->id->name == NULL) {

Modified: trunk/src/gpk-common.h
==============================================================================
--- trunk/src/gpk-common.h	(original)
+++ trunk/src/gpk-common.h	Thu Oct 16 10:05:21 2008
@@ -24,9 +24,7 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-
-#include <pk-enum.h>
-#include <pk-package-id.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "gpk-animated-icon.h"
 
@@ -54,6 +52,7 @@
 #define GPK_CONF_UPDATE_BATTERY			"/apps/gnome-packagekit/update_battery"
 #define GPK_CONF_SHOW_DEPENDS			"/apps/gnome-packagekit/show_depends"
 #define GPK_CONF_BANNED_FIRMWARE		"/apps/gnome-packagekit/banned_firmware"
+#define GPK_CONF_SKIP_CONFIRM_NO_DEPS		"/apps/gnome-packagekit/skip_confirm_no_deps"
 
 #define GPK_CONF_REPO_SHOW_DETAILS		"/apps/gnome-packagekit/repo/show_details"
 #define GPK_CONF_APPLICATION_FILTER_BASENAME	"/apps/gnome-packagekit/application/filter_basename"

Modified: trunk/src/gpk-dbus.c
==============================================================================
--- trunk/src/gpk-dbus.c	(original)
+++ trunk/src/gpk-dbus.c	Thu Oct 16 10:05:21 2008
@@ -40,12 +40,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <polkit/polkit.h>
 #include <polkit-dbus/polkit-dbus.h>
-
-#include <pk-common.h>
-#include <pk-package-id.h>
-#include <pk-package-ids.h>
-#include <pk-enum.h>
-#include <pk-package-list.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 

Modified: trunk/src/gpk-dialog.c
==============================================================================
--- trunk/src/gpk-dialog.c	(original)
+++ trunk/src/gpk-dialog.c	Thu Oct 16 10:05:21 2008
@@ -24,11 +24,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-
-#include <pk-common.h>
-#include <pk-enum.h>
-#include <pk-extra.h>
-#include <pk-package-id.h>
+#include <packagekit-glib/packagekit.h>
 #include <gconf/gconf-client.h>
 
 #include "egg-debug.h"

Modified: trunk/src/gpk-dialog.h
==============================================================================
--- trunk/src/gpk-dialog.h	(original)
+++ trunk/src/gpk-dialog.h	Thu Oct 16 10:05:21 2008
@@ -24,7 +24,7 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include <pk-package-list.h>
+#include <packagekit-glib/packagekit.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gpk-enum.c
==============================================================================
--- trunk/src/gpk-enum.c	(original)
+++ trunk/src/gpk-enum.c	Thu Oct 16 10:05:21 2008
@@ -23,7 +23,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <pk-enum.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"
@@ -192,6 +192,7 @@
 	{PK_GROUP_ENUM_SYSTEM,			"applications-system"},
 	{PK_GROUP_ENUM_VIRTUALIZATION,		"computer"},
 	{PK_GROUP_ENUM_VENDOR,			"application-certificate"},
+	{PK_GROUP_ENUM_NEWEST,			"dialog-information"},
 	{0, NULL}
 };
 
@@ -1296,6 +1297,9 @@
 	case PK_GROUP_ENUM_VENDOR:
 		text = _("Vendor");
 		break;
+	case PK_GROUP_ENUM_NEWEST:
+		text = _("Newest");
+		break;
 	case PK_GROUP_ENUM_UNKNOWN:
 		text = _("Unknown group");
 		break;

Modified: trunk/src/gpk-enum.h
==============================================================================
--- trunk/src/gpk-enum.h	(original)
+++ trunk/src/gpk-enum.h	Thu Oct 16 10:05:21 2008
@@ -23,7 +23,7 @@
 #define __GPK_ENUM_H
 
 #include <glib-object.h>
-#include <pk-enum.h>
+#include <packagekit-glib/packagekit.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gpk-error.c
==============================================================================
--- trunk/src/gpk-error.c	(original)
+++ trunk/src/gpk-error.c	Thu Oct 16 10:05:21 2008
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <pk-common.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"

Modified: trunk/src/gpk-firmware.c
==============================================================================
--- trunk/src/gpk-firmware.c	(original)
+++ trunk/src/gpk-firmware.c	Thu Oct 16 10:05:21 2008
@@ -36,10 +36,7 @@
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 #include <libnotify/notify.h>
-
-#include <pk-client.h>
-#include <pk-common.h>
-#include <pk-task-list.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"

Modified: trunk/src/gpk-hardware.c
==============================================================================
--- trunk/src/gpk-hardware.c	(original)
+++ trunk/src/gpk-hardware.c	Thu Oct 16 10:05:21 2008
@@ -39,10 +39,7 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <dbus/dbus.h>
-
-#include <pk-client.h>
-#include <pk-common.h>
-#include <pk-task-list.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"

Modified: trunk/src/gpk-inhibit.c
==============================================================================
--- trunk/src/gpk-inhibit.c	(original)
+++ trunk/src/gpk-inhibit.c	Thu Oct 16 10:05:21 2008
@@ -35,9 +35,9 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <dbus/dbus-glib.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
-#include <pk-client.h>
 #include "gpk-inhibit.h"
 #include "gpk-common.h"
 

Modified: trunk/src/gpk-install-catalog.c
==============================================================================
--- trunk/src/gpk-install-catalog.c	(original)
+++ trunk/src/gpk-install-catalog.c	Thu Oct 16 10:05:21 2008
@@ -25,12 +25,13 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <locale.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
-#include <pk-common.h>
-#include <gpk-common.h>
-#include <gpk-error.h>
-#include <gpk-client.h>
+
+#include "gpk-common.h"
+#include "gpk-error.h"
+#include "gpk-client.h"
 
 /**
  * main:

Modified: trunk/src/gpk-install-local-file.c
==============================================================================
--- trunk/src/gpk-install-local-file.c	(original)
+++ trunk/src/gpk-install-local-file.c	Thu Oct 16 10:05:21 2008
@@ -27,9 +27,10 @@
 #include <locale.h>
 
 #include "egg-debug.h"
-#include <gpk-common.h>
-#include <gpk-client.h>
-#include <gpk-error.h>
+
+#include "gpk-common.h"
+#include "gpk-client.h"
+#include "gpk-error.h"
 
 /**
  * main:

Modified: trunk/src/gpk-install-mime-type.c
==============================================================================
--- trunk/src/gpk-install-mime-type.c	(original)
+++ trunk/src/gpk-install-mime-type.c	Thu Oct 16 10:05:21 2008
@@ -27,9 +27,10 @@
 #include <locale.h>
 
 #include "egg-debug.h"
-#include <gpk-common.h>
-#include <gpk-client.h>
-#include <gpk-error.h>
+
+#include "gpk-common.h"
+#include "gpk-client.h"
+#include "gpk-error.h"
 
 /**
  * main:

Modified: trunk/src/gpk-install-package-name.c
==============================================================================
--- trunk/src/gpk-install-package-name.c	(original)
+++ trunk/src/gpk-install-package-name.c	Thu Oct 16 10:05:21 2008
@@ -27,9 +27,10 @@
 #include <locale.h>
 
 #include "egg-debug.h"
-#include <gpk-common.h>
-#include <gpk-client.h>
-#include <gpk-error.h>
+
+#include "gpk-common.h"
+#include "gpk-client.h"
+#include "gpk-error.h"
 
 /**
  * main:

Modified: trunk/src/gpk-install-provide-file.c
==============================================================================
--- trunk/src/gpk-install-provide-file.c	(original)
+++ trunk/src/gpk-install-provide-file.c	Thu Oct 16 10:05:21 2008
@@ -27,9 +27,10 @@
 #include <locale.h>
 
 #include "egg-debug.h"
-#include <gpk-common.h>
-#include <gpk-client.h>
-#include <gpk-error.h>
+
+#include "gpk-common.h"
+#include "gpk-client.h"
+#include "gpk-error.h"
 
 /**
  * main:

Modified: trunk/src/gpk-log.c
==============================================================================
--- trunk/src/gpk-log.c	(original)
+++ trunk/src/gpk-log.c	Thu Oct 16 10:05:21 2008
@@ -33,11 +33,7 @@
 
 #include <polkit-gnome/polkit-gnome.h>
 #include <gconf/gconf-client.h>
-
-#include <pk-client.h>
-#include <pk-control.h>
-#include <pk-package-id.h>
-#include <pk-common.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-unique.h"
 #include "egg-debug.h"

Modified: trunk/src/gpk-prefs.c
==============================================================================
--- trunk/src/gpk-prefs.c	(original)
+++ trunk/src/gpk-prefs.c	Thu Oct 16 10:05:21 2008
@@ -31,8 +31,7 @@
 #include <string.h>
 #include <dbus/dbus-glib.h>
 #include <gconf/gconf-client.h>
-
-#include <pk-control.h>
+#include <packagekit-glib/packagekit.h>
 
 #include <gpk-common.h>
 #include <gpk-gnome.h>

Modified: trunk/src/gpk-repo.c
==============================================================================
--- trunk/src/gpk-repo.c	(original)
+++ trunk/src/gpk-repo.c	Thu Oct 16 10:05:21 2008
@@ -31,11 +31,7 @@
 #include <string.h>
 #include <dbus/dbus-glib.h>
 #include <gconf/gconf-client.h>
-
-#include <pk-common.h>
-#include <pk-client.h>
-#include <pk-control.h>
-#include <pk-connection.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-unique.h"
 #include "egg-debug.h"

Modified: trunk/src/gpk-service-pack.c
==============================================================================
--- trunk/src/gpk-service-pack.c	(original)
+++ trunk/src/gpk-service-pack.c	Thu Oct 16 10:05:21 2008
@@ -32,11 +32,7 @@
 #include <sys/utsname.h>
 #include <dbus/dbus-glib.h>
 #include <gconf/gconf-client.h>
-
-#include <pk-common.h>
-#include <pk-client.h>
-#include <pk-control.h>
-#include <pk-service-pack.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-unique.h"

Modified: trunk/src/gpk-smart-icon.c
==============================================================================
--- trunk/src/gpk-smart-icon.c	(original)
+++ trunk/src/gpk-smart-icon.c	Thu Oct 16 10:05:21 2008
@@ -33,12 +33,11 @@
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 #include <glib/gi18n.h>
-
 #include <gtk/gtk.h>
 #include <gtk/gtkstatusicon.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
-#include <pk-enum.h>
 #include "gpk-marshal.h"
 #include "gpk-common.h"
 #include "gpk-smart-icon.h"

Modified: trunk/src/gpk-update-icon.c
==============================================================================
--- trunk/src/gpk-update-icon.c	(original)
+++ trunk/src/gpk-update-icon.c	Thu Oct 16 10:05:21 2008
@@ -31,8 +31,7 @@
 #include <gtk/gtk.h>
 #include <locale.h>
 #include <libnotify/notify.h>
-
-#include <pk-common.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-dbus-monitor.h"

Modified: trunk/src/gpk-update-viewer.c
==============================================================================
--- trunk/src/gpk-update-viewer.c	(original)
+++ trunk/src/gpk-update-viewer.c	Thu Oct 16 10:05:21 2008
@@ -34,14 +34,7 @@
 
 #include <polkit-gnome/polkit-gnome.h>
 #include <gconf/gconf-client.h>
-
-#include <pk-client.h>
-#include <pk-control.h>
-#include <pk-common.h>
-#include <pk-task-list.h>
-#include <pk-package-id.h>
-#include <pk-package-ids.h>
-#include <pk-update-detail-obj.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"

Modified: trunk/src/gpk-watch.c
==============================================================================
--- trunk/src/gpk-watch.c	(original)
+++ trunk/src/gpk-watch.c	Thu Oct 16 10:05:21 2008
@@ -37,15 +37,8 @@
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 #include <libnotify/notify.h>
-
 #include <polkit-gnome/polkit-gnome.h>
-
-#include <pk-control.h>
-#include <pk-client.h>
-#include <pk-common.h>
-#include <pk-task-list.h>
-#include <pk-connection.h>
-#include <pk-package-id.h>
+#include <packagekit-glib/packagekit.h>
 
 #include "egg-debug.h"
 #include "egg-string.h"
@@ -283,7 +276,7 @@
 		gconf_client_set_bool (watch->priv->gconf_client, GPK_CONF_NOTIFY_COMPLETED, FALSE, NULL);
 
 	} else if (egg_strequal (action, "show-error-details")) {
-		gpk_error_dialog (_("Error details"), NULL, watch->priv->error_details);
+		gpk_error_dialog (_("Error details"), _("Package Manager error details"), watch->priv->error_details);
 
 	} else {
 		egg_warning ("unknown action id: %s", action);