From eade711fe26dc22391a60bc33f423817c39d9f43 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 27 Oct 2012 05:46:00 +0200 Subject: [connect-operation] add CajaConnectServerOperation This is a GtkMountOperation subclass to handle password/username/domain requests directly from inside of the 'Connect to Server' dialog. http://git.gnome.org/browse/nautilus/commit/?id=c1bebe3a29bc2dc3b01ad2277a9802d9d0bc25cd --- src/Makefile.am | 6 +- src/caja-connect-server-operation.c | 140 ++++++++++++++++++++++++++++++++++++ src/caja-connect-server-operation.h | 63 ++++++++++++++++ 3 files changed, 207 insertions(+), 2 deletions(-) create mode 100644 src/caja-connect-server-operation.c create mode 100644 src/caja-connect-server-operation.h diff --git a/src/Makefile.am b/src/Makefile.am index 21de26ee..b9ec8b87 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -68,6 +68,8 @@ caja_SOURCES = \ caja-connect-server-dialog.c \ caja-connect-server-dialog.h \ caja-connect-server-dialog-nonmain.c \ + caja-connect-server-operation.c \ + caja-connect-server-operation.h \ caja-desktop-window.c \ caja-desktop-window.h \ caja-emblem-sidebar.c \ @@ -184,8 +186,8 @@ caja_connect_server_SOURCES = \ caja-connect-server-dialog.c \ caja-connect-server-dialog.h \ caja-connect-server-dialog-main.c \ - caja-location-entry.c \ - caja-location-entry.h \ + caja-connect-server-operation.c \ + caja-connect-server-operation.h \ $(NULL) caja_convert_metadata_SOURCES = \ diff --git a/src/caja-connect-server-operation.c b/src/caja-connect-server-operation.c new file mode 100644 index 00000000..51b69b84 --- /dev/null +++ b/src/caja-connect-server-operation.c @@ -0,0 +1,140 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +/* + * Caja + * + * Copyright (C) 2010 Cosimo Cecchi + * + * Caja 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. + * + * Caja 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; see the file COPYING. If not, + * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Cosimo Cecchi + */ + +#include + +#include "caja-connect-server-operation.h" + +#include "caja-connect-server-dialog.h" + +G_DEFINE_TYPE (CajaConnectServerOperation, + caja_connect_server_operation, GTK_TYPE_MOUNT_OPERATION); + +enum { + PROP_DIALOG = 1, + NUM_PROPERTIES +}; + +struct _CajaConnectServerOperationDetails { + CajaConnectServerDialog *dialog; +}; + +static void +fill_details_async_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + CajaConnectServerDialog *dialog; + CajaConnectServerOperation *self; + gboolean res; + + self = user_data; + dialog = CAJA_CONNECT_SERVER_DIALOG (source); + + res = caja_connect_server_dialog_fill_details_finish (dialog, result); + + if (!res) { + g_mount_operation_reply (G_MOUNT_OPERATION (self), G_MOUNT_OPERATION_ABORTED); + } else { + g_mount_operation_reply (G_MOUNT_OPERATION (self), G_MOUNT_OPERATION_HANDLED); + } +} + +static void +caja_connect_server_operation_ask_password (GMountOperation *op, + const gchar *message, + const gchar *default_user, + const gchar *default_domain, + GAskPasswordFlags flags) +{ + CajaConnectServerOperation *self; + + self = CAJA_CONNECT_SERVER_OPERATION (op); + + caja_connect_server_dialog_fill_details_async (self->details->dialog, + G_MOUNT_OPERATION (self), + default_user, + default_domain, + flags, + fill_details_async_cb, + self); +} + +static void +caja_connect_server_operation_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + CajaConnectServerOperation *self; + + self = CAJA_CONNECT_SERVER_OPERATION (object); + + switch (property_id) { + case PROP_DIALOG: + self->details->dialog = g_value_get_object (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +caja_connect_server_operation_class_init (CajaConnectServerOperationClass *klass) +{ + GMountOperationClass *mount_op_class; + GObjectClass *object_class; + GParamSpec *pspec; + + object_class = G_OBJECT_CLASS (klass); + object_class->set_property = caja_connect_server_operation_set_property; + + mount_op_class = G_MOUNT_OPERATION_CLASS (klass); + mount_op_class->ask_password = caja_connect_server_operation_ask_password; + + pspec = g_param_spec_object ("dialog", "The connect dialog", + "The connect to server dialog", + CAJA_TYPE_CONNECT_SERVER_DIALOG, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); + g_object_class_install_property (object_class, PROP_DIALOG, pspec); + + g_type_class_add_private (klass, sizeof (CajaConnectServerOperationDetails)); +} + +static void +caja_connect_server_operation_init (CajaConnectServerOperation *self) +{ + self->details = G_TYPE_INSTANCE_GET_PRIVATE (self, + CAJA_TYPE_CONNECT_SERVER_OPERATION, + CajaConnectServerOperationDetails); +} + +GMountOperation * +caja_connect_server_operation_new (CajaConnectServerDialog *dialog) +{ + return g_object_new (CAJA_TYPE_CONNECT_SERVER_OPERATION, + "dialog", dialog, + NULL); +} diff --git a/src/caja-connect-server-operation.h b/src/caja-connect-server-operation.h new file mode 100644 index 00000000..eba0283a --- /dev/null +++ b/src/caja-connect-server-operation.h @@ -0,0 +1,63 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +/* + * Caja + * + * Copyright (C) 2010 Cosimo Cecchi + * + * Caja 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. + * + * Caja 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; see the file COPYING. If not, + * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + * + * Author: Cosimo Cecchi + */ + +#ifndef __CAJA_CONNECT_SERVER_OPERATION_H__ +#define __CAJA_CONNECT_SERVER_OPERATION_H__ + +#include +#include + +#include "caja-connect-server-dialog.h" + +#define CAJA_TYPE_CONNECT_SERVER_OPERATION\ + (caja_connect_server_operation_get_type ()) +#define CAJA_CONNECT_SERVER_OPERATION(obj)\ + (G_TYPE_CHECK_INSTANCE_CAST ((obj),\ + CAJA_TYPE_CONNECT_SERVER_OPERATION,\ + CajaConnectServerOperation)) +#define CAJA_CONNECT_SERVER_OPERATION_CLASS(klass)\ + (G_TYPE_CHECK_CLASS_CAST ((klass), CAJA_TYPE_CONNECT_SERVER_OPERATION,\ + CajaConnectServerOperationClass)) +#define CAJA_IS_CONNECT_SERVER_OPERATION(obj)\ + (G_TYPE_INSTANCE_CHECK_TYPE ((obj), CAJA_TYPE_CONNECT_SERVER_OPERATION) + +typedef struct _CajaConnectServerOperationDetails + CajaConnectServerOperationDetails; + +typedef struct { + GtkMountOperation parent; + CajaConnectServerOperationDetails *details; +} CajaConnectServerOperation; + +typedef struct { + GtkMountOperationClass parent_class; +} CajaConnectServerOperationClass; + +GType caja_connect_server_operation_get_type (void); + +GMountOperation * +caja_connect_server_operation_new (CajaConnectServerDialog *dialog); + + +#endif /* __CAJA_CONNECT_SERVER_OPERATION_H__ */ -- cgit v1.2.1