X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmountoperation.c;h=ed9178ae07c582bc0b0a07706816eedf57e75f4e;hb=9f41970832b60f3cf6644dfbd154df7ec24f26ce;hp=add46e85bd6e7834ad0e2f4c2db7a1239a4a9dbb;hpb=4227351c441b392cd54dee671e25760f4986dcc3;p=~andy%2Fgtk
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index add46e85b..ed9178ae0 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -13,9 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
/*
@@ -29,43 +27,53 @@
#include
-#include "gtkalignment.h"
+#include "gtkmountoperationprivate.h"
#include "gtkbox.h"
+#include "gtkdbusgenerated.h"
#include "gtkentry.h"
-#include "gtkhbox.h"
+#include "gtkbox.h"
#include "gtkintl.h"
#include "gtklabel.h"
-#include "gtkvbox.h"
#include "gtkmessagedialog.h"
-#include "gtkmisc.h"
#include "gtkmountoperation.h"
#include "gtkprivate.h"
#include "gtkradiobutton.h"
#include "gtkstock.h"
-#include "gtktable.h"
+#include "gtkgrid.h"
#include "gtkwindow.h"
-#include "gtkalias.h"
+#include "gtktreeview.h"
+#include "gtktreeselection.h"
+#include "gtkcellrenderertext.h"
+#include "gtkcellrendererpixbuf.h"
+#include "gtkscrolledwindow.h"
+#include "gtkicontheme.h"
+#include "gtkimagemenuitem.h"
+#include "gtkmain.h"
+
+#include
/**
* SECTION:filesystem
* @short_description: Functions for working with GIO
+ * @Title: Filesystem utilities
*
* The functions and objects described here make working with GTK+ and
- * GIO more convenient. #GtkMountOperation is needed when mounting volumes
- * and gtk_show_uri() is a convenient way to launch applications for URIs.
- * Another object that is worth mentioning in this context is
- * #GdkAppLaunchContext, which provides visual feedback when lauching
- * applications.
- */
-
-/**
- * GtkMountOperation:
+ * GIO more convenient.
*
- * #GtkMountOperation is an implementation of #GMountOperation that
- * can be used with GIO functions for mounting volumes such as
- * g_file_mount_enclosing_volume() or g_file_mount_mountable().
+ * #GtkMountOperation is needed when mounting volumes:
+ * It is an implementation of #GMountOperation that can be used with
+ * GIO functions for mounting volumes such as
+ * g_file_mount_enclosing_volume(), g_file_mount_mountable(),
+ * g_volume_mount(), g_mount_unmount_with_operation() and others.
*
- * When necessary, #GtkMountOperation shows dialogs to ask for passwords.
+ * When necessary, #GtkMountOperation shows dialogs to ask for
+ * passwords, questions or show processes blocking unmount.
+ *
+ * gtk_show_uri() is a convenient way to launch applications for URIs.
+ *
+ * Another object that is worth mentioning in this context is
+ * #GdkAppLaunchContext, which provides visual feedback when lauching
+ * applications.
*/
static void gtk_mount_operation_finalize (GObject *object);
@@ -88,6 +96,11 @@ static void gtk_mount_operation_ask_question (GMountOperation *op,
const char *message,
const char *choices[]);
+static void gtk_mount_operation_show_processes (GMountOperation *op,
+ const char *message,
+ GArray *processes,
+ const char *choices[]);
+
static void gtk_mount_operation_aborted (GMountOperation *op);
G_DEFINE_TYPE (GtkMountOperation, gtk_mount_operation, G_TYPE_MOUNT_OPERATION);
@@ -105,16 +118,26 @@ struct _GtkMountOperationPrivate {
GtkDialog *dialog;
GdkScreen *screen;
+ /* bus proxy */
+ _GtkMountOperationHandler *handler;
+ GCancellable *cancellable;
+ gboolean handler_showing;
+
/* for the ask-password dialog */
- GtkWidget *entry_container;
+ GtkWidget *grid;
GtkWidget *username_entry;
GtkWidget *domain_entry;
GtkWidget *password_entry;
GtkWidget *anonymous_toggle;
+ GList *user_widgets;
GAskPasswordFlags ask_flags;
GPasswordSave password_save;
gboolean anonymous;
+
+ /* for the show-processes dialog */
+ GtkWidget *process_tree_view;
+ GtkListStore *process_list_store;
};
static void
@@ -131,6 +154,7 @@ gtk_mount_operation_class_init (GtkMountOperationClass *klass)
mount_op_class->ask_password = gtk_mount_operation_ask_password;
mount_op_class->ask_question = gtk_mount_operation_ask_question;
+ mount_op_class->show_processes = gtk_mount_operation_show_processes;
mount_op_class->aborted = gtk_mount_operation_aborted;
g_object_class_install_property (object_class,
@@ -161,9 +185,25 @@ gtk_mount_operation_class_init (GtkMountOperationClass *klass)
static void
gtk_mount_operation_init (GtkMountOperation *operation)
{
+ gchar *name_owner;
+
operation->priv = G_TYPE_INSTANCE_GET_PRIVATE (operation,
GTK_TYPE_MOUNT_OPERATION,
GtkMountOperationPrivate);
+
+ operation->priv->handler =
+ _gtk_mount_operation_handler_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+ "org.gtk.MountOperationHandler",
+ "/org/gtk/MountOperationHandler",
+ NULL, NULL);
+ name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (operation->priv->handler));
+ if (!name_owner)
+ g_clear_object (&operation->priv->handler);
+ g_free (name_owner);
+
+ if (operation->priv->handler)
+ g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (operation->priv->handler), G_MAXINT);
}
static void
@@ -172,12 +212,18 @@ gtk_mount_operation_finalize (GObject *object)
GtkMountOperation *operation = GTK_MOUNT_OPERATION (object);
GtkMountOperationPrivate *priv = operation->priv;
+ if (priv->user_widgets)
+ g_list_free (priv->user_widgets);
+
if (priv->parent_window)
g_object_unref (priv->parent_window);
if (priv->screen)
g_object_unref (priv->screen);
+ if (priv->handler)
+ g_object_unref (priv->handler);
+
G_OBJECT_CLASS (gtk_mount_operation_parent_class)->finalize (object);
}
@@ -222,7 +268,7 @@ gtk_mount_operation_get_property (GObject *object,
break;
case PROP_IS_SHOWING:
- g_value_set_boolean (value, priv->dialog != NULL);
+ g_value_set_boolean (value, priv->dialog != NULL || priv->handler_showing);
break;
case PROP_SCREEN:
@@ -235,6 +281,21 @@ gtk_mount_operation_get_property (GObject *object,
}
}
+static void
+gtk_mount_operation_proxy_finish (GtkMountOperation *op,
+ GMountOperationResult result)
+{
+ _gtk_mount_operation_handler_call_close (op->priv->handler, NULL, NULL, NULL);
+
+ op->priv->handler_showing = FALSE;
+ g_object_notify (G_OBJECT (op), "is-showing");
+
+ g_mount_operation_reply (G_MOUNT_OPERATION (op), result);
+
+ /* drop the reference acquired when calling the proxy method */
+ g_object_unref (op);
+}
+
static void
remember_button_toggled (GtkToggleButton *button,
GtkMountOperation *operation)
@@ -316,9 +377,14 @@ pw_dialog_input_is_valid (GtkMountOperation *operation)
GtkMountOperationPrivate *priv = operation->priv;
gboolean is_valid = TRUE;
+ /* We don't require password to be non-empty here
+ * since there are situations where it is not needed,
+ * see bug 578365.
+ * We may add a way for the backend to specify that it
+ * definitively needs a password.
+ */
is_valid = entry_has_input (priv->username_entry) &&
- entry_has_input (priv->domain_entry) &&
- entry_has_input (priv->password_entry);
+ entry_has_input (priv->domain_entry);
return is_valid;
}
@@ -342,6 +408,7 @@ pw_dialog_anonymous_toggled (GtkWidget *widget,
{
GtkMountOperationPrivate *priv = operation->priv;
gboolean is_valid;
+ GList *l;
priv->anonymous = widget == priv->anonymous_toggle;
@@ -350,7 +417,11 @@ pw_dialog_anonymous_toggled (GtkWidget *widget,
else
is_valid = pw_dialog_input_is_valid (operation);
- gtk_widget_set_sensitive (priv->entry_container, priv->anonymous == FALSE);
+ for (l = priv->user_widgets; l != NULL; l = l->next)
+ {
+ gtk_widget_set_sensitive (GTK_WIDGET (l->data), !priv->anonymous);
+ }
+
gtk_dialog_set_response_sensitive (GTK_DIALOG (priv->dialog),
GTK_RESPONSE_OK,
is_valid);
@@ -383,29 +454,31 @@ pw_dialog_cycle_focus (GtkWidget *widget,
}
static GtkWidget *
-table_add_entry (GtkWidget *table,
- int row,
- const char *label_text,
- const char *value,
- gpointer user_data)
+table_add_entry (GtkMountOperation *operation,
+ int row,
+ const char *label_text,
+ const char *value,
+ gpointer user_data)
{
GtkWidget *entry;
GtkWidget *label;
label = gtk_label_new_with_mnemonic (label_text);
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_widget_set_halign (label, GTK_ALIGN_END);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_widget_set_hexpand (label, FALSE);
+ operation->priv->user_widgets = g_list_prepend (operation->priv->user_widgets, label);
entry = gtk_entry_new ();
+ gtk_widget_set_hexpand (entry, TRUE);
if (value)
gtk_entry_set_text (GTK_ENTRY (entry), value);
- gtk_table_attach (GTK_TABLE (table), label,
- 0, 1, row, row + 1,
- GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
- gtk_table_attach_defaults (GTK_TABLE (table), entry,
- 1, 2, row, row + 1);
+ gtk_grid_attach (GTK_GRID (operation->priv->grid), label, 0, row, 1, 1);
+ gtk_grid_attach (GTK_GRID (operation->priv->grid), entry, 1, row, 1, 1);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
+ operation->priv->user_widgets = g_list_prepend (operation->priv->user_widgets, entry);
g_signal_connect (entry, "changed",
G_CALLBACK (pw_dialog_verify_input), user_data);
@@ -417,42 +490,41 @@ table_add_entry (GtkWidget *table,
}
static void
-gtk_mount_operation_ask_password (GMountOperation *mount_op,
- const char *message,
- const char *default_user,
- const char *default_domain,
- GAskPasswordFlags flags)
+gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
+ const gchar *message,
+ const gchar *default_user,
+ const gchar *default_domain)
{
- GtkMountOperation *operation;
GtkMountOperationPrivate *priv;
GtkWidget *widget;
GtkDialog *dialog;
GtkWindow *window;
- GtkWidget *entry_container;
- GtkWidget *hbox, *main_vbox, *vbox, *icon;
- GtkWidget *table;
- GtkWidget *message_label;
+ GtkWidget *hbox, *main_vbox, *icon;
+ GtkWidget *grid;
+ GtkWidget *label;
+ GtkWidget *content_area, *action_area;
gboolean can_anonymous;
guint rows;
+ gchar *primary;
const gchar *secondary;
+ PangoAttrList *attrs;
- operation = GTK_MOUNT_OPERATION (mount_op);
priv = operation->priv;
- priv->ask_flags = flags;
-
widget = gtk_dialog_new ();
dialog = GTK_DIALOG (widget);
window = GTK_WINDOW (widget);
priv->dialog = dialog;
+ content_area = gtk_dialog_get_content_area (dialog);
+ action_area = gtk_dialog_get_action_area (dialog);
+
/* Set the dialog up with HIG properties */
- gtk_dialog_set_has_separator (dialog, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
- gtk_box_set_spacing (GTK_BOX (dialog->vbox), 2); /* 2 * 5 + 2 = 12 */
- gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 5);
- gtk_box_set_spacing (GTK_BOX (dialog->action_area), 6);
+ gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
+ gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
+ gtk_box_set_spacing (GTK_BOX (action_area), 6);
gtk_window_set_resizable (window, FALSE);
gtk_window_set_title (window, "");
@@ -470,51 +542,62 @@ gtk_mount_operation_ask_password (GMountOperation *mount_op,
-1);
/* Build contents */
- hbox = gtk_hbox_new (FALSE, 12);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- gtk_box_pack_start (GTK_BOX (dialog->vbox), hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_AUTHENTICATION,
GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0.0);
+ gtk_widget_set_halign (icon, GTK_ALIGN_CENTER);
+ gtk_widget_set_valign (icon, GTK_ALIGN_START);
gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
- main_vbox = gtk_vbox_new (FALSE, 18);
+ main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18);
gtk_box_pack_start (GTK_BOX (hbox), main_vbox, TRUE, TRUE, 0);
secondary = strstr (message, "\n");
if (secondary != NULL)
{
- gchar *s;
- gchar *primary;
-
primary = g_strndup (message, secondary - message + 1);
- s = g_strdup_printf ("%s%s", primary, secondary);
-
- message_label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (message_label), s);
- gtk_misc_set_alignment (GTK_MISC (message_label), 0.0, 0.5);
- gtk_label_set_line_wrap (GTK_LABEL (message_label), TRUE);
- gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (message_label),
- FALSE, TRUE, 0);
-
- g_free (s);
- g_free (primary);
}
else
{
- message_label = gtk_label_new (message);
- gtk_misc_set_alignment (GTK_MISC (message_label), 0.0, 0.5);
- gtk_label_set_line_wrap (GTK_LABEL (message_label), TRUE);
- gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (message_label),
+ primary = g_strdup (message);
+ }
+
+ label = gtk_label_new (primary);
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (label),
+ FALSE, TRUE, 0);
+ g_free (primary);
+ attrs = pango_attr_list_new ();
+ pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
+ gtk_label_set_attributes (GTK_LABEL (label), attrs);
+ pango_attr_list_unref (attrs);
+
+ if (secondary != NULL)
+ {
+ label = gtk_label_new (secondary);
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+ gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (label),
FALSE, FALSE, 0);
}
- vbox = gtk_vbox_new (FALSE, 6);
- gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
+ grid = gtk_grid_new ();
+ operation->priv->grid = grid;
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
+ gtk_widget_set_margin_bottom (grid, 12);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+
+ can_anonymous = priv->ask_flags & G_ASK_PASSWORD_ANONYMOUS_SUPPORTED;
- can_anonymous = flags & G_ASK_PASSWORD_ANONYMOUS_SUPPORTED;
+ rows = 0;
priv->anonymous_toggle = NULL;
if (can_anonymous)
@@ -523,11 +606,16 @@ gtk_mount_operation_ask_password (GMountOperation *mount_op,
GtkWidget *choice;
GSList *group;
- anon_box = gtk_vbox_new (FALSE, 6);
- gtk_box_pack_start (GTK_BOX (vbox), anon_box,
- FALSE, FALSE, 0);
+ label = gtk_label_new (_("Connect As"));
+ gtk_widget_set_halign (label, GTK_ALIGN_END);
+ gtk_widget_set_valign (label, GTK_ALIGN_START);
+ gtk_widget_set_hexpand (label, FALSE);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, rows, 1, 1);
+
+ anon_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_grid_attach (GTK_GRID (grid), anon_box, 1, rows++, 1, 1);
- choice = gtk_radio_button_new_with_mnemonic (NULL, _("Connect _anonymously"));
+ choice = gtk_radio_button_new_with_mnemonic (NULL, _("_Anonymous"));
gtk_box_pack_start (GTK_BOX (anon_box),
choice,
FALSE, FALSE, 0);
@@ -536,7 +624,7 @@ gtk_mount_operation_ask_password (GMountOperation *mount_op,
priv->anonymous_toggle = choice;
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (choice));
- choice = gtk_radio_button_new_with_mnemonic (group, _("Connect as u_ser:"));
+ choice = gtk_radio_button_new_with_mnemonic (group, _("Registered U_ser"));
gtk_box_pack_start (GTK_BOX (anon_box),
choice,
FALSE, FALSE, 0);
@@ -544,65 +632,42 @@ gtk_mount_operation_ask_password (GMountOperation *mount_op,
G_CALLBACK (pw_dialog_anonymous_toggled), operation);
}
- rows = 0;
-
- if (flags & G_ASK_PASSWORD_NEED_PASSWORD)
- rows++;
-
- if (flags & G_ASK_PASSWORD_NEED_USERNAME)
- rows++;
-
- if (flags &G_ASK_PASSWORD_NEED_DOMAIN)
- rows++;
-
- /* The table that holds the entries */
- entry_container = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
-
- gtk_alignment_set_padding (GTK_ALIGNMENT (entry_container),
- 0, 0, can_anonymous ? 12 : 0, 0);
-
- gtk_box_pack_start (GTK_BOX (vbox), entry_container,
- FALSE, FALSE, 0);
- priv->entry_container = entry_container;
-
- table = gtk_table_new (rows, 2, FALSE);
- gtk_table_set_col_spacings (GTK_TABLE (table), 12);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_container_add (GTK_CONTAINER (entry_container), table);
-
- rows = 0;
-
priv->username_entry = NULL;
- if (flags & G_ASK_PASSWORD_NEED_USERNAME)
- priv->username_entry = table_add_entry (table, rows++, _("_Username:"),
+
+ if (priv->ask_flags & G_ASK_PASSWORD_NEED_USERNAME)
+ priv->username_entry = table_add_entry (operation, rows++, _("_Username"),
default_user, operation);
priv->domain_entry = NULL;
- if (flags & G_ASK_PASSWORD_NEED_DOMAIN)
- priv->domain_entry = table_add_entry (table, rows++, _("_Domain:"),
+ if (priv->ask_flags & G_ASK_PASSWORD_NEED_DOMAIN)
+ priv->domain_entry = table_add_entry (operation, rows++, _("_Domain"),
default_domain, operation);
priv->password_entry = NULL;
- if (flags & G_ASK_PASSWORD_NEED_PASSWORD)
+ if (priv->ask_flags & G_ASK_PASSWORD_NEED_PASSWORD)
{
- priv->password_entry = table_add_entry (table, rows++, _("_Password:"),
+ priv->password_entry = table_add_entry (operation, rows++, _("_Password"),
NULL, operation);
gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry), FALSE);
}
- if (flags & G_ASK_PASSWORD_SAVING_SUPPORTED)
+ if (priv->ask_flags & G_ASK_PASSWORD_SAVING_SUPPORTED)
{
- GtkWidget *choice;
GtkWidget *remember_box;
+ GtkWidget *choice;
GSList *group;
GPasswordSave password_save;
- remember_box = gtk_vbox_new (FALSE, 6);
- gtk_box_pack_start (GTK_BOX (vbox), remember_box,
- FALSE, FALSE, 0);
+ remember_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_grid_attach (GTK_GRID (grid), remember_box, 0, rows++, 2, 1);
+ priv->user_widgets = g_list_prepend (priv->user_widgets, remember_box);
+
+ label = gtk_label_new ("");
+ gtk_container_add (GTK_CONTAINER (remember_box), label);
+
+ password_save = g_mount_operation_get_password_save (G_MOUNT_OPERATION (operation));
+ priv->password_save = password_save;
- password_save = g_mount_operation_get_password_save (mount_op);
-
choice = gtk_radio_button_new_with_mnemonic (NULL, _("Forget password _immediately"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (choice),
password_save == G_PASSWORD_SAVE_NEVER);
@@ -661,6 +726,92 @@ gtk_mount_operation_ask_password (GMountOperation *mount_op,
g_object_ref (operation);
}
+static void
+call_password_proxy_cb (GObject *source,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ _GtkMountOperationHandler *proxy = _GTK_MOUNT_OPERATION_HANDLER (source);
+ GMountOperation *op = user_data;
+ GMountOperationResult result;
+ GVariant *result_details;
+ GVariantIter iter;
+ const gchar *key;
+ GVariant *value;
+ GError *error = NULL;
+
+ if (!_gtk_mount_operation_handler_call_ask_password_finish (proxy,
+ &result,
+ &result_details,
+ res,
+ &error))
+ {
+ result = G_MOUNT_OPERATION_ABORTED;
+ g_warning ("Shell mount operation error: %s\n", error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ g_variant_iter_init (&iter, result_details);
+ while (g_variant_iter_loop (&iter, "{&sv}", &key, &value))
+ {
+ if (strcmp (key, "password") == 0)
+ g_mount_operation_set_password (op, g_variant_get_string (value, NULL));
+ else if (strcmp (key, "password_save") == 0)
+ g_mount_operation_set_password_save (op, g_variant_get_uint32 (value));
+ }
+
+ out:
+ gtk_mount_operation_proxy_finish (GTK_MOUNT_OPERATION (op), result);
+}
+
+static void
+gtk_mount_operation_ask_password_do_proxy (GtkMountOperation *operation,
+ const char *message,
+ const char *default_user,
+ const char *default_domain)
+{
+ gchar id[255];
+ g_sprintf(id, "GtkMountOperation%p", operation);
+
+ operation->priv->handler_showing = TRUE;
+ g_object_notify (G_OBJECT (operation), "is-showing");
+
+ /* keep a ref to the operation while the handler is showing */
+ g_object_ref (operation);
+
+ _gtk_mount_operation_handler_call_ask_password (operation->priv->handler, id,
+ message, "drive-harddisk",
+ default_user, default_domain,
+ operation->priv->ask_flags, NULL,
+ call_password_proxy_cb, operation);
+}
+
+static void
+gtk_mount_operation_ask_password (GMountOperation *mount_op,
+ const char *message,
+ const char *default_user,
+ const char *default_domain,
+ GAskPasswordFlags flags)
+{
+ GtkMountOperation *operation;
+ GtkMountOperationPrivate *priv;
+ gboolean use_gtk;
+
+ operation = GTK_MOUNT_OPERATION (mount_op);
+ priv = operation->priv;
+ priv->ask_flags = flags;
+
+ use_gtk = (operation->priv->handler == NULL) ||
+ (priv->ask_flags & G_ASK_PASSWORD_NEED_DOMAIN) ||
+ (priv->ask_flags & G_ASK_PASSWORD_NEED_USERNAME);
+
+ if (use_gtk)
+ gtk_mount_operation_ask_password_do_gtk (operation, message, default_user, default_domain);
+ else
+ gtk_mount_operation_ask_password_do_proxy (operation, message, default_user, default_domain);
+}
+
static void
question_dialog_button_clicked (GtkDialog *dialog,
gint button_number,
@@ -687,9 +838,9 @@ question_dialog_button_clicked (GtkDialog *dialog,
}
static void
-gtk_mount_operation_ask_question (GMountOperation *op,
- const char *message,
- const char *choices[])
+gtk_mount_operation_ask_question_do_gtk (GtkMountOperation *op,
+ const char *message,
+ const char *choices[])
{
GtkMountOperationPrivate *priv;
GtkWidget *dialog;
@@ -701,7 +852,7 @@ gtk_mount_operation_ask_question (GMountOperation *op,
g_return_if_fail (message != NULL);
g_return_if_fail (choices != NULL);
- priv = GTK_MOUNT_OPERATION (op)->priv;
+ priv = op->priv;
primary = strstr (message, "\n");
if (primary)
@@ -742,6 +893,744 @@ gtk_mount_operation_ask_question (GMountOperation *op,
g_object_ref (op);
}
+static void
+call_question_proxy_cb (GObject *source,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ _GtkMountOperationHandler *proxy = _GTK_MOUNT_OPERATION_HANDLER (source);
+ GMountOperation *op = user_data;
+ GMountOperationResult result;
+ GVariant *result_details;
+ GVariantIter iter;
+ const gchar *key;
+ GVariant *value;
+ GError *error = NULL;
+
+ if (!_gtk_mount_operation_handler_call_ask_question_finish (proxy,
+ &result,
+ &result_details,
+ res,
+ &error))
+ {
+ result = G_MOUNT_OPERATION_ABORTED;
+ g_warning ("Shell mount operation error: %s\n", error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ g_variant_iter_init (&iter, result_details);
+ while (g_variant_iter_loop (&iter, "{&sv}", &key, &value))
+ {
+ if (strcmp (key, "choice") == 0)
+ g_mount_operation_set_choice (op, g_variant_get_int32 (value));
+ }
+
+ out:
+ gtk_mount_operation_proxy_finish (GTK_MOUNT_OPERATION (op), result);
+}
+
+static void
+gtk_mount_operation_ask_question_do_proxy (GtkMountOperation *operation,
+ const char *message,
+ const char *choices[])
+{
+ gchar id[255];
+ g_sprintf(id, "GtkMountOperation%p", operation);
+
+ operation->priv->handler_showing = TRUE;
+ g_object_notify (G_OBJECT (operation), "is-showing");
+
+ /* keep a ref to the operation while the handler is showing */
+ g_object_ref (operation);
+
+ _gtk_mount_operation_handler_call_ask_question (operation->priv->handler, id,
+ message, "drive-harddisk",
+ choices, NULL,
+ call_question_proxy_cb, operation);
+}
+
+static void
+gtk_mount_operation_ask_question (GMountOperation *op,
+ const char *message,
+ const char *choices[])
+{
+ GtkMountOperation *operation;
+ gboolean use_gtk;
+
+ operation = GTK_MOUNT_OPERATION (op);
+ use_gtk = (operation->priv->handler == NULL);
+
+ if (use_gtk)
+ gtk_mount_operation_ask_question_do_gtk (operation, message, choices);
+ else
+ gtk_mount_operation_ask_question_do_proxy (operation, message, choices);
+}
+
+static void
+show_processes_button_clicked (GtkDialog *dialog,
+ gint button_number,
+ GMountOperation *op)
+{
+ GtkMountOperationPrivate *priv;
+ GtkMountOperation *operation;
+
+ operation = GTK_MOUNT_OPERATION (op);
+ priv = operation->priv;
+
+ if (button_number >= 0)
+ {
+ g_mount_operation_set_choice (op, button_number);
+ g_mount_operation_reply (op, G_MOUNT_OPERATION_HANDLED);
+ }
+ else
+ g_mount_operation_reply (op, G_MOUNT_OPERATION_ABORTED);
+
+ priv->dialog = NULL;
+ g_object_notify (G_OBJECT (operation), "is-showing");
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+ g_object_unref (op);
+}
+
+static gint
+pid_equal (gconstpointer a,
+ gconstpointer b)
+{
+ GPid pa, pb;
+
+ pa = *((GPid *) a);
+ pb = *((GPid *) b);
+
+ return GPOINTER_TO_INT(pb) - GPOINTER_TO_INT(pa);
+}
+
+static void
+diff_sorted_arrays (GArray *array1,
+ GArray *array2,
+ GCompareFunc compare,
+ GArray *added_indices,
+ GArray *removed_indices)
+{
+ gint order;
+ guint n1, n2;
+ guint elem_size;
+
+ n1 = n2 = 0;
+
+ elem_size = g_array_get_element_size (array1);
+ g_assert (elem_size == g_array_get_element_size (array2));
+
+ while (n1 < array1->len && n2 < array2->len)
+ {
+ order = (*compare) (((const char*) array1->data) + n1 * elem_size,
+ ((const char*) array2->data) + n2 * elem_size);
+ if (order < 0)
+ {
+ g_array_append_val (removed_indices, n1);
+ n1++;
+ }
+ else if (order > 0)
+ {
+ g_array_append_val (added_indices, n2);
+ n2++;
+ }
+ else
+ { /* same item */
+ n1++;
+ n2++;
+ }
+ }
+
+ while (n1 < array1->len)
+ {
+ g_array_append_val (removed_indices, n1);
+ n1++;
+ }
+ while (n2 < array2->len)
+ {
+ g_array_append_val (added_indices, n2);
+ n2++;
+ }
+}
+
+
+static void
+add_pid_to_process_list_store (GtkMountOperation *mount_operation,
+ GtkMountOperationLookupContext *lookup_context,
+ GtkListStore *list_store,
+ GPid pid)
+{
+ gchar *command_line;
+ gchar *name;
+ GdkPixbuf *pixbuf;
+ gchar *markup;
+ GtkTreeIter iter;
+
+ name = NULL;
+ pixbuf = NULL;
+ command_line = NULL;
+ _gtk_mount_operation_lookup_info (lookup_context,
+ pid,
+ 24,
+ &name,
+ &command_line,
+ &pixbuf);
+
+ if (name == NULL)
+ name = g_strdup_printf (_("Unknown Application (PID %d)"), pid);
+
+ if (command_line == NULL)
+ command_line = g_strdup ("");
+
+ if (pixbuf == NULL)
+ {
+ GtkIconTheme *theme;
+ theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (mount_operation->priv->dialog)));
+ pixbuf = gtk_icon_theme_load_icon (theme,
+ "application-x-executable",
+ 24,
+ 0,
+ NULL);
+ }
+
+ markup = g_strdup_printf ("%s\n"
+ "%s",
+ name,
+ command_line);
+
+ gtk_list_store_append (list_store, &iter);
+ gtk_list_store_set (list_store, &iter,
+ 0, pixbuf,
+ 1, markup,
+ 2, pid,
+ -1);
+
+ if (pixbuf != NULL)
+ g_object_unref (pixbuf);
+ g_free (markup);
+ g_free (name);
+ g_free (command_line);
+}
+
+static void
+remove_pid_from_process_list_store (GtkMountOperation *mount_operation,
+ GtkListStore *list_store,
+ GPid pid)
+{
+ GtkTreeIter iter;
+ GPid pid_of_item;
+
+ if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter))
+ {
+ do
+ {
+ gtk_tree_model_get (GTK_TREE_MODEL (list_store),
+ &iter,
+ 2, &pid_of_item,
+ -1);
+
+ if (pid_of_item == pid)
+ {
+ gtk_list_store_remove (list_store, &iter);
+ break;
+ }
+ }
+ while (gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter));
+ }
+}
+
+
+static void
+update_process_list_store (GtkMountOperation *mount_operation,
+ GtkListStore *list_store,
+ GArray *processes)
+{
+ guint n;
+ GtkMountOperationLookupContext *lookup_context;
+ GArray *current_pids;
+ GArray *pid_indices_to_add;
+ GArray *pid_indices_to_remove;
+ GtkTreeIter iter;
+ GPid pid;
+
+ /* Just removing all items and adding new ones will screw up the
+ * focus handling in the treeview - so compute the delta, and add/remove
+ * items as appropriate
+ */
+ current_pids = g_array_new (FALSE, FALSE, sizeof (GPid));
+ pid_indices_to_add = g_array_new (FALSE, FALSE, sizeof (gint));
+ pid_indices_to_remove = g_array_new (FALSE, FALSE, sizeof (gint));
+
+ if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter))
+ {
+ do
+ {
+ gtk_tree_model_get (GTK_TREE_MODEL (list_store),
+ &iter,
+ 2, &pid,
+ -1);
+
+ g_array_append_val (current_pids, pid);
+ }
+ while (gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter));
+ }
+
+ g_array_sort (current_pids, pid_equal);
+ g_array_sort (processes, pid_equal);
+
+ diff_sorted_arrays (current_pids, processes, pid_equal, pid_indices_to_add, pid_indices_to_remove);
+
+ for (n = 0; n < pid_indices_to_remove->len; n++)
+ {
+ pid = g_array_index (current_pids, GPid, n);
+ remove_pid_from_process_list_store (mount_operation, list_store, pid);
+ }
+
+ if (pid_indices_to_add->len > 0)
+ {
+ lookup_context = _gtk_mount_operation_lookup_context_get (gtk_widget_get_display (mount_operation->priv->process_tree_view));
+ for (n = 0; n < pid_indices_to_add->len; n++)
+ {
+ pid = g_array_index (processes, GPid, n);
+ add_pid_to_process_list_store (mount_operation, lookup_context, list_store, pid);
+ }
+ _gtk_mount_operation_lookup_context_free (lookup_context);
+ }
+
+ /* select the first item, if we went from a zero to a non-zero amount of processes */
+ if (current_pids->len == 0 && pid_indices_to_add->len > 0)
+ {
+ if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter))
+ {
+ GtkTreeSelection *tree_selection;
+ tree_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (mount_operation->priv->process_tree_view));
+ gtk_tree_selection_select_iter (tree_selection, &iter);
+ }
+ }
+
+ g_array_unref (current_pids);
+ g_array_unref (pid_indices_to_add);
+ g_array_unref (pid_indices_to_remove);
+}
+
+static void
+on_end_process_activated (GtkMenuItem *item,
+ gpointer user_data)
+{
+ GtkMountOperation *op = GTK_MOUNT_OPERATION (user_data);
+ GtkTreeSelection *selection;
+ GtkTreeIter iter;
+ GPid pid_to_kill;
+ GError *error;
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (op->priv->process_tree_view));
+
+ if (!gtk_tree_selection_get_selected (selection,
+ NULL,
+ &iter))
+ goto out;
+
+ gtk_tree_model_get (GTK_TREE_MODEL (op->priv->process_list_store),
+ &iter,
+ 2, &pid_to_kill,
+ -1);
+
+ /* TODO: We might want to either
+ *
+ * - Be smart about things and send SIGKILL rather than SIGTERM if
+ * this is the second time the user requests killing a process
+ *
+ * - Or, easier (but worse user experience), offer both "End Process"
+ * and "Terminate Process" options
+ *
+ * But that's not how things work right now....
+ */
+ error = NULL;
+ if (!_gtk_mount_operation_kill_process (pid_to_kill, &error))
+ {
+ GtkWidget *dialog;
+ gint response;
+
+ /* Use GTK_DIALOG_DESTROY_WITH_PARENT here since the parent dialog can be
+ * indeed be destroyed via the GMountOperation::abort signal... for example,
+ * this is triggered if the user yanks the device while we are showing
+ * the dialog...
+ */
+ dialog = gtk_message_dialog_new (GTK_WINDOW (op->priv->dialog),
+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ _("Unable to end process"));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ "%s",
+ error->message);
+
+ gtk_widget_show_all (dialog);
+ response = gtk_dialog_run (GTK_DIALOG (dialog));
+
+ /* GTK_RESPONSE_NONE means the dialog were programmatically destroy, e.g. that
+ * GTK_DIALOG_DESTROY_WITH_PARENT kicked in - so it would trigger a warning to
+ * destroy the dialog in that case
+ */
+ if (response != GTK_RESPONSE_NONE)
+ gtk_widget_destroy (dialog);
+
+ g_error_free (error);
+ }
+
+ out:
+ ;
+}
+
+static gboolean
+do_popup_menu_for_process_tree_view (GtkWidget *widget,
+ GdkEventButton *event,
+ GtkMountOperation *op)
+{
+ GtkWidget *menu;
+ GtkWidget *item;
+ gint button;
+ gint event_time;
+ gboolean popped_up_menu;
+
+ popped_up_menu = FALSE;
+
+ menu = gtk_menu_new ();
+
+ item = gtk_image_menu_item_new_with_mnemonic (_("_End Process"));
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
+ gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU));
+ g_signal_connect (item, "activate",
+ G_CALLBACK (on_end_process_activated),
+ op);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_widget_show_all (menu);
+
+ if (event != NULL)
+ {
+ GtkTreePath *path;
+ GtkTreeSelection *selection;
+
+ if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (op->priv->process_tree_view),
+ (gint) event->x,
+ (gint) event->y,
+ &path,
+ NULL,
+ NULL,
+ NULL))
+ {
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (op->priv->process_tree_view));
+ gtk_tree_selection_select_path (selection, path);
+ gtk_tree_path_free (path);
+ }
+ else
+ {
+ /* don't popup a menu if the user right-clicked in an area with no rows */
+ goto out;
+ }
+
+ button = event->button;
+ event_time = event->time;
+ }
+ else
+ {
+ button = 0;
+ event_time = gtk_get_current_event_time ();
+ }
+
+ gtk_menu_popup (GTK_MENU (menu),
+ NULL,
+ widget,
+ NULL,
+ NULL,
+ button,
+ event_time);
+
+ popped_up_menu = TRUE;
+
+ out:
+ return popped_up_menu;
+}
+
+static gboolean
+on_popup_menu_for_process_tree_view (GtkWidget *widget,
+ gpointer user_data)
+{
+ GtkMountOperation *op = GTK_MOUNT_OPERATION (user_data);
+ return do_popup_menu_for_process_tree_view (widget, NULL, op);
+}
+
+static gboolean
+on_button_press_event_for_process_tree_view (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data)
+{
+ GtkMountOperation *op = GTK_MOUNT_OPERATION (user_data);
+ gboolean ret;
+
+ ret = FALSE;
+
+ if (gdk_event_triggers_context_menu ((GdkEvent *) event))
+ {
+ ret = do_popup_menu_for_process_tree_view (widget, event, op);
+ }
+
+ return ret;
+}
+
+static GtkWidget *
+create_show_processes_dialog (GtkMountOperation *op,
+ const char *message,
+ const char *choices[])
+{
+ GtkMountOperationPrivate *priv;
+ GtkWidget *dialog;
+ const char *secondary = NULL;
+ char *primary;
+ int count, len = 0;
+ GtkWidget *label;
+ GtkWidget *tree_view;
+ GtkWidget *scrolled_window;
+ GtkWidget *vbox;
+ GtkWidget *content_area;
+ GtkTreeViewColumn *column;
+ GtkCellRenderer *renderer;
+ GtkListStore *list_store;
+ gchar *s;
+
+ priv = op->priv;
+
+ primary = strstr (message, "\n");
+ if (primary)
+ {
+ secondary = primary + 1;
+ primary = g_strndup (message, primary - message);
+ }
+
+ dialog = gtk_dialog_new ();
+
+ if (priv->parent_window != NULL)
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), priv->parent_window);
+ gtk_window_set_title (GTK_WINDOW (dialog), "");
+
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+ gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+
+ if (secondary != NULL)
+ {
+ s = g_strdup_printf ("%s\n\n%s", primary, secondary);
+ }
+ else
+ {
+ s = g_strdup_printf ("%s", primary);
+ }
+ g_free (primary);
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), s);
+ g_free (s);
+ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
+
+ /* First count the items in the list then
+ * add the buttons in reverse order */
+
+ while (choices[len] != NULL)
+ len++;
+
+ for (count = len - 1; count >= 0; count--)
+ gtk_dialog_add_button (GTK_DIALOG (dialog), choices[count], count);
+
+ g_signal_connect (G_OBJECT (dialog), "response",
+ G_CALLBACK (show_processes_button_clicked), op);
+
+ priv->dialog = GTK_DIALOG (dialog);
+ g_object_notify (G_OBJECT (op), "is-showing");
+
+ if (priv->parent_window == NULL && priv->screen)
+ gtk_window_set_screen (GTK_WINDOW (dialog), priv->screen);
+
+ tree_view = gtk_tree_view_new ();
+ /* TODO: should use EM's when gtk+ RI patches land */
+ gtk_widget_set_size_request (tree_view,
+ 300,
+ 120);
+
+ column = gtk_tree_view_column_new ();
+ renderer = gtk_cell_renderer_pixbuf_new ();
+ gtk_tree_view_column_pack_start (column, renderer, FALSE);
+ gtk_tree_view_column_set_attributes (column, renderer,
+ "pixbuf", 0,
+ NULL);
+ renderer = gtk_cell_renderer_text_new ();
+ g_object_set (renderer,
+ "ellipsize", PANGO_ELLIPSIZE_MIDDLE,
+ "ellipsize-set", TRUE,
+ NULL);
+ gtk_tree_view_column_pack_start (column, renderer, TRUE);
+ gtk_tree_view_column_set_attributes (column, renderer,
+ "markup", 1,
+ NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
+ gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
+
+
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+ GTK_POLICY_NEVER,
+ GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
+
+ gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
+
+ g_signal_connect (tree_view, "popup-menu",
+ G_CALLBACK (on_popup_menu_for_process_tree_view),
+ op);
+ g_signal_connect (tree_view, "button-press-event",
+ G_CALLBACK (on_button_press_event_for_process_tree_view),
+ op);
+
+ list_store = gtk_list_store_new (3,
+ GDK_TYPE_PIXBUF,
+ G_TYPE_STRING,
+ G_TYPE_INT);
+
+ gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), GTK_TREE_MODEL (list_store));
+
+ priv->process_list_store = list_store;
+ priv->process_tree_view = tree_view;
+ /* set pointers to NULL when dialog goes away */
+ g_object_add_weak_pointer (G_OBJECT (list_store), (gpointer *) &priv->process_list_store);
+ g_object_add_weak_pointer (G_OBJECT (tree_view), (gpointer *) &priv->process_tree_view);
+
+ g_object_unref (list_store);
+ g_object_ref (op);
+
+ return dialog;
+}
+
+static void
+call_processes_proxy_cb (GObject *source,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ _GtkMountOperationHandler *proxy = _GTK_MOUNT_OPERATION_HANDLER (source);
+ GMountOperation *op = user_data;
+ GMountOperationResult result;
+ GVariant *result_details;
+ GVariantIter iter;
+ const gchar *key;
+ GVariant *value;
+ GError *error = NULL;
+
+ if (!_gtk_mount_operation_handler_call_show_processes_finish (proxy,
+ &result,
+ &result_details,
+ res,
+ &error))
+ {
+ result = G_MOUNT_OPERATION_ABORTED;
+ g_warning ("Shell mount operation error: %s\n", error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ /* If the request was unhandled it means we called the method again;
+ * in this case, just return and wait for the next response.
+ */
+ if (result == G_MOUNT_OPERATION_UNHANDLED)
+ return;
+
+ g_variant_iter_init (&iter, result_details);
+ while (g_variant_iter_loop (&iter, "{&sv}", &key, &value))
+ {
+ if (strcmp (key, "choice") == 0)
+ g_mount_operation_set_choice (op, g_variant_get_int32 (value));
+ }
+
+ out:
+ gtk_mount_operation_proxy_finish (GTK_MOUNT_OPERATION (op), result);
+}
+
+static void
+gtk_mount_operation_show_processes_do_proxy (GtkMountOperation *operation,
+ const char *message,
+ GArray *processes,
+ const char *choices[])
+{
+ gchar id[255];
+ g_sprintf(id, "GtkMountOperation%p", operation);
+
+ operation->priv->handler_showing = TRUE;
+ g_object_notify (G_OBJECT (operation), "is-showing");
+
+ /* keep a ref to the operation while the handler is showing */
+ g_object_ref (operation);
+
+ _gtk_mount_operation_handler_call_show_processes (operation->priv->handler, id,
+ message, "drive-harddisk",
+ g_variant_new_fixed_array (G_VARIANT_TYPE_INT32,
+ processes->data, processes->len,
+ sizeof (GPid)),
+ choices, NULL,
+ call_processes_proxy_cb, operation);
+}
+
+static void
+gtk_mount_operation_show_processes_do_gtk (GtkMountOperation *op,
+ const char *message,
+ GArray *processes,
+ const char *choices[])
+{
+ GtkMountOperationPrivate *priv;
+ GtkWidget *dialog = NULL;
+
+ g_return_if_fail (GTK_IS_MOUNT_OPERATION (op));
+ g_return_if_fail (message != NULL);
+ g_return_if_fail (processes != NULL);
+ g_return_if_fail (choices != NULL);
+
+ priv = op->priv;
+
+ if (priv->process_list_store == NULL)
+ {
+ /* need to create the dialog */
+ dialog = create_show_processes_dialog (op, message, choices);
+ }
+
+ /* otherwise, we're showing the dialog, assume messages+choices hasn't changed */
+
+ update_process_list_store (op,
+ priv->process_list_store,
+ processes);
+
+ if (dialog != NULL)
+ {
+ gtk_widget_show_all (dialog);
+ }
+}
+
+
+static void
+gtk_mount_operation_show_processes (GMountOperation *op,
+ const char *message,
+ GArray *processes,
+ const char *choices[])
+{
+
+ GtkMountOperation *operation;
+ gboolean use_gtk;
+
+ operation = GTK_MOUNT_OPERATION (op);
+ use_gtk = (operation->priv->handler == NULL);
+
+ if (use_gtk)
+ gtk_mount_operation_show_processes_do_gtk (operation, message, processes, choices);
+ else
+ gtk_mount_operation_show_processes_do_proxy (operation, message, processes, choices);
+}
+
static void
gtk_mount_operation_aborted (GMountOperation *op)
{
@@ -756,11 +1645,19 @@ gtk_mount_operation_aborted (GMountOperation *op)
g_object_notify (G_OBJECT (op), "is-showing");
g_object_unref (op);
}
+
+ if (priv->handler != NULL)
+ {
+ _gtk_mount_operation_handler_call_close (priv->handler, NULL, NULL, NULL);
+
+ priv->handler_showing = FALSE;
+ g_object_notify (G_OBJECT (op), "is-showing");
+ }
}
/**
* gtk_mount_operation_new:
- * @parent: transient parent of the window, or %NULL
+ * @parent: (allow-none): transient parent of the window, or %NULL
*
* Creates a new #GtkMountOperation
*
@@ -801,7 +1698,7 @@ gtk_mount_operation_is_showing (GtkMountOperation *op)
/**
* gtk_mount_operation_set_parent:
* @op: a #GtkMountOperation
- * @parent: transient parent of the window, or %NULL
+ * @parent: (allow-none): transient parent of the window, or %NULL
*
* Sets the transient parent for windows shown by the
* #GtkMountOperation.
@@ -851,7 +1748,7 @@ gtk_mount_operation_set_parent (GtkMountOperation *op,
*
* Gets the transient parent used by the #GtkMountOperation
*
- * Returns: the transient parent for windows shown by @op
+ * Returns: (transfer none): the transient parent for windows shown by @op
*
* Since: 2.14
*/
@@ -901,10 +1798,10 @@ gtk_mount_operation_set_screen (GtkMountOperation *op,
* gtk_mount_operation_get_screen:
* @op: a #GtkMountOperation
*
- * Gets the screen on which windows of the #GtkMountOperation
+ * Gets the screen on which windows of the #GtkMountOperation
* will be shown.
*
- * Returns: the screen on which windows of @op are shown
+ * Returns: (transfer none): the screen on which windows of @op are shown
*
* Since: 2.14
*/
@@ -926,6 +1823,3 @@ gtk_mount_operation_get_screen (GtkMountOperation *op)
else
return gdk_screen_get_default ();
}
-
-#define __GTK_MOUNT_OPERATION_C__
-#include "gtkaliasdef.c"