isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mount-operation: add a ShellMountOperation implementation

Browse Source 
Ideally, this would be an entirely-JS implementation, but we have a
couple of issues with gjs and gobject-introspection to work around, so
we need a ShellMountOperation class for the time being.

This first commit implements the show-processes dialog, with a system
modal style very similar to the EndSession dialog.
Implementations of ask-question and ask-password will follow shortly.

https://bugzilla.gnome.org/show_bug.cgi?id=653520
This commit is contained in:
Cosimo Cecchi
2011-06-22 16:43:16 -04:00
parent 98327b0c13
commit 297d1356a2
8 changed files with 580 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -108,6 +108,7 @@ shell_public_headers_h = \
shell-gtk-embed.h \
shell-global.h \
shell-mobile-providers.h \
shell-mount-operation.h \
shell-perf-log.h \
shell-slicer.h \
shell-stack.h \
@ -141,6 +142,7 @@ libgnome_shell_la_SOURCES = \
shell-gtk-embed.c \
shell-global.c \
shell-mobile-providers.c \
shell-mount-operation.c \
shell-perf-log.c \
shell-polkit-authentication-agent.h \
shell-polkit-authentication-agent.c \

183
src/shell-mount-operation.c Normal file
View File

@ -0,0 +1,183 @@
/*
* Copyright (C) 2011 Red Hat, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*
* Author: Cosimo Cecchi <cosimoc@redhat.com>
*
*/
#include "shell-mount-operation.h"
/* This is a dummy class; we would like to be able to subclass the
* object from JS but we can't yet; the default GMountOperation impl
* automatically calls g_mount_operation_reply(UNHANDLED) after an idle,
* in interactive methods. We want to handle the reply outselves
* instead, so we just override the default methods with empty ones.
*
* Also, we need to workaround the fact that gjs doesn't support type
* annotations for signals yet (so we can't effectively forward e.g.
* the GPid array to JS).
* See https://bugzilla.gnome.org/show_bug.cgi?id=645978
*/
G_DEFINE_TYPE (ShellMountOperation, shell_mount_operation, G_TYPE_MOUNT_OPERATION);
enum {
SHOW_PROCESSES_2,
NUM_SIGNALS
};
static guint signals[NUM_SIGNALS] = { 0, };
struct _ShellMountOperationPrivate {
GArray *pids;
gchar **choices;
gchar *message;
};
static void
shell_mount_operation_init (ShellMountOperation *self)
{
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, SHELL_TYPE_MOUNT_OPERATION,
ShellMountOperationPrivate);
}
static void
shell_mount_operation_ask_password (GMountOperation *op,
const char *message,
const char *default_user,
const char *default_domain,
GAskPasswordFlags flags)
{
/* do nothing */
}
static void
shell_mount_operation_ask_question (GMountOperation *op,
const char *message,
const char *choices[])
{
/* do nothing */
}
static void
shell_mount_operation_show_processes (GMountOperation *operation,
const gchar *message,
GArray *processes,
const gchar *choices[])
{
ShellMountOperation *self = SHELL_MOUNT_OPERATION (operation);
if (self->priv->pids != NULL)
{
g_array_unref (self->priv->pids);
self->priv->pids = NULL;
}
g_free (self->priv->message);
g_strfreev (self->priv->choices);
/* save the parameters */
self->priv->pids = g_array_ref (processes);
self->priv->choices = g_strdupv ((gchar **) choices);
self->priv->message = g_strdup (message);
g_signal_emit (self, signals[SHOW_PROCESSES_2], 0);
}
static void
shell_mount_operation_finalize (GObject *obj)
{
ShellMountOperation *self = SHELL_MOUNT_OPERATION (obj);
g_strfreev (self->priv->choices);
g_free (self->priv->message);
if (self->priv->pids != NULL)
{
g_array_unref (self->priv->pids);
self->priv->pids = NULL;
}
G_OBJECT_CLASS (shell_mount_operation_parent_class)->finalize (obj);
}
static void
shell_mount_operation_class_init (ShellMountOperationClass *klass)
{
GMountOperationClass *mclass;
GObjectClass *oclass;
mclass = G_MOUNT_OPERATION_CLASS (klass);
mclass->show_processes = shell_mount_operation_show_processes;
mclass->ask_question = shell_mount_operation_ask_question;
mclass->ask_password = shell_mount_operation_ask_password;
oclass = G_OBJECT_CLASS (klass);
oclass->finalize = shell_mount_operation_finalize;
signals[SHOW_PROCESSES_2] =
g_signal_new ("show-processes-2",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
g_type_class_add_private (klass, sizeof (ShellMountOperationPrivate));
}
GMountOperation *
shell_mount_operation_new (void)
{
return g_object_new (SHELL_TYPE_MOUNT_OPERATION, NULL);
}
/**
* shell_mount_operation_get_show_processes_pids:
* @self: a #ShellMountOperation
*
* Returns: (transfer full) (element-type GPid): a #GArray
*/
GArray *
shell_mount_operation_get_show_processes_pids (ShellMountOperation *self)
{
return g_array_ref (self->priv->pids);
}
/**
* shell_mount_operation_get_show_processes_choices:
* @self: a #ShellMountOperation
*
* Returns: (transfer full):
*/
gchar **
shell_mount_operation_get_show_processes_choices (ShellMountOperation *self)
{
return g_strdupv (self->priv->choices);
}
/**
* shell_mount_operation_get_show_processes_message:
* @self: a #ShellMountOperation
*
* Returns: (transfer full):
*/
gchar *
shell_mount_operation_get_show_processes_message (ShellMountOperation *self)
{
return g_strdup (self->priv->message);
}

63
src/shell-mount-operation.h Normal file
View File

@ -0,0 +1,63 @@
/*
* Copyright (C) 2011 Red Hat, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*
* Author: Cosimo Cecchi <cosimoc@redhat.com>
*
*/
#ifndef __SHELL_MOUNT_OPERATION_H__
#define __SHELL_MOUNT_OPERATION_H__
#include <gio/gio.h>
G_BEGIN_DECLS
#define SHELL_TYPE_MOUNT_OPERATION (shell_mount_operation_get_type ())
#define SHELL_MOUNT_OPERATION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SHELL_TYPE_MOUNT_OPERATION, ShellMountOperation))
#define SHELL_MOUNT_OPERATION_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SHELL_TYPE_MOUNT_OPERATION, ShellMountOperationClass))
#define SHELL_IS_MOUNT_OPERATION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SHELL_TYPE_MOUNT_OPERATION))
#define SHELL_IS_MOUNT_OPERATION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SHELL_TYPE_MOUNT_OPERATION))
#define SHELL_MOUNT_OPERATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), SHELL_TYPE_MOUNT_OPERATION, ShellMountOperationClass))
typedef struct _ShellMountOperation ShellMountOperation;
typedef struct _ShellMountOperationClass ShellMountOperationClass;
typedef struct _ShellMountOperationPrivate ShellMountOperationPrivate;
struct _ShellMountOperation
{
GMountOperation parent_instance;
ShellMountOperationPrivate *priv;
};
struct _ShellMountOperationClass
{
GMountOperationClass parent_class;
};
GType shell_mount_operation_get_type (void);
GMountOperation *shell_mount_operation_new (void);
GArray * shell_mount_operation_get_show_processes_pids (ShellMountOperation *self);
gchar ** shell_mount_operation_get_show_processes_choices (ShellMountOperation *self);
gchar * shell_mount_operation_get_show_processes_message (ShellMountOperation *self);
G_END_DECLS
#endif /* __SHELL_MOUNT_OPERATION_H__ */