gnome-packagekit r344 - in trunk: po src

[rhughes svn gnome org]

Author: rhughes
Date: Mon Oct 13 15:46:57 2008
New Revision: 344
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=344&view=rev

Log:
from git

Modified:
   trunk/po/ar.po
   trunk/po/ca.po
   trunk/po/cs.po
   trunk/po/cy.po
   trunk/po/de.po
   trunk/po/el.po
   trunk/po/en_GB.po
   trunk/po/es.po
   trunk/po/fi.po
   trunk/po/fr.po
   trunk/po/gl.po
   trunk/po/he.po
   trunk/po/hu.po
   trunk/po/it.po
   trunk/po/ja.po
   trunk/po/nb.po
   trunk/po/nl.po
   trunk/po/oc.po
   trunk/po/pa.po
   trunk/po/pl.po
   trunk/po/pt_BR.po
   trunk/po/ru.po
   trunk/po/sv.po
   trunk/po/tr.po
   trunk/src/gpk-client.c
   trunk/src/gpk-update-viewer.c

Modified: trunk/src/gpk-client.c
==============================================================================
--- trunk/src/gpk-client.c	(original)
+++ trunk/src/gpk-client.c	Mon Oct 13 15:46:57 2008
@@ -103,6 +103,7 @@
 	guint			 timestamp;
 	gchar			*parent_title;
 	gchar			*parent_icon_name;
+	gchar			*error_details;
 	GMainLoop		*loop;
 };
 
@@ -202,6 +203,8 @@
 	} else if (egg_strequal (action, "do-not-show-update-started")) {
 		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);
 	} else if (egg_strequal (action, "cancel")) {
 		/* try to cancel */
 		ret = pk_client_cancel (gclient->priv->client_action, &error);
@@ -489,10 +492,16 @@
 		return;
 	}
 
+	/* save this globally */
+	g_free (gclient->priv->error_details);
+	gclient->priv->error_details = g_markup_escape_text (details, -1);
+
 	/* do the bubble */
 	notification = notify_notification_new (title, message, "help-browser", NULL);
 	notify_notification_set_timeout (notification, 15000);
 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+	notify_notification_add_action (notification, "show-error-details",
+					_("Show details"), gpk_client_libnotify_cb, gclient, NULL);
 	ret = notify_notification_show (notification, &error);
 	if (!ret) {
 		egg_warning ("error: %s", error->message);
@@ -3219,6 +3228,7 @@
 	gclient->priv->parent_window = NULL;
 	gclient->priv->parent_title = NULL;
 	gclient->priv->parent_icon_name = NULL;
+	gclient->priv->error_details = NULL;
 	gclient->priv->using_secondary_client = FALSE;
 	gclient->priv->exit = PK_EXIT_ENUM_FAILED;
 	gclient->priv->show_confirm = TRUE;
@@ -3313,6 +3323,7 @@
 
 	g_free (gclient->priv->parent_title);
 	g_free (gclient->priv->parent_icon_name);
+	g_free (gclient->priv->error_details);
 	g_ptr_array_foreach (gclient->priv->upgrade_array, (GFunc) pk_distro_upgrade_obj_free, NULL);
 	g_ptr_array_free (gclient->priv->upgrade_array, TRUE);
 	g_strfreev (gclient->priv->files_array);

Modified: trunk/src/gpk-update-viewer.c
==============================================================================
--- trunk/src/gpk-update-viewer.c	(original)
+++ trunk/src/gpk-update-viewer.c	Mon Oct 13 15:46:57 2008
@@ -487,7 +487,7 @@
 
 	length = pk_package_list_get_size (list);
 	if (length == 0) {
-		gpk_update_viewer_add_preview_item ("dialog-information", _("There are no updates available!"), TRUE);
+		gpk_update_viewer_add_preview_item ("dialog-information", _("There are no updates available"), TRUE);
 		widget = glade_xml_get_widget (glade_xml, "button_close3");
 		gtk_widget_grab_default (widget);
 	} else {