nautilus r14810 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Thu Dec 11 18:08:16 2008
New Revision: 14810
URL: http://svn.gnome.org/viewvc/nautilus?rev=14810&view=rev

Log:
2008-12-11  Alexander Larsson  <alexl redhat com>

        * libnautilus-private/nautilus-mime-actions.c:
        (search_for_application_dbus_call_notify_cb):
	Don't warn if we found no applications to install.
	



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-mime-actions.c

Modified: trunk/libnautilus-private/nautilus-mime-actions.c
==============================================================================
--- trunk/libnautilus-private/nautilus-mime-actions.c	(original)
+++ trunk/libnautilus-private/nautilus-mime-actions.c	Thu Dec 11 18:08:16 2008
@@ -1054,12 +1054,19 @@
 {
 	gboolean ret;
 	GError *error = NULL;
+	const char *remote = NULL;
 
 	ret = dbus_g_proxy_end_call (proxy, call, &error, G_TYPE_INVALID);
 	if (!ret) {
-		eel_show_error_dialog (_("Unable to search for application"),
-				       _("There was an internal error trying to search for applications"),
-				       parameters_install->parent_window);
+		if (error->domain == DBUS_GERROR && error->code == DBUS_GERROR_REMOTE_EXCEPTION) {
+			remote = dbus_g_error_get_name (error);
+		}
+		/* we already show an error in the installer if not found, just catch generic failure */
+		if (remote == NULL || strcmp (remote, "org.freedesktop.PackageKit.Failed") == 0) {
+			eel_show_error_dialog (_("Unable to search for application"),
+					       _("There was an internal error trying to search for applications"),
+					       parameters_install->parent_window);
+		}
 		g_error_free (error);
 		return;
 	}