nemo-mime-actions.c: Allow opening untrusted desktop files as

normal files.

This replaces the 'Launch anyway' option in the untrusted dialog.

Fixes #887.
Ref #2898.

Author: mtwebster

src/nemo-mime-actions.c

@@ -1305,18 +1305,21 @@ untrusted_launcher_response_callback (GtkDialog *dialog,
 				      int response_id,
 				      ActivateParametersSpecial *parameters)
 {
-	GdkScreen *screen;
-	char *uri;
 	GFile *file;
 
 	switch (response_id) {
-	case RESPONSE_RUN:
-		screen = gtk_widget_get_screen (GTK_WIDGET (parameters->parent_window));
-		uri = nemo_file_get_uri (parameters->file);
-		DEBUG ("Launching untrusted launcher %s", uri);
-		nemo_launch_desktop_file (screen, uri, NULL,
-					      parameters->parent_window);
-		g_free (uri);
+	case RESPONSE_DISPLAY:
+		{
+			GAppInfo *app;
+			app = nemo_mime_get_default_application_for_file (parameters->file);
+			if (app != NULL) {
+				GList file_list = { 0 };
+
+				file_list.data = parameters->file;
+				nemo_launch_application (app, &file_list, parameters->parent_window);
+				g_object_unref (app);
+			}
+		}
 		break;
 	case RESPONSE_MARK_TRUSTED:
 		file = nemo_file_get_location (parameters->file);
@@ -1375,7 +1378,7 @@ activate_desktop_file (ActivateParameters *parameters,
 			      NULL);
 
 		gtk_dialog_add_button (GTK_DIALOG (dialog),
-				       _("_Launch Anyway"), RESPONSE_RUN);
+				       _("_Display"), RESPONSE_DISPLAY);
 		if (nemo_file_can_set_permissions (file)) {
 			gtk_dialog_add_button (GTK_DIALOG (dialog),
 					       _("Mark as _Trusted"), RESPONSE_MARK_TRUSTED);