gnome-packagekit r308 - trunk/src

[rhughes svn gnome org]

Author: rhughes
Date: Fri Sep 26 13:57:28 2008
New Revision: 308
URL: http://svn.gnome.org/viewvc/gnome-packagekit?rev=308&view=rev

Log:
from git

Modified:
   trunk/src/gpk-application.c
   trunk/src/gpk-client-dialog.c
   trunk/src/gpk-client-dialog.h
   trunk/src/gpk-client.c
   trunk/src/gpk-hardware.c

Modified: trunk/src/gpk-application.c
==============================================================================
--- trunk/src/gpk-application.c	(original)
+++ trunk/src/gpk-application.c	Fri Sep 26 13:57:28 2008
@@ -2764,6 +2764,7 @@
 	main_window = glade_xml_get_widget (application->priv->glade_xml, "window_manager");
 
 	/* make GpkClient windows modal */
+	gtk_widget_realize (main_window);
 	gpk_client_set_parent (application->priv->gclient, GTK_WINDOW (main_window));
 
 	/* Hide window first so that the dialogue resizes itself without redrawing */

Modified: trunk/src/gpk-client-dialog.c
==============================================================================
--- trunk/src/gpk-client-dialog.c	(original)
+++ trunk/src/gpk-client-dialog.c	Fri Sep 26 13:57:28 2008
@@ -190,6 +190,7 @@
 		egg_warning ("parent set NULL when already modal with another window, setting non-modal");
 		widget = glade_xml_get_widget (dialog->priv->glade_xml, "window_client");
 		gtk_window_set_modal (GTK_WINDOW (widget), FALSE);
+		dialog->priv->has_parent = FALSE;
 		return FALSE;
 	}
 
@@ -210,7 +211,7 @@
 /**
  * gpk_client_dialog_set_window_title:
  **/
-gboolean
+static gboolean
 gpk_client_dialog_set_window_title (GpkClientDialog *dialog, const gchar *title)
 {
 	GtkWidget *widget;
@@ -253,6 +254,10 @@
 	g_return_val_if_fail (GPK_IS_CLIENT_DIALOG (dialog), FALSE);
 	g_return_val_if_fail (title != NULL, FALSE);
 
+	/* only set the window title if we are non-modal */
+	if (!dialog->priv->has_parent)
+		gpk_client_dialog_set_window_title (dialog, title);
+
 	title_bold = g_strdup_printf ("<b><big>%s</big></b>", title);
 	egg_debug ("setting title: %s", title_bold);
 	widget = glade_xml_get_widget (dialog->priv->glade_xml, "label_title");

Modified: trunk/src/gpk-client-dialog.h
==============================================================================
--- trunk/src/gpk-client-dialog.h	(original)
+++ trunk/src/gpk-client-dialog.h	Fri Sep 26 13:57:28 2008
@@ -99,8 +99,6 @@
 							 const PkPackageList	*list);
 gboolean	 gpk_client_dialog_set_parent		(GpkClientDialog	*dialog,
 							 GdkWindow		*window);
-gboolean	 gpk_client_dialog_set_window_title	(GpkClientDialog	*dialog,
-							 const gchar		*title);
 gboolean	 gpk_client_dialog_set_window_icon	(GpkClientDialog	*dialog,
 							 const gchar		*icon);
 gboolean	 gpk_client_dialog_set_title		(GpkClientDialog	*dialog,

Modified: trunk/src/gpk-client.c
==============================================================================
--- trunk/src/gpk-client.c	(original)
+++ trunk/src/gpk-client.c	Fri Sep 26 13:57:28 2008
@@ -1138,7 +1138,6 @@
 		goto out;
 
 	/* set title */
-	gpk_client_dialog_set_window_title (gclient->priv->dialog, _("Installing files"));
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Install local file"));
 	if (gclient->priv->show_progress)
 		gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_PROGRESS, 0, 0);
@@ -1189,7 +1188,6 @@
 	g_return_val_if_fail (package_ids != NULL, FALSE);
 
 	/* set title */
-	gpk_client_dialog_set_window_title (gclient->priv->dialog, _("Removing packages"));
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Remove packages"));
 
 	/* setup the UI */
@@ -1330,7 +1328,6 @@
 	g_return_val_if_fail (package_ids != NULL, FALSE);
 
 	/* set title */
-	gpk_client_dialog_set_window_title (gclient->priv->dialog, _("Installing packages"));
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("Installing packages"));
 
 	/* setup the UI */
@@ -1421,7 +1418,7 @@
 	}
 
 	/* try to install the package_id */
-	gpk_client_dialog_set_window_title (gclient->priv->dialog, _("Installing packages"));
+	gpk_client_dialog_set_title (gclient->priv->dialog, _("Installing packages"));
 	if (gclient->priv->show_progress) {
 		gpk_client_dialog_set_message (gclient->priv->dialog, "");
 		gpk_client_dialog_show_page (gclient->priv->dialog, GPK_CLIENT_DIALOG_PAGE_PROGRESS, GPK_CLIENT_DIALOG_PACKAGE_PADDING, 0);
@@ -1492,7 +1489,7 @@
 	/* check user wanted operation */
 	message = g_strdup_printf ("%s\n\n%s\n%s", _("An additional file is required"),
 				   text, _("Do you want to search for this file now?"));
-	gpk_client_dialog_set_window_title (gclient->priv->dialog, _("Package installer"));
+	gpk_client_dialog_set_title (gclient->priv->dialog, _("Package installer"));
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Install"));
 	ret = gpk_client_confirm_action (gclient, _("wants to install packages"), message);
 	g_free (text);
@@ -1533,7 +1530,8 @@
 	len = pk_package_list_get_size (list);
 	if (len == 0) {
 		if (gclient->priv->show_warning) {
-			text = pk_package_ids_to_text (packages, ",");
+			//FIXME: shows package_id in UI
+			text = pk_package_ids_to_text (packages);
 			title = g_strdup_printf (_("Could not find %s"), text);
 			gpk_client_dialog_set_title (gclient->priv->dialog, _("Failed to find package"));
 			gpk_client_dialog_set_message (gclient->priv->dialog, _("The packages could not be found in any software source"));
@@ -1562,7 +1560,8 @@
 	/* already installed? */
 	if (already_installed) {
 		if (gclient->priv->show_warning) {
-			text = pk_package_ids_to_text (packages, ",");
+			//FIXME: shows package_id in UI
+			text = pk_package_ids_to_text (packages);
 			title = g_strdup_printf (_("Failed to install %s"), text);
 			gpk_client_dialog_set_title (gclient->priv->dialog, _("Failed to install package"));
 			gpk_client_dialog_set_message (gclient->priv->dialog, _("The package is already installed"));
@@ -1645,7 +1644,7 @@
 	/* check user wanted operation */
 	message = g_strdup_printf ("%s\n\nâ %s\n\n%s", _("The following file is required:"),
 				   full_path, _("Do you want to search for this now?"));
-	gpk_client_dialog_set_window_title (gclient->priv->dialog, _("File installer"));
+	gpk_client_dialog_set_title (gclient->priv->dialog, _("File installer"));
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Install"));
 	ret = gpk_client_confirm_action (gclient, _("wants to install a file"), message);
 	g_free (message);
@@ -1819,7 +1818,7 @@
 	/* display messagebox  */
 	text = g_string_free (string, FALSE);
 
-	gpk_client_dialog_set_window_title (gclient->priv->dialog, _("Codec installer"));
+	gpk_client_dialog_set_title (gclient->priv->dialog, _("Codec installer"));
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Search"));
 	ret = gpk_client_confirm_action (gclient, _("requires additional plugins"), text);
 	g_free (text);
@@ -1998,7 +1997,7 @@
 	message = g_strdup_printf ("%s\n\nâ %s\n\n%s",
 				   _("An additional program is required to open this type of file:"),
 				   mime_type, _("Do you want to search for a program to open this file type now?"));
-	gpk_client_dialog_set_window_title (gclient->priv->dialog, _("File type installer"));
+	gpk_client_dialog_set_title (gclient->priv->dialog, _("File type installer"));
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Search"));
 	ret = gpk_client_confirm_action (gclient, _("requires a new mime type"), message);
 	g_free (message);
@@ -2120,7 +2119,7 @@
 	/* check user wanted operation */
 	message = g_strdup_printf ("%s\n\n%s", _("An additional font is required to view this file correctly"),
 				   _("Do you want to search for a suitable font now?"));
-	gpk_client_dialog_set_window_title (gclient->priv->dialog, _("Font installer"));
+	gpk_client_dialog_set_title (gclient->priv->dialog, _("Font installer"));
 	gpk_client_dialog_set_action (gclient->priv->dialog, _("Search"));
 	ret = gpk_client_confirm_action (gclient, _("wants to install a font"), message);
 	g_free (message);
@@ -2379,7 +2378,6 @@
 
 	/* set title */
 	gpk_client_dialog_set_title (gclient->priv->dialog, _("System update"));
-	gpk_client_dialog_set_window_title (gclient->priv->dialog, _("System update"));
 
 	/* wrap update, but handle all the GPG and EULA stuff */
 	ret = pk_client_update_system (gclient->priv->client_action, &error_local);
@@ -2854,7 +2852,6 @@
 	/* fill in role */
 	text = pk_common_get_role_text (gclient->priv->client_action);
 	gpk_client_dialog_set_title (gclient->priv->dialog, text);
-	gpk_client_dialog_set_window_title (gclient->priv->dialog, text);
 	g_free (text);
 
 	/* coldplug */

Modified: trunk/src/gpk-hardware.c
==============================================================================
--- trunk/src/gpk-hardware.c	(original)
+++ trunk/src/gpk-hardware.c	Fri Sep 26 13:57:28 2008
@@ -132,10 +132,8 @@
 	client = pk_client_new ();
 	pk_client_set_synchronous (client, TRUE, NULL);
 	pk_client_set_use_buffer (client, TRUE, NULL);
-	egg_debug ("start - trying to call pk_client_what_provides");
 	ret = pk_client_what_provides (client, pk_bitfield_value (PK_FILTER_ENUM_NOT_INSTALLED),
 				       PK_PROVIDES_ENUM_HARDWARE_DRIVER, udi, &error);
-	egg_debug ("done - trying to call pk_client_what_provides");
 	if (!ret) {
 		egg_warning ("Error calling pk_client_what_provides :%s", error->message);
 		g_error_free (error);
@@ -151,14 +149,18 @@
 		goto out;
 	}
 
+	/* only install the first one? */
 	obj = pk_package_list_get_obj (list, 0);
-	package = g_strdup_printf ("%s-%s", obj->id->name, obj->id->version);
+	package = gpk_package_id_format_oneline (obj->id, obj->summary);
+
+	/* save list */
 	if (hardware->priv->package_ids != NULL)
 		g_strfreev (hardware->priv->package_ids);
 	hardware->priv->package_ids = pk_package_list_to_strv (list);
 
-	message = g_strdup_printf ("%s%s%s", _("Do you want to install needed drivers?"), "\n\t", package);
-	body = g_strdup_printf ("%s %s", _("New hardware attached -"), udi);
+	/* TODO: tell the user what hardware, NOT JUST A UDI */
+	message = g_strdup_printf ("%s\n\t%s", _("Do you want to install needed drivers?"), package);
+	body = g_strdup_printf ("%s", _("New hardware attached"));
 	notification = notify_notification_new (body, message, "help-browser", NULL);
 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
@@ -200,6 +202,7 @@
 gpk_hardware_timeout_cb (gpointer data)
 {
 	egg_debug ("hardware timout callback");
+	/* TODO: need to coldplug for any hardware without drivers */
 	gpk_hardware_check_for_driver_available (GPK_HARDWARE (data), "unavailable");
 	return FALSE;
 }