gnome-packagekit r534 - in trunk: data po src

[rhughes svn gnome org]

Author: rhughes
Date: Mon Mar 30 08:41:59 2009
New Revision: 534
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=534&view=rev

Log:
from git

Modified:
   trunk/data/gpk-update-viewer.desktop.in
   trunk/po/ChangeLog
   trunk/po/LINGUAS
   trunk/src/gpk-check-update.c
   trunk/src/gpk-log.c
   trunk/src/gpk-update-viewer2.c

Modified: trunk/data/gpk-update-viewer.desktop.in
==============================================================================
--- trunk/data/gpk-update-viewer.desktop.in	(original)
+++ trunk/data/gpk-update-viewer.desktop.in	Mon Mar 30 08:41:59 2009
@@ -4,7 +4,7 @@
 _GenericName=Software Update Viewer
 _Comment=Update software installed on the system
 Icon=system-software-update
-Exec=gpk-update-viewer
+Exec=gpk-update-viewer2
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Settings;System;PackageManager;

Modified: trunk/po/LINGUAS
==============================================================================
--- trunk/po/LINGUAS	(original)
+++ trunk/po/LINGUAS	Mon Mar 30 08:41:59 2009
@@ -27,8 +27,8 @@
 or
 pa
 pl
-pt
 pt_BR
+pt
 ro
 ru
 sv

Modified: trunk/src/gpk-check-update.c
==============================================================================
--- trunk/src/gpk-check-update.c	(original)
+++ trunk/src/gpk-check-update.c	Mon Mar 30 08:41:59 2009
@@ -336,7 +336,7 @@
 static void
 gpk_check_update_menuitem_show_updates_cb (GtkMenuItem *item, gpointer data)
 {
-	const gchar *command = "gpk-update-viewer";
+	const gchar *command = "gpk-update-viewer2";
 	if (!g_spawn_command_line_async (command, NULL))
 		egg_warning ("Couldn't execute command: %s", command);
 }

Modified: trunk/src/gpk-log.c
==============================================================================
--- trunk/src/gpk-log.c	(original)
+++ trunk/src/gpk-log.c	Mon Mar 30 08:41:59 2009
@@ -542,6 +542,9 @@
 	else if (egg_strequal (obj->cmdline, "gpk-update-viewer"))
 		/* TRANSLATORS: short name for gpk-update-viewer */
 		tool = _("Update System");
+	else if (egg_strequal (obj->cmdline, "gpk-update-viewer2"))
+		/* TRANSLATORS: short name for gpk-update-viewer (new name) */
+		tool = _("Update System");
 	else if (egg_strequal (obj->cmdline, "gpk-update-icon"))
 		/* TRANSLATORS: short name for gpk-update-icon */
 		tool = _("Update Icon");

Modified: trunk/src/gpk-update-viewer2.c
==============================================================================
--- trunk/src/gpk-update-viewer2.c	(original)
+++ trunk/src/gpk-update-viewer2.c	Mon Mar 30 08:41:59 2009
@@ -653,6 +653,13 @@
 		widget = glade_xml_get_widget (glade_xml, "button_close");
 		gtk_widget_hide (widget);
 
+		/* show a new title */
+		widget = glade_xml_get_widget (glade_xml, "label_header_title");
+		/* TRANSLATORS: there are no updates */
+		text = g_strdup_printf ("<big><b>%s</b></big>", _("There are no updates available"));
+		gtk_label_set_label (GTK_LABEL (widget), text);
+		g_free (text);
+
 		/* show modal dialog */
 		widget = glade_xml_get_widget (glade_xml, "dialog_updates");
 		dialog = gtk_message_dialog_new (GTK_WINDOW (widget), GTK_DIALOG_MODAL,
@@ -1423,7 +1430,7 @@
 	/* show modal dialog */
 	widget = glade_xml_get_widget (glade_xml, "dialog_updates");
 	dialog = gtk_message_dialog_new (GTK_WINDOW (widget), GTK_DIALOG_MODAL,
-					 GTK_MESSAGE_INFO, GTK_BUTTONS_CANCEL,
+					 GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
 					 "%s", title);
 	gtk_dialog_add_button (GTK_DIALOG (dialog), button, GTK_RESPONSE_OK);
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(dialog), "%s", message);
@@ -1574,7 +1581,14 @@
 		/* check restart */
 		gpk_update_viewer_check_restart (restart_update);
 
-		/* refresh list */
+		/* quit after we successfully updated */
+		g_main_loop_quit (loop);
+	}
+
+	/* check if we need to refresh list */
+	if (exit != PK_EXIT_ENUM_SUCCESS &&
+	    (role == PK_ROLE_ENUM_UPDATE_SYSTEM ||
+	     role == PK_ROLE_ENUM_UPDATE_PACKAGES)) {
 		gpk_update_viewer_get_new_update_list ();
 	}