GNOME.org
 

gnome-packagekit r104 - in trunk: data src

Author: rhughes
Date: Fri Feb 29 16:00:44 2008
New Revision: 104
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=104&view=rev

Log:
from git

Modified:
   trunk/data/pk-application.desktop.in
   trunk/data/pk-prefs.desktop.in
   trunk/data/pk-repo.desktop.in
   trunk/data/pk-transaction-viewer.desktop.in
   trunk/data/pk-update-icon.desktop.in
   trunk/data/pk-update-viewer.desktop.in
   trunk/src/pk-application.c
   trunk/src/pk-auto-refresh.c
   trunk/src/pk-backend-status.c
   trunk/src/pk-common-gui.c
   trunk/src/pk-common-gui.h
   trunk/src/pk-install-file.c
   trunk/src/pk-install-package.c
   trunk/src/pk-notify.c
   trunk/src/pk-progress.c
   trunk/src/pk-repo.c
   trunk/src/pk-transaction-viewer.c
   trunk/src/pk-update-viewer.c
   trunk/src/pk-watch.c

Modified: trunk/data/pk-application.desktop.in
==============================================================================
--- trunk/data/pk-application.desktop.in	(original)
+++ trunk/data/pk-application.desktop.in	Fri Feb 29 16:00:44 2008
@@ -8,6 +8,6 @@
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;System;Settings;
-OnlyShowIn=GNOME;
+NotShowIn=KDE;
 StartupNotify=true
 

Modified: trunk/data/pk-prefs.desktop.in
==============================================================================
--- trunk/data/pk-prefs.desktop.in	(original)
+++ trunk/data/pk-prefs.desktop.in	Fri Feb 29 16:00:44 2008
@@ -8,6 +8,6 @@
 Terminal=false
 Type=Application
 Categories=Settings;X-GNOME-SystemSettings;
-OnlyShowIn=GNOME;
+NotShowIn=KDE;
 StartupNotify=true
 

Modified: trunk/data/pk-repo.desktop.in
==============================================================================
--- trunk/data/pk-repo.desktop.in	(original)
+++ trunk/data/pk-repo.desktop.in	Fri Feb 29 16:00:44 2008
@@ -8,6 +8,6 @@
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;System;Settings;
-OnlyShowIn=GNOME;
+NotShowIn=KDE;
 StartupNotify=true
 

Modified: trunk/data/pk-transaction-viewer.desktop.in
==============================================================================
--- trunk/data/pk-transaction-viewer.desktop.in	(original)
+++ trunk/data/pk-transaction-viewer.desktop.in	Fri Feb 29 16:00:44 2008
@@ -8,6 +8,6 @@
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;System;X-Red-Hat-Base;
-OnlyShowIn=GNOME;
+NotShowIn=KDE;
 StartupNotify=true
 

Modified: trunk/data/pk-update-icon.desktop.in
==============================================================================
--- trunk/data/pk-update-icon.desktop.in	(original)
+++ trunk/data/pk-update-icon.desktop.in	Fri Feb 29 16:00:44 2008
@@ -8,5 +8,5 @@
 Terminal=false
 Type=Application
 Categories=
-OnlyShowIn=GNOME;XFCE;
+NotShowIn=KDE;XFCE;
 

Modified: trunk/data/pk-update-viewer.desktop.in
==============================================================================
--- trunk/data/pk-update-viewer.desktop.in	(original)
+++ trunk/data/pk-update-viewer.desktop.in	Fri Feb 29 16:00:44 2008
@@ -8,6 +8,6 @@
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Settings;System;PackageManager;
-OnlyShowIn=GNOME
+NotShowIn=KDE
 StartupNotify=true
 

Modified: trunk/src/pk-application.c
==============================================================================
--- trunk/src/pk-application.c	(original)
+++ trunk/src/pk-application.c	Fri Feb 29 16:00:44 2008
@@ -156,7 +156,7 @@
 	main_window = glade_xml_get_widget (application->priv->glade_xml, "window_manager");
 
 	/* we need to format this */
-	escaped_details = pk_error_format_details (details);
+	escaped_details = g_markup_escape_text (details, -1);
 
 	dialog = gtk_message_dialog_new (GTK_WINDOW (main_window), GTK_DIALOG_DESTROY_WITH_PARENT,
 					 GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, title);
@@ -179,9 +179,9 @@
 	g_return_if_fail (PK_IS_APPLICATION (application));
 
 	pk_debug ("install %s", application->priv->package);
-	pk_client_reset (application->priv->client_action);
+	pk_client_reset (application->priv->client_action, NULL);
 	ret = pk_client_install_package (application->priv->client_action,
-					 application->priv->package);
+					 application->priv->package, NULL);
 	/* ick, we failed so pretend we didn't do the action */
 	if (ret == FALSE) {
 		pk_application_error_message (application, _("The package could not be installed"), NULL);
@@ -210,9 +210,9 @@
 	g_return_val_if_fail (PK_IS_APPLICATION (application), FALSE);
 
 	pk_debug ("remove %s", application->priv->package);
-	pk_client_reset (application->priv->client_action);
+	pk_client_reset (application->priv->client_action, NULL);
 	ret = pk_client_remove_package (application->priv->client_action,
-				        application->priv->package, force);
+				        application->priv->package, force, FALSE, NULL);
 	/* ick, we failed so pretend we didn't do the action */
 	if (ret == FALSE) {
 		pk_application_error_message (application,
@@ -315,11 +315,11 @@
 
 	/* see if any packages require this one */
 	client = pk_client_new ();
-	pk_client_set_use_buffer (client, TRUE);
+	pk_client_set_use_buffer (client, TRUE, NULL);
 	g_signal_connect (client, "finished",
 			  G_CALLBACK (pk_application_requires_finished_cb), application);
 	pk_debug ("getting requires for %s", application->priv->package);
-	pk_client_get_requires (client, application->priv->package, TRUE);
+	pk_client_get_requires (client, application->priv->package, TRUE, NULL);
 }
 
 /**
@@ -376,7 +376,7 @@
 	gtk_image_set_from_icon_name (GTK_IMAGE (widget), icon_name, GTK_ICON_SIZE_DIALOG);
 
 	/* set the description */
-	text = pk_error_format_details (detail);
+	text = g_markup_escape_text (detail, -1);
 	widget = glade_xml_get_widget (application->priv->glade_xml, "textview_description");
 	pk_application_set_text_buffer (widget, text);
 	g_free (text);
@@ -537,7 +537,7 @@
 	g_return_if_fail (PK_IS_APPLICATION (application));
 
 	/* get role */
-	pk_client_get_role (client, &role, NULL);
+	pk_client_get_role (client, &role, NULL, NULL);
 	/* do we need to fill in the tab box? */
 	if (role == PK_ROLE_ENUM_GET_DEPENDS) {
 		text = pk_application_package_buffer_to_name_version (client);
@@ -570,7 +570,7 @@
 			/* refresh the search as the items may have changed */
 			gtk_list_store_clear (application->priv->packages_store);
 			application->priv->search_in_progress = TRUE;
-			ret = pk_client_requeue (application->priv->client_search);
+			ret = pk_client_requeue (application->priv->client_search, NULL);
 			if (ret == FALSE) {
 				application->priv->search_in_progress = FALSE;
 				pk_warning ("failed to requeue the search");
@@ -615,7 +615,7 @@
 
 	if (application->priv->search_in_progress == TRUE) {
 		pk_debug ("trying to cancel task...");
-		ret = pk_client_cancel (application->priv->client_search);
+		ret = pk_client_cancel (application->priv->client_search, NULL);
 		pk_warning ("canceled? %i", ret);
 		return;
 	}
@@ -637,17 +637,17 @@
 	pk_debug ("filter = %s", filter_all);
 
 	if (application->priv->search_type == PK_SEARCH_NAME) {
-		pk_client_reset (application->priv->client_search);
-		pk_client_set_name_filter (application->priv->client_search, TRUE);
-		ret = pk_client_search_name (application->priv->client_search, filter_all, package);
+		pk_client_reset (application->priv->client_search, NULL);
+		pk_client_set_name_filter (application->priv->client_search, TRUE, NULL);
+		ret = pk_client_search_name (application->priv->client_search, filter_all, package, NULL);
 	} else if (application->priv->search_type == PK_SEARCH_DETAILS) {
-		pk_client_reset (application->priv->client_search);
-		pk_client_set_name_filter (application->priv->client_search, TRUE);
-		ret = pk_client_search_details (application->priv->client_search, filter_all, package);
+		pk_client_reset (application->priv->client_search, NULL);
+		pk_client_set_name_filter (application->priv->client_search, TRUE, NULL);
+		ret = pk_client_search_details (application->priv->client_search, filter_all, package, NULL);
 	} else if (application->priv->search_type == PK_SEARCH_FILE) {
-		pk_client_reset (application->priv->client_search);
-		pk_client_set_name_filter (application->priv->client_search, TRUE);
-		ret = pk_client_search_file (application->priv->client_search, filter_all, package);
+		pk_client_reset (application->priv->client_search, NULL);
+		pk_client_set_name_filter (application->priv->client_search, TRUE, NULL);
+		ret = pk_client_search_file (application->priv->client_search, filter_all, package, NULL);
 	} else {
 		pk_warning ("invalid search type");
 		return;
@@ -690,9 +690,9 @@
 	g_return_val_if_fail (PK_IS_APPLICATION (application), FALSE);
 
 	/* we might have visual stuff running, close them down */
-	pk_client_cancel (application->priv->client_search);
-	pk_client_cancel (application->priv->client_description);
-	pk_client_cancel (application->priv->client_files);
+	pk_client_cancel (application->priv->client_search, NULL);
+	pk_client_cancel (application->priv->client_description, NULL);
+	pk_client_cancel (application->priv->client_files, NULL);
 
 	pk_debug ("emitting action-close");
 	g_signal_emit (application, signals [ACTION_CLOSE], 0);
@@ -900,8 +900,8 @@
 		/* refresh the search as the items may have changed */
 		gtk_list_store_clear (application->priv->packages_store);
 
-		pk_client_reset (application->priv->client_search);
-		ret = pk_client_search_group (application->priv->client_search, "none", id);
+		pk_client_reset (application->priv->client_search, NULL);
+		ret = pk_client_search_group (application->priv->client_search, "none", id, NULL);
 		/* ick, we failed so pretend we didn't do the action */
 		if (ret == FALSE) {
 			pk_application_error_message (application,
@@ -945,14 +945,14 @@
 		gtk_widget_hide (widget);
 
 		/* cancel any previous request */
-		ret = pk_client_cancel (application->priv->client_description);
+		ret = pk_client_cancel (application->priv->client_description, NULL);
 		if (ret == FALSE) {
 			pk_debug ("failed to cancel, and adding to queue");
 		}
 		/* get the description */
-		pk_client_reset (application->priv->client_description);
+		pk_client_reset (application->priv->client_description, NULL);
 		pk_client_get_description (application->priv->client_description,
-					   application->priv->package);
+					   application->priv->package, NULL);
 		return TRUE;
 	}
 
@@ -966,14 +966,14 @@
 		pk_application_set_text_buffer (widget, NULL);
 
 		/* cancel any previous request */
-		ret = pk_client_cancel (application->priv->client_files);
+		ret = pk_client_cancel (application->priv->client_files, NULL);
 		if (ret == FALSE) {
 			pk_debug ("failed to cancel, and adding to queue");
 		}
 		/* get the filelist */
-		pk_client_reset (application->priv->client_files);
+		pk_client_reset (application->priv->client_files, NULL);
 		pk_client_get_files (application->priv->client_files,
-				     application->priv->package);
+				     application->priv->package, NULL);
 
 		return TRUE;
 	}
@@ -988,15 +988,15 @@
 		pk_application_set_text_buffer (widget, NULL);
 
 		/* cancel any previous request */
-		ret = pk_client_cancel (application->priv->client_files);
+		ret = pk_client_cancel (application->priv->client_files, NULL);
 		if (ret == FALSE) {
 			pk_debug ("failed to cancel, and adding to queue");
 		}
 		/* get the filelist */
-		pk_client_reset (application->priv->client_files);
-		pk_client_set_use_buffer (application->priv->client_files, TRUE);
+		pk_client_reset (application->priv->client_files, NULL);
+		pk_client_set_use_buffer (application->priv->client_files, TRUE, NULL);
 		pk_client_get_depends (application->priv->client_files,
-				       application->priv->package, FALSE);
+				       application->priv->package, FALSE, NULL);
 
 		return TRUE;
 	}
@@ -1011,15 +1011,15 @@
 		pk_application_set_text_buffer (widget, NULL);
 
 		/* cancel any previous request */
-		ret = pk_client_cancel (application->priv->client_files);
+		ret = pk_client_cancel (application->priv->client_files, NULL);
 		if (ret == FALSE) {
 			pk_debug ("failed to cancel, and adding to queue");
 		}
 		/* get the filelist */
-		pk_client_reset (application->priv->client_files);
-		pk_client_set_use_buffer (application->priv->client_files, TRUE);
+		pk_client_reset (application->priv->client_files, NULL);
+		pk_client_set_use_buffer (application->priv->client_files, TRUE, NULL);
 		pk_client_get_requires (application->priv->client_files,
-				        application->priv->package, TRUE);
+				        application->priv->package, TRUE, NULL);
 
 		return TRUE;
 	}
@@ -1377,7 +1377,7 @@
 			  G_CALLBACK (pk_application_progress_changed_cb), application);
 
 	application->priv->client_files = pk_client_new ();
-	pk_client_set_use_buffer (application->priv->client_files, TRUE);
+	pk_client_set_use_buffer (application->priv->client_files, TRUE, NULL);
 	g_signal_connect (application->priv->client_files, "files",
 			  G_CALLBACK (pk_application_files_cb), application);
 	g_signal_connect (application->priv->client_files, "error-code",

Modified: trunk/src/pk-auto-refresh.c
==============================================================================
--- trunk/src/pk-auto-refresh.c	(original)
+++ trunk/src/pk-auto-refresh.c	Fri Feb 29 16:00:44 2008
@@ -212,7 +212,7 @@
 	}
 
 	/* get the time since the last refresh */
-	ret = pk_client_get_time_since_action (arefresh->priv->client, PK_ROLE_ENUM_REFRESH_CACHE, &time);
+	ret = pk_client_get_time_since_action (arefresh->priv->client, PK_ROLE_ENUM_REFRESH_CACHE, &time, NULL);
 	if (ret == FALSE) {
 		pk_warning ("failed to get last time");
 		return FALSE;
@@ -245,7 +245,7 @@
 	g_return_val_if_fail (PK_IS_AUTO_REFRESH (arefresh), FALSE);
 
 	/* get the time since the last refresh */
-	ret = pk_client_get_time_since_action (arefresh->priv->client, PK_ROLE_ENUM_GET_UPDATES, &time);
+	ret = pk_client_get_time_since_action (arefresh->priv->client, PK_ROLE_ENUM_GET_UPDATES, &time, NULL);
 	if (ret == FALSE) {
 		pk_warning ("failed to get last time");
 		return FALSE;

Modified: trunk/src/pk-backend-status.c
==============================================================================
--- trunk/src/pk-backend-status.c	(original)
+++ trunk/src/pk-backend-status.c	Fri Feb 29 16:00:44 2008
@@ -118,7 +118,7 @@
 	filter_list = pk_client_get_filters (client);
 
 	/* general stuff */
-	retval = pk_client_get_backend_detail (client, &name, &author);
+	retval = pk_client_get_backend_detail (client, &name, &author, NULL);
 	if (FALSE == retval) {
 		pk_warning (_("Exiting on failure\n"));
 		return 1;

Modified: trunk/src/pk-common-gui.c
==============================================================================
--- trunk/src/pk-common-gui.c	(original)
+++ trunk/src/pk-common-gui.c	Fri Feb 29 16:00:44 2008
@@ -386,37 +386,6 @@
 }
 
 /**
- * pk_error_format_details:
- *
- * Turns the ; into \n and escapes the string ready for printing
- **/
-gchar *
-pk_error_format_details (const gchar *details)
-{
-	gchar *escaped;
-	gchar *valid;
-	gchar **array;
-
-	if (details == NULL) {
-		return NULL;
-	}
-
-	/* split the string into sections */
-	array = g_strsplit (details, ";", -1);
-
-	/* put back together */
-	valid = g_strjoinv ("\n", array);
-
-	/* we need to escape this as it may contain markup */
-	escaped = g_markup_escape_text (valid, -1);
-
-	g_free (valid);
-	g_strfreev (array);
-
-	return escaped;
-}
-
-/**
  * pk_error_enum_to_localised_text:
  **/
 const gchar *

Modified: trunk/src/pk-common-gui.h
==============================================================================
--- trunk/src/pk-common-gui.h	(original)
+++ trunk/src/pk-common-gui.h	Fri Feb 29 16:00:44 2008
@@ -63,7 +63,6 @@
 gboolean	 pk_icon_valid				(const gchar	*icon);
 gboolean	 pk_error_modal_dialog			(const gchar	*title,
 							 const gchar	*message);
-gchar		*pk_error_format_details		(const gchar	*details);
 gboolean	 pk_execute_url				(const gchar	*url);
 const gchar	*pk_role_enum_to_localised_past		(PkRoleEnum	 role);
 const gchar	*pk_role_enum_to_localised_present	(PkRoleEnum	 role);

Modified: trunk/src/pk-install-file.c
==============================================================================
--- trunk/src/pk-install-file.c	(original)
+++ trunk/src/pk-install-file.c	Fri Feb 29 16:00:44 2008
@@ -105,7 +105,7 @@
 	}
 
 	client = pk_client_new ();
-	ret = pk_client_install_file (client, argv[1]);
+	ret = pk_client_install_file (client, argv[1], NULL);
 	if (ret == FALSE) {
 		pk_error_modal_dialog (_("Method not supported"),
 				       _("Installing local files is not supported"));

Modified: trunk/src/pk-install-package.c
==============================================================================
--- trunk/src/pk-install-package.c	(original)
+++ trunk/src/pk-install-package.c	Fri Feb 29 16:00:44 2008
@@ -88,7 +88,7 @@
 			  G_CALLBACK (pk_monitor_install_finished_cb), NULL);
 
 	pk_warning ("Installing '%s'", package);
-	ret = pk_client_install_package (client, package);
+	ret = pk_client_install_package (client, package, NULL);
 	if (ret == FALSE) {
 		pk_error_modal_dialog (_("Method not supported"),
 				       _("Installing packages is not supported"));
@@ -178,7 +178,7 @@
 	g_signal_connect (client, "package",
 			  G_CALLBACK (pk_monitor_resolve_package_cb), NULL);
 	filter = pk_filter_enum_to_text (PK_FILTER_ENUM_NOT_INSTALLED);
-	ret = pk_client_resolve (client, filter, argv[1]);
+	ret = pk_client_resolve (client, filter, argv[1], NULL);
 	if (ret == FALSE) {
 		pk_error_modal_dialog (_("Method not supported"),
 				       _("Resolving names to packages is not supported"));

Modified: trunk/src/pk-notify.c
==============================================================================
--- trunk/src/pk-notify.c	(original)
+++ trunk/src/pk-notify.c	Fri Feb 29 16:00:44 2008
@@ -325,7 +325,7 @@
 		pk_smart_icon_notify_show (notify->priv->sicon);
 	}
 	pk_debug ("resetting client %p", client);
-	pk_client_reset (client);
+	pk_client_reset (client, NULL);
 }
 
 /**
@@ -340,7 +340,7 @@
 	g_return_val_if_fail (PK_IS_NOTIFY (notify), FALSE);
 
 	pk_debug ("install updates");
-	ret = pk_client_update_system (notify->priv->client_update_system);
+	ret = pk_client_update_system (notify->priv->client_update_system, NULL);
 	if (ret == TRUE) {
 		pk_smart_icon_set_icon_name (notify->priv->sicon, NULL);
 	} else {
@@ -697,8 +697,8 @@
 			  G_CALLBACK (pk_notify_query_updates_finished_cb), notify);
 	g_signal_connect (client, "error-code",
 			  G_CALLBACK (pk_notify_error_code_cb), notify);
-	pk_client_set_use_buffer (client, TRUE);
-	pk_client_get_updates (client);
+	pk_client_set_use_buffer (client, TRUE, NULL);
+	pk_client_get_updates (client, "none", NULL);
 	return TRUE;
 }
 
@@ -757,7 +757,7 @@
 			  G_CALLBACK (pk_notify_refresh_cache_finished_cb), notify);
 	g_signal_connect (client, "error-code",
 			  G_CALLBACK (pk_notify_error_code_cb), notify);
-	ret = pk_client_refresh_cache (client, TRUE);
+	ret = pk_client_refresh_cache (client, TRUE, NULL);
 	if (ret == FALSE) {
 		g_object_unref (client);
 		pk_warning ("failed to refresh cache");
@@ -844,7 +844,7 @@
 		}
 	} else if (button == PK_NOTIFY_BUTTON_CANCEL_UPDATE) {
 		gboolean ret;
-		ret = pk_client_cancel (notify->priv->client_update_system);
+		ret = pk_client_cancel (notify->priv->client_update_system, NULL);
 		if (ret == FALSE) {
 			pk_warning ("cancelling updates failed");
 			pk_smart_icon_notify_new (notify->priv->sicon,

Modified: trunk/src/pk-progress.c
==============================================================================
--- trunk/src/pk-progress.c	(original)
+++ trunk/src/pk-progress.c	Fri Feb 29 16:00:44 2008
@@ -139,7 +139,7 @@
 		       PkProgress *progress)
 {
 	pk_debug ("emitting cancel");
-	pk_client_cancel (progress->priv->client);
+	pk_client_cancel (progress->priv->client, NULL);
 }
 
 /**
@@ -438,7 +438,7 @@
 	PkRoleEnum role;
 	PkPackageId *ident;
 
-	pk_client_get_role (client, &role, &package_id);
+	pk_client_get_role (client, &role, &package_id, NULL);
 	role_text = pk_role_enum_to_localised_present (role);
 
 	/* check to see if we have a package_id or just a search term */
@@ -470,7 +470,7 @@
 	guint elapsed;
 	guint remaining;
 
-	pk_client_set_tid (progress->priv->client, tid);
+	pk_client_set_tid (progress->priv->client, tid, NULL);
 
 	/* fill in role */
 	text = pk_common_get_role_text (progress->priv->client);
@@ -479,7 +479,7 @@
 	g_free (text);
 
 	/* coldplug */
-	ret = pk_client_get_status (progress->priv->client, &status);
+	ret = pk_client_get_status (progress->priv->client, &status, NULL);
 	/* no such transaction? */
 	if (ret == FALSE) {
 		g_signal_emit (progress, signals [ACTION_UNREF], 0);
@@ -487,23 +487,26 @@
 	}
 
 	/* are we cancellable? */
-	allow_cancel = pk_client_get_allow_cancel (progress->priv->client);
+	pk_client_get_allow_cancel (progress->priv->client, &allow_cancel, NULL);
 	widget = glade_xml_get_widget (progress->priv->glade_xml, "button_cancel");
 	gtk_widget_set_sensitive (widget, allow_cancel);
 
 	pk_progress_status_changed_cb (progress->priv->client, status, progress);
 
 	/* coldplug */
-	ret = pk_client_get_progress (progress->priv->client, &percentage, &subpercentage, &elapsed, &remaining);
+	ret = pk_client_get_progress (progress->priv->client, &percentage, &subpercentage, &elapsed, &remaining, NULL);
 	if (ret == TRUE) {
-		pk_progress_progress_changed_cb (progress->priv->client, percentage, subpercentage, elapsed, remaining, progress);
+		pk_progress_progress_changed_cb (progress->priv->client, percentage,
+						 subpercentage, elapsed, remaining, progress);
 	} else {
 		pk_warning ("GetProgress failed");
-		pk_progress_progress_changed_cb (progress->priv->client, PK_CLIENT_PERCENTAGE_INVALID, PK_CLIENT_PERCENTAGE_INVALID, 0, 0, progress);
+		pk_progress_progress_changed_cb (progress->priv->client,
+						 PK_CLIENT_PERCENTAGE_INVALID,
+						 PK_CLIENT_PERCENTAGE_INVALID, 0, 0, progress);
 	}
 
 	/* do the best we can */
-	ret = pk_client_get_package (progress->priv->client, &text);
+	ret = pk_client_get_package (progress->priv->client, &text, NULL);
 	if (ret == TRUE) {
 		pk_progress_package_cb (progress->priv->client, 0, text, NULL, progress);
 	}

Modified: trunk/src/pk-repo.c
==============================================================================
--- trunk/src/pk-repo.c	(original)
+++ trunk/src/pk-repo.c	Fri Feb 29 16:00:44 2008
@@ -102,8 +102,8 @@
 
 	/* do this to the repo */
 	pk_debug ("setting %s to %i", repo_id, installed);
-	pk_client_reset (client);
-	pk_client_repo_enable (client, repo_id, installed);
+	pk_client_reset (client, NULL);
+	pk_client_repo_enable (client, repo_id, installed, NULL);
 
 	/* clean up */
 	g_free (repo_id);
@@ -301,9 +301,10 @@
 
 	if (pk_enum_list_contains (role_list, PK_ROLE_ENUM_GET_REPO_LIST) == TRUE) {
 		/* get the update list */
-		pk_client_get_repo_list (client);
+		pk_client_get_repo_list (client, NULL);
 	} else {
-		pk_repo_detail_cb (client, "default", _("Getting repository list not supported by backend"), FALSE, NULL);
+		pk_repo_detail_cb (client, "default",
+				   _("Getting repository list not supported by backend"), FALSE, NULL);
 		widget = glade_xml_get_widget (glade_xml, "treeview_repo");
 		gtk_widget_set_sensitive (widget, FALSE);
 	}

Modified: trunk/src/pk-transaction-viewer.c
==============================================================================
--- trunk/src/pk-transaction-viewer.c	(original)
+++ trunk/src/pk-transaction-viewer.c	Fri Feb 29 16:00:44 2008
@@ -80,7 +80,7 @@
 pk_button_rollback_cb (GtkWidget *widget, gpointer data)
 {
 	GMainLoop *loop = (GMainLoop *) data;
-	pk_client_rollback (client, transaction_id);
+	pk_client_rollback (client, transaction_id, NULL);
 	g_main_loop_quit (loop);
 }
 
@@ -458,7 +458,7 @@
 	}
 
 	/* get the update list */
-	pk_client_get_old_transactions (client, 0);
+	pk_client_get_old_transactions (client, 0, NULL);
 	gtk_widget_show (main_window);
 
 	g_main_loop_run (loop);

Modified: trunk/src/pk-update-viewer.c
==============================================================================
--- trunk/src/pk-update-viewer.c	(original)
+++ trunk/src/pk-update-viewer.c	Fri Feb 29 16:00:44 2008
@@ -87,8 +87,8 @@
 pk_button_update_cb (GtkWidget *widget, gboolean data)
 {
 	gboolean ret;
-	pk_client_reset (client);
-	ret = pk_client_update_package (client, package);
+	pk_client_reset (client, NULL);
+	ret = pk_client_update_package (client, package, NULL);
 	if (ret == TRUE) {
 		/* make the refresh button non-clickable until we have completed */
 		widget = glade_xml_get_widget (glade_xml, "button_apply");
@@ -136,8 +136,8 @@
 {
 	pk_debug ("Doing the system update");
 
-	pk_client_reset (client);
-	pk_client_update_system (client);
+	pk_client_reset (client, NULL);
+	pk_client_update_system (client, NULL);
 
 	/* set correct view */
 	pk_updates_set_page (PAGE_PROGRESS);
@@ -166,8 +166,8 @@
 	gtk_widget_set_sensitive (widget, FALSE);
 
 	/* we can't click this if we havn't finished */
-	pk_client_reset (client);
-	ret = pk_client_refresh_cache (client, TRUE);
+	pk_client_reset (client, NULL);
+	ret = pk_client_refresh_cache (client, TRUE, NULL);
 	if (ret == FALSE) {
 		pk_warning ("failed to refresh cache");
 	}
@@ -180,7 +180,7 @@
 pk_button_cancel_cb (GtkWidget *widget, gpointer data)
 {
 	/* we might have a transaction running */
-	pk_client_cancel (client);
+	pk_client_cancel (client, NULL);
 }
 
 /**
@@ -192,7 +192,7 @@
 	GMainLoop *loop = (GMainLoop *) data;
 
 	/* we might have a transaction running */
-	pk_client_cancel (client);
+	pk_client_cancel (client, NULL);
 
 	g_main_loop_quit (loop);
 	pk_debug ("emitting action-close");
@@ -230,7 +230,7 @@
 	PkRoleEnum role;
 	const gchar *icon_name;
 
-	pk_client_get_role (client, &role, NULL);
+	pk_client_get_role (client, &role, NULL, NULL);
 	pk_debug ("package = %s:%s:%s", pk_info_enum_to_text (info), package_id, summary);
 
 	if (role == PK_ROLE_ENUM_GET_UPDATES) {
@@ -629,7 +629,7 @@
 	GMainLoop *loop = (GMainLoop *) data;
 
 	/* we might have a transaction running */
-	pk_client_cancel (client);
+	pk_client_cancel (client, NULL);
 
 	g_main_loop_quit (loop);
 	return FALSE;
@@ -688,8 +688,8 @@
 		g_free (package_id);
 		g_print ("selected row is: %s\n", package);
 		/* get the decription */
-		pk_client_reset (client);
-		pk_client_get_update_detail (client, package);
+		pk_client_reset (client, NULL);
+		pk_client_get_update_detail (client, package, NULL);
 
 		widget = glade_xml_get_widget (glade_xml, "button_update");
 		gtk_widget_set_sensitive (widget, TRUE);
@@ -744,15 +744,15 @@
 	guint length;
 	PkRestartEnum restart;
 
-	pk_client_get_role (client, &role, NULL);
+	pk_client_get_role (client, &role, NULL, NULL);
 
 	/* hide widget */
 	pk_statusbar_hide (statusbar);
 
 	if (role == PK_ROLE_ENUM_REFRESH_CACHE) {
-		pk_client_reset (client);
-		pk_client_set_use_buffer (client, TRUE);
-		pk_client_get_updates (client);
+		pk_client_reset (client, NULL);
+		pk_client_set_use_buffer (client, TRUE, NULL);
+		pk_client_get_updates (client, "basename", NULL);
 		return;
 	}
 
@@ -801,9 +801,9 @@
 		gtk_list_store_clear (list_store_details);
 
 		/* get the new update list */
-		pk_client_reset (client);
-		pk_client_set_use_buffer (client, TRUE);
-		pk_client_get_updates (client);
+		pk_client_reset (client, NULL);
+		pk_client_set_use_buffer (client, TRUE, NULL);
+		pk_client_get_updates (client, "basename", NULL);
 		return;
 	}
 
@@ -983,7 +983,7 @@
 	gtk_label_set_label (GTK_LABEL (widget), pk_error_enum_to_localised_message (code));
 
 	widget = glade_xml_get_widget (glade_xml, "label_error_details");
-	details_safe = pk_error_format_details (details);
+	details_safe = g_markup_escape_text (details, -1);
 	gtk_label_set_label (GTK_LABEL (widget), details_safe);
 }
 
@@ -1045,7 +1045,7 @@
 	loop = g_main_loop_new (NULL, FALSE);
 
 	client = pk_client_new ();
-	pk_client_set_use_buffer (client, TRUE);
+	pk_client_set_use_buffer (client, TRUE, NULL);
 	g_signal_connect (client, "package",
 			  G_CALLBACK (pk_updates_package_cb), NULL);
 	g_signal_connect (client, "finished",
@@ -1225,17 +1225,17 @@
 	gtk_widget_hide (widget);
 
 	/* get the update list */
-	pk_client_get_updates (client);
+	pk_client_get_updates (client, "basename", NULL);
 	gtk_widget_show (main_window);
 
 	g_main_loop_run (loop);
 	g_main_loop_unref (loop);
 
 	/* we might have visual stuff running, close it down */
-	pk_client_get_role (client, &role, NULL);
+	pk_client_get_role (client, &role, NULL, NULL);
 	if (role == PK_ROLE_ENUM_GET_UPDATES ||
 	    role == PK_ROLE_ENUM_GET_UPDATE_DETAIL) {
-		pk_client_cancel (client);
+		pk_client_cancel (client, NULL);
 	}
 
 	g_object_unref (glade_xml);

Modified: trunk/src/pk-watch.c
==============================================================================
--- trunk/src/pk-watch.c	(original)
+++ trunk/src/pk-watch.c	Fri Feb 29 16:00:44 2008
@@ -272,7 +272,7 @@
 	}
 
 	/* get the role */
-	ret = pk_client_get_role (client, &role, &package_id);
+	ret = pk_client_get_role (client, &role, &package_id, NULL);
 	if (ret == FALSE) {
 		pk_warning ("cannot get role");
 		return;
@@ -328,7 +328,7 @@
 	title = pk_error_enum_to_localised_text (error_code);
 
 	/* if the client dbus connection is still active */
-	pk_client_is_caller_active (client, &is_active);
+	pk_client_is_caller_active (client, &is_active, NULL);
 
 	/* do we ignore this error? */
 	if (is_active == TRUE) {
@@ -346,7 +346,7 @@
 	}
 
 	/* we need to format this */
-	escaped_details = pk_error_format_details (details);
+	escaped_details = g_markup_escape_text (details, -1);
 
 	pk_smart_icon_notify_new (watch->priv->sicon, title, escaped_details, "help-browser",
 				  PK_NOTIFY_URGENCY_LOW, PK_NOTIFY_TIMEOUT_LONG);
@@ -372,7 +372,7 @@
 	filename = pk_message_enum_to_icon_name (message);
 
 	/* we need to format this */
-	escaped_details = pk_error_format_details (details);
+	escaped_details = g_markup_escape_text (details, -1);
 
 	pk_smart_icon_notify_new (watch->priv->sicon, title, escaped_details, filename,
 				  PK_NOTIFY_URGENCY_LOW, PK_NOTIFY_TIMEOUT_NEVER);
@@ -558,7 +558,7 @@
 	g_signal_connect (client, "finished",
 			  G_CALLBACK (pk_watch_refresh_cache_finished_cb), watch);
 
-	ret = pk_client_refresh_cache (client, TRUE);
+	ret = pk_client_refresh_cache (client, TRUE, NULL);
 	if (ret == FALSE) {
 		g_object_unref (client);
 		pk_warning ("failed to refresh cache");
@@ -756,7 +756,7 @@
 
 	/* we need to get ::locked */
 	watch->priv->client = pk_client_new ();
-	pk_client_set_promiscuous (watch->priv->client, TRUE);
+	pk_client_set_promiscuous (watch->priv->client, TRUE, NULL);
 	g_signal_connect (watch->priv->client, "locked",
 			  G_CALLBACK (pk_watch_locked_cb), watch);
 	g_signal_connect (watch->priv->client, "finished",
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]