gnome-packagekit r329 - trunk/src

[rhughes svn gnome org]

Author: rhughes
Date: Wed Oct  8 14:43:53 2008
New Revision: 329
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=329&view=rev

Log:
from git

Modified:
   trunk/src/gpk-client.c
   trunk/src/gpk-enum.c
   trunk/src/gpk-install-local-file.c

Modified: trunk/src/gpk-client.c
==============================================================================
--- trunk/src/gpk-client.c	(original)
+++ trunk/src/gpk-client.c	Wed Oct  8 14:43:53 2008
@@ -698,9 +698,6 @@
 	if (ret)
 		return TRUE;
 
-	/* wait for an answer */
-	g_main_loop_run (gclient->priv->loop);
-
 	length = g_strv_length (files_rel);
 	title = ngettext ("Failed to install file", "Failed to install files", length);
 	gpk_client_error_msg (gclient, title, error_local);
@@ -1122,44 +1119,38 @@
 	g_return_val_if_fail (files_rel != NULL, FALSE);
 
 	array = pk_strv_to_ptr_array (files_rel);
-egg_warning ("moo1");
+
 	/* check the user wanted to call this method */
 	if (gclient->priv->show_confirm) {
 		ret = gpk_client_install_local_files_verify (gclient, array, error);
 		if (!ret)
 			goto out;
 	}
-egg_warning ("moo2");
 
 	/* check all files exist and are readable by the local user */
 	ret = gpk_client_install_local_files_check_exists (gclient, array, error);
 	if (!ret)
 		goto out;
-egg_warning ("moo3");
 
 	/* check all files exist and are readable by the local user */
 	ret = gpk_client_install_local_files_copy_private (gclient, array, error);
 	if (!ret)
 		goto out;
-egg_warning ("moo4");
 
-	files = pk_ptr_array_to_strv (array);
-	gclient->priv->retry_untrusted_value = FALSE;
-	ret = gpk_client_install_local_files_internal (gclient, TRUE, files, error);
-	if (!ret)
-		goto out;
-
-egg_warning ("moo5");
 	/* set title */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Install local file"));
 	gpk_client_dialog_set_help_id (gclient->priv->dialog, NULL);
 	if (gclient->priv->show_progress)
 		gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_PROGRESS, 0, 0);
-egg_warning ("moo6");
+
+	files = pk_ptr_array_to_strv (array);
+	gclient->priv->retry_untrusted_value = FALSE;
+	ret = gpk_client_install_local_files_internal (gclient, TRUE, files, error);
+	if (!ret)
+		goto out;
 
 	/* wait */
 	g_main_loop_run (gclient->priv->loop);
-egg_warning ("moo7");
 
 	/* do we need to try again with better auth? */
 	if (gclient->priv->retry_untrusted_value) {
@@ -3223,7 +3214,6 @@
 	gboolean ret;
 
 	gclient->priv = GPK_CLIENT_GET_PRIVATE (gclient);
-egg_warning (",oo");
 
 	gclient->priv->files_array = NULL;
 	gclient->priv->parent_window = NULL;
@@ -3242,7 +3232,6 @@
 	/* add application specific icons to search path */
 	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
 					   GPK_DATA G_DIR_SEPARATOR_S "icons");
-egg_warning (",oo");
 
 	gclient->priv->vendor = gpk_vendor_new ();
 	gclient->priv->dialog = gpk_client_dialog_new ();
@@ -3254,13 +3243,10 @@
 
 	/* use gconf for session settings */
 	gclient->priv->gconf_client = gconf_client_get_default ();
-egg_warning (",oo");
 
 	/* get actions */
 	gclient->priv->control = pk_control_new ();
-egg_warning (",oo");
 	gclient->priv->roles = pk_control_get_actions (gclient->priv->control, NULL);
-egg_warning (",oo");
 
 	gclient->priv->client_action = pk_client_new ();
 	pk_client_set_use_buffer (gclient->priv->client_action, TRUE, NULL);
@@ -3284,7 +3270,6 @@
 			  G_CALLBACK (gpk_client_files_cb), gclient);
 	g_signal_connect (gclient->priv->client_action, "distro-upgrade",
 			  G_CALLBACK (pk_client_distro_upgrade_cb), gclient);
-egg_warning (",oo");
 
 	gclient->priv->client_resolve = pk_client_new ();
 	g_signal_connect (gclient->priv->client_resolve, "status-changed",
@@ -3296,7 +3281,7 @@
 	gclient->priv->client_secondary = pk_client_new ();
 	g_signal_connect (gclient->priv->client_secondary, "finished",
 			  G_CALLBACK (gpk_client_secondary_finished_cb), gclient);
-egg_warning (",oo");
+
 	/* used for icons and translations */
 	gclient->priv->extra = pk_extra_new ();
 	ret = pk_extra_set_database (gclient->priv->extra, NULL);

Modified: trunk/src/gpk-enum.c
==============================================================================
--- trunk/src/gpk-enum.c	(original)
+++ trunk/src/gpk-enum.c	Wed Oct  8 14:43:53 2008
@@ -151,7 +151,6 @@
 	{PK_ROLE_ENUM_SEARCH_FILE,		"pk-package-search"},
 	{PK_ROLE_ENUM_SEARCH_GROUP,		"pk-package-search"},
 	{PK_ROLE_ENUM_SEARCH_NAME,		"pk-package-search"},
-	{PK_ROLE_ENUM_SERVICE_PACK,		"pk-package-update"},
 	{PK_ROLE_ENUM_UPDATE_PACKAGES,		"pk-package-update"},
 	{PK_ROLE_ENUM_UPDATE_SYSTEM,		"system-software-update"},
 	{PK_ROLE_ENUM_WHAT_PROVIDES,		"pk-package-search"},
@@ -1066,9 +1065,6 @@
 	case PK_ROLE_ENUM_WHAT_PROVIDES:
 		text = _("Getting what provides");
 		break;
-	case PK_ROLE_ENUM_SERVICE_PACK:
-		text = _("Service pack");
-		break;
 	case PK_ROLE_ENUM_INSTALL_SIGNATURE:
 		text = _("Installing signature");
 		break;
@@ -1139,9 +1135,6 @@
 	case PK_ROLE_ENUM_INSTALL_FILES:
 		text = _("Installed local file");
 		break;
-	case PK_ROLE_ENUM_SERVICE_PACK:
-		text = _("Updating from service pack");
-		break;
 	case PK_ROLE_ENUM_REFRESH_CACHE:
 		text = _("Refreshed package cache");
 		break;

Modified: trunk/src/gpk-install-local-file.c
==============================================================================
--- trunk/src/gpk-install-local-file.c	(original)
+++ trunk/src/gpk-install-local-file.c	Wed Oct  8 14:43:53 2008
@@ -82,13 +82,10 @@
 				  _("You need to specify a file to install"), NULL);
 		return 1;
 	}
-egg_warning ("moo0");
 
 	error = NULL;
 	gclient = gpk_client_new ();
-egg_warning ("moo0.05");
 	gpk_client_set_interaction (gclient, GPK_CLIENT_INTERACT_ALWAYS);
-egg_warning ("moo0.1");
 	ret = gpk_client_install_local_files (gclient, files, NULL);
 	g_strfreev (files);
 	g_object_unref (gclient);