From 1638bc87bac1eb0bcf842872767d4cc953153a4e Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 27 Oct 2012 05:40:18 +0200 Subject: [connect-dialog] redesign the dialog According to Allan Day's mockups. http://git.gnome.org/browse/nautilus/commit/?id=7848e74d812c22299962a8ae22b01dbd403929c0 --- src/caja-connect-server-dialog.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/caja-connect-server-dialog.h') diff --git a/src/caja-connect-server-dialog.h b/src/caja-connect-server-dialog.h index 135df55f..65c8c58e 100644 --- a/src/caja-connect-server-dialog.h +++ b/src/caja-connect-server-dialog.h @@ -49,8 +49,7 @@ struct _CajaConnectServerDialogClass }; GType caja_connect_server_dialog_get_type (void); -GtkWidget* caja_connect_server_dialog_new (CajaWindow *window, - GFile *location); +GtkWidget* caja_connect_server_dialog_new (CajaWindow *window); /* Private internal calls */ -- cgit v1.2.1 From 2218501731180797c5e29ce677f31fd2b2d3ecea Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 27 Oct 2012 06:11:08 +0200 Subject: [connect-dialog] handle psswds, display warns/errs in info bar, tweak UI details connect-dialog: integrate password handling Also, use the info bar to display warnings/errors, and tweak the UI details. http://git.gnome.org/browse/nautilus/commit/?id=7d004452f333b7b8b804d87de49c858e8743a115 --- src/caja-connect-server-dialog.h | 47 +++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 13 deletions(-) (limited to 'src/caja-connect-server-dialog.h') diff --git a/src/caja-connect-server-dialog.h b/src/caja-connect-server-dialog.h index 65c8c58e..1876e8a9 100644 --- a/src/caja-connect-server-dialog.h +++ b/src/caja-connect-server-dialog.h @@ -1,9 +1,9 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ - /* * Caja * * Copyright (C) 2003 Red Hat, Inc. + * 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 @@ -26,15 +26,22 @@ #include #include + #include "caja-window.h" -#define CAJA_TYPE_CONNECT_SERVER_DIALOG (caja_connect_server_dialog_get_type ()) -#define CAJA_CONNECT_SERVER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_CONNECT_SERVER_DIALOG, CajaConnectServerDialog)) -#define CAJA_CONNECT_SERVER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAJA_TYPE_CONNECT_SERVER_DIALOG, CajaConnectServerDialogClass)) -#define CAJA_IS_CONNECT_SERVER_DIALOG(obj) (G_TYPE_INSTANCE_CHECK_TYPE ((obj), CAJA_TYPE_CONNECT_SERVER_DIALOG) +#define CAJA_TYPE_CONNECT_SERVER_DIALOG\ + (caja_connect_server_dialog_get_type ()) +#define CAJA_CONNECT_SERVER_DIALOG(obj)\ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_CONNECT_SERVER_DIALOG,\ + CajaConnectServerDialog)) +#define CAJA_CONNECT_SERVER_DIALOG_CLASS(klass)\ + (G_TYPE_CHECK_CLASS_CAST ((klass), CAJA_TYPE_CONNECT_SERVER_DIALOG,\ + CajaConnectServerDialogClass)) +#define CAJA_IS_CONNECT_SERVER_DIALOG(obj)\ + (G_TYPE_INSTANCE_CHECK_TYPE ((obj), CAJA_TYPE_CONNECT_SERVER_DIALOG) -typedef struct _CajaConnectServerDialog CajaConnectServerDialog; -typedef struct _CajaConnectServerDialogClass CajaConnectServerDialogClass; +typedef struct _CajaConnectServerDialog CajaConnectServerDialog; +typedef struct _CajaConnectServerDialogClass CajaConnectServerDialogClass; typedef struct _CajaConnectServerDialogDetails CajaConnectServerDialogDetails; struct _CajaConnectServerDialog @@ -48,13 +55,27 @@ struct _CajaConnectServerDialogClass GtkDialogClass parent_class; }; -GType caja_connect_server_dialog_get_type (void); -GtkWidget* caja_connect_server_dialog_new (CajaWindow *window); +GType caja_connect_server_dialog_get_type (void); + +GtkWidget* caja_connect_server_dialog_new (CajaWindow *window); -/* Private internal calls */ +void caja_connect_server_dialog_display_location_async (CajaConnectServerDialog *self, + CajaApplication *application, + GFile *location, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean caja_connect_server_dialog_display_location_finish (CajaConnectServerDialog *self, + GAsyncResult *result, + GError **error); -void caja_connect_server_dialog_present_uri (CajaApplication *application, - GFile *location, - GtkWidget *widget); +void caja_connect_server_dialog_fill_details_async (CajaConnectServerDialog *self, + GMountOperation *operation, + const gchar *default_user, + const gchar *default_domain, + GAskPasswordFlags flags, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean caja_connect_server_dialog_fill_details_finish (CajaConnectServerDialog *self, + GAsyncResult *result); #endif /* CAJA_CONNECT_SERVER_DIALOG_H */ -- cgit v1.2.1