Attachment 302967 Details for Bug 443085 – a patch

[patch] a patch

gnome-panel-launch-with-gio.patch (text/plain), 6.94 KB, created by Matthias Clasen on 2008-04-19 05:17:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Clasen

Created: 2008-04-19 05:17:41 UTC

Size: 6.94 KB

patch

obsolete

>diff -up gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.lauch-with-gio gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c
>--- gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c.lauch-with-gio	2008-04-19 01:14:35.000000000 -0400
>+++ gnome-panel-2.22.1.2/gnome-panel/panel-menu-items.c	2008-04-19 01:14:41.000000000 -0400
>@@ -41,6 +41,7 @@
> 
> #include <libgnome/gnome-url.h>
> #include <libgnomeui/gnome-url.h>
>+#include <libgnomeui/gnome-password-dialog.h>
> 
> #include "menu.h"
> #include "panel-action-button.h"
>@@ -96,6 +97,182 @@ struct _PanelDesktopMenuItemPrivate {
> 	guint        append_lock_logout : 1;
> };
> 
>+typedef struct {
>+	GMountOperation *mount_op;
>+	GdkScreen *screen;
>+} MountOperationHandle;
>+
>+/* GMountOperation callbacks */
>+static void
>+mount_op_ask_password (GMountOperation *op,
>+		       const char      *message,
>+		       const char      *default_user,
>+		       const char      *default_domain,
>+		       GAskPasswordFlags flags)
>+{
>+	GtkWidget *dialog;
>+	char *username, *domain, *password;
>+	gboolean anon;
>+	int res;
>+
>+	gdk_threads_enter ();
>+
>+	dialog = gnome_password_dialog_new (_("Enter Password"),
>+					    message,
>+					    default_user,
>+					    "",
>+					    FALSE);
>+	gnome_password_dialog_set_show_password (GNOME_PASSWORD_DIALOG (dialog),
>+						 flags & G_ASK_PASSWORD_NEED_PASSWORD);
>+
>+	gnome_password_dialog_set_show_username (GNOME_PASSWORD_DIALOG (dialog),
>+						 flags & G_ASK_PASSWORD_NEED_USERNAME);
>+	gnome_password_dialog_set_show_domain (GNOME_PASSWORD_DIALOG (dialog),
>+					       flags & G_ASK_PASSWORD_NEED_DOMAIN);
>+	gnome_password_dialog_set_show_userpass_buttons (GNOME_PASSWORD_DIALOG (dialog),
>+							 flags & G_ASK_PASSWORD_ANONYMOUS_SUPPORTED);
>+	gnome_password_dialog_set_show_remember (GNOME_PASSWORD_DIALOG (dialog),
>+						 flags & G_ASK_PASSWORD_SAVING_SUPPORTED);
>+
>+	if (default_domain) {
>+		gnome_password_dialog_set_domain (GNOME_PASSWORD_DIALOG (dialog),
>+						  default_domain);
>+	}
>+
>+	res = gtk_dialog_run (GTK_DIALOG (dialog));
>+	if (res == GTK_RESPONSE_OK) {
>+		username = gnome_password_dialog_get_username (GNOME_PASSWORD_DIALOG (dialog));
>+		if (username) {
>+			g_mount_operation_set_username (op, username);
>+			g_free (username);
>+		}
>+
>+		domain = gnome_password_dialog_get_domain (GNOME_PASSWORD_DIALOG (dialog));
>+		if (domain) {
>+			g_mount_operation_set_domain (op, domain);
>+			g_free (domain);
>+		}
>+		password = gnome_password_dialog_get_password (GNOME_PASSWORD_DIALOG (dialog));
>+		if (password) {
>+			g_mount_operation_set_password (op, password);
>+			g_free (password);
>+		}
>+
>+		anon = gnome_password_dialog_anon_selected (GNOME_PASSWORD_DIALOG (dialog));
>+		g_mount_operation_set_anonymous (op, anon);
>+
>+		switch (gnome_password_dialog_get_remember (GNOME_PASSWORD_DIALOG (dialog))) {
>+		case GNOME_PASSWORD_DIALOG_REMEMBER_NOTHING:
>+			g_mount_operation_set_password_save (op, G_PASSWORD_SAVE_NEVER);
>+			break;
>+		case GNOME_PASSWORD_DIALOG_REMEMBER_SESSION:
>+			g_mount_operation_set_password_save (op, G_PASSWORD_SAVE_FOR_SESSION);
>+			break;
>+		case GNOME_PASSWORD_DIALOG_REMEMBER_FOREVER:
>+			g_mount_operation_set_password_save (op, G_PASSWORD_SAVE_PERMANENTLY);
>+			break;
>+		}
>+
>+		g_mount_operation_reply (op, G_MOUNT_OPERATION_HANDLED);
>+	} else {
>+		g_mount_operation_reply (op, G_MOUNT_OPERATION_ABORTED);
>+	}
>+
>+	gtk_widget_destroy (GTK_WIDGET (dialog));
>+
>+	gdk_threads_leave ();
>+}
>+
>+static void
>+mount_op_ask_question (GMountOperation *op,
>+		       const char      *message,
>+		       const char      *choices[])
>+{
>+	GtkWidget *dialog;
>+	int cnt, len;
>+	char *primary;
>+	const char *secondary = NULL;
>+	int res;
>+
>+	primary = strstr (message, "\n");
>+	if (primary) {
>+		secondary = primary + 1;
>+		primary = g_strndup (message, strlen (message) - strlen (primary));
>+	}
>+
>+	gdk_threads_enter ();
>+	dialog = gtk_message_dialog_new (NULL,
>+					 0, GTK_MESSAGE_QUESTION,
>+					 GTK_BUTTONS_NONE, "%s", primary);
>+	g_free (primary);
>+	if (secondary) {
>+		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
>+							  "%s", secondary);
>+	}
>+
>+	if (choices) {
>+		/* First count the items in the list then 
>+		 * add the buttons in reverse order */
>+		for (len = 0; choices[len] != NULL; len++) {
>+			;
>+		}
>+
>+		for (cnt = len - 1; cnt >= 0; cnt--) {
>+			gtk_dialog_add_button (GTK_DIALOG (dialog), choices[cnt], cnt);
>+		}
>+	}
>+
>+	res = gtk_dialog_run (GTK_DIALOG (dialog));
>+	if (res >= 0) {
>+		g_mount_operation_set_choice (op, res);
>+		g_mount_operation_reply (op, G_MOUNT_OPERATION_HANDLED);
>+	} else {
>+		g_mount_operation_reply (op, G_MOUNT_OPERATION_ABORTED);
>+	}
>+
>+	gtk_widget_destroy (GTK_WIDGET (dialog));
>+	gdk_threads_leave ();
>+}
>+
>+static void
>+mount_async_callback (GObject      *source_object,
>+		      GAsyncResult *result,
>+		      gpointer      user_data)
>+{
>+	GError *error = NULL;
>+	GFile *file;
>+	MountOperationHandle *handle = user_data;
>+
>+	file = G_FILE (source_object);
>+	if (g_file_mount_enclosing_volume_finish (file, result, &error)) {
>+		char *uri = g_file_get_uri (file);
>+		// FIXME use an app launch context
>+		g_app_info_launch_default_for_uri (uri, NULL, &error);
>+		g_free (uri);
>+	}
>+	else {
>+		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) {
>+			char *primary, *escaped, *url;
>+			url = g_file_get_uri (file);
>+			escaped = g_markup_escape_text (url, -1);
>+			g_free (url);
>+			primary = g_strdup_printf (_("Could not open location '%s'"),
>+						   escaped);
>+			g_free (escaped);
>+			panel_error_dialog (NULL, handle->screen,
>+					    "cannot_show_url", TRUE,
>+			primary, error->message);
>+			g_free (primary);
>+		}
>+		g_error_free (error);
>+	}
>+
>+	if (handle->mount_op)
>+		g_object_unref (handle->mount_op);
>+
>+	g_free (handle);
>+}
>+
> static void
> activate_uri (GtkWidget  *menuitem,
> 	      const char *path)
>@@ -125,12 +302,32 @@ activate_uri (GtkWidget  *menuitem,
> 
> 		command = g_strdup_printf ("nautilus --no-desktop %s", url);
> 		gdk_spawn_command_line_on_screen (screen, command, &error);
>-	} else 
>+	} else {
>+		// FIXME use an app launch context
> 		g_app_info_launch_default_for_uri (url, NULL, &error);
>-		//gnome_url_show_on_screen (url, screen, &error);
>+	}
> 
> 	if (error != NULL) {
>-		if (error->code != GNOME_URL_ERROR_CANCELLED) {
>+		if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_MOUNTED)) {
>+			MountOperationHandle *handle;
>+
>+			handle = g_new (MountOperationHandle, 1);
>+			file = g_file_new_for_uri (url);
>+
>+			/* If it's not mounted, try to mount it ourselves */
>+			handle->mount_op = g_mount_operation_new ();
>+			handle->screen = screen;
>+			g_signal_connect (handle->mount_op, "ask-password",
>+					G_CALLBACK (mount_op_ask_password), handle);
>+			g_signal_connect (handle->mount_op, "ask-question",
>+					  G_CALLBACK (mount_op_ask_question), handle);
>+
>+			g_file_mount_enclosing_volume (file, G_MOUNT_MOUNT_NONE, handle->mount_op,
>+						       NULL, mount_async_callback, handle);
>+			g_object_unref (file);
>+		
>+}
>+		else {
> 			char *primary;
> 			escaped = g_markup_escape_text (url, -1);
> 			primary = g_strdup_printf (_("Could not open location '%s'"),

Actions: View | Diff

Attachments on bug 443085: 302967 | 303096