[Goodies-commits] r6804 - in gigolo/trunk: . src
Enrico Troeger
enrico at xfce.org
Sat Feb 28 12:11:53 CET 2009
Author: enrico
Date: 2009-02-28 11:11:52 +0000 (Sat, 28 Feb 2009)
New Revision: 6804
Modified:
gigolo/trunk/ChangeLog
gigolo/trunk/src/backendgvfs.c
gigolo/trunk/src/backendgvfs.h
gigolo/trunk/src/bookmark.c
gigolo/trunk/src/passworddialog.c
gigolo/trunk/src/passworddialog.h
gigolo/trunk/src/window.c
Log:
Instead of passing a stored domain value to the password dialog, pass it already in the URI while connecting.
Modified: gigolo/trunk/ChangeLog
===================================================================
--- gigolo/trunk/ChangeLog 2009-02-28 10:45:08 UTC (rev 6803)
+++ gigolo/trunk/ChangeLog 2009-02-28 11:11:52 UTC (rev 6804)
@@ -2,6 +2,10 @@
* src/backendgvfs.c:
Cache the domain string when it is passed to the password dialog.
+ * src/backendgvfs.c, src/backendgvfs.h, src/bookmark.c,
+ src/passworddialog.c, src/passworddialog.h, src/window.c:
+ Instead of passing a stored domain value to the password dialog,
+ pass it already in the URI while connecting.
2009-02-22 Enrico Tröger <enrico(at)xfce(dot)org>
Modified: gigolo/trunk/src/backendgvfs.c
===================================================================
--- gigolo/trunk/src/backendgvfs.c 2009-02-28 10:45:08 UTC (rev 6803)
+++ gigolo/trunk/src/backendgvfs.c 2009-02-28 11:11:52 UTC (rev 6804)
@@ -52,7 +52,6 @@
{
GigoloBackendGVFS *self;
GtkWidget *dialog;
- gchar *domain;
} MountInfo;
struct _GigoloBackendGVFSPrivate
@@ -458,19 +457,18 @@
gtk_widget_destroy(mi->dialog);
g_free(uri);
- g_free(mi->domain);
g_free(mi);
}
static void set_password_cb(GMountOperation *op, G_GNUC_UNUSED gchar *message, gchar *default_user,
- gchar *default_domain, GAskPasswordFlags flags, MountInfo *mi)
+ G_GNUC_UNUSED gchar *default_domain, GAskPasswordFlags flags,
+ G_GNUC_UNUSED gpointer data)
{
GMountOperationResult result;
GtkWidget *dialog;
- dialog = gigolo_password_dialog_new(flags, default_user,
- (mi->domain != NULL) ? mi->domain : default_domain);
+ dialog = gigolo_password_dialog_new(flags, default_user);
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
{
@@ -488,8 +486,8 @@
gigolo_password_dialog_get_password(GIGOLO_PASSWORD_DIALOG(dialog)));
/* TODO make this configurable? */
/* g_mount_operation_set_password_save(op, G_PASSWORD_SAVE_FOR_SESGIGOLO); */
- g_mount_operation_set_password_save(op, G_PASSWORD_SAVE_NEVER);
- /*g_mount_operation_set_password_save(op, G_PASSWORD_SAVE_PERMANENTLY);*/
+ /* g_mount_operation_set_password_save(op, G_PASSWORD_SAVE_NEVER); */
+ g_mount_operation_set_password_save(op, G_PASSWORD_SAVE_PERMANENTLY);
}
}
else
@@ -503,8 +501,7 @@
}
-void gigolo_backend_gvfs_mount_uri(GigoloBackendGVFS *backend, const gchar *uri,
- const gchar *domain, GtkWidget *dialog)
+void gigolo_backend_gvfs_mount_uri(GigoloBackendGVFS *backend, const gchar *uri, GtkWidget *dialog)
{
GMountOperation *op;
GFile *file;
@@ -518,9 +515,8 @@
mi = g_new0(MountInfo, 1);
mi->self = backend;
mi->dialog = dialog;
- mi->domain = g_strdup(domain);
- g_signal_connect(op, "ask-password", G_CALLBACK(set_password_cb), mi);
+ g_signal_connect(op, "ask-password", G_CALLBACK(set_password_cb), NULL);
g_file_mount_enclosing_volume(file, G_MOUNT_MOUNT_NONE, op, NULL,
(GAsyncReadyCallback) mount_ready_cb, mi);
Modified: gigolo/trunk/src/backendgvfs.h
===================================================================
--- gigolo/trunk/src/backendgvfs.h 2009-02-28 10:45:08 UTC (rev 6803)
+++ gigolo/trunk/src/backendgvfs.h 2009-02-28 11:11:52 UTC (rev 6804)
@@ -58,7 +58,6 @@
void gigolo_backend_gvfs_mount_uri (GigoloBackendGVFS *backend,
const gchar *uri,
- const gchar *domain,
GtkWidget *dialog);
gchar* gigolo_backend_gvfs_get_volume_identifier (GVolume *volume);
Modified: gigolo/trunk/src/bookmark.c
===================================================================
--- gigolo/trunk/src/bookmark.c 2009-02-28 10:45:08 UTC (rev 6803)
+++ gigolo/trunk/src/bookmark.c 2009-02-28 11:11:52 UTC (rev 6804)
@@ -262,6 +262,7 @@
{
GigoloBookmarkPrivate *priv = GIGOLO_BOOKMARK_GET_PRIVATE(bookmark);
gchar *result;
+ const gchar *domain = NULL;
gchar *user = NULL;
gchar *port = NULL;
@@ -278,8 +279,12 @@
else
user = g_strdup(priv->user);
- result = g_strdup_printf("%s://%s%s%s%s/%s%s",
+ domain = gigolo_bookmark_get_domain(bookmark);
+
+ result = g_strdup_printf("%s://%s%s%s%s%s%s/%s%s",
priv->scheme,
+ (NZV(domain)) ? domain : "",
+ (NZV(domain)) ? ";" : "",
(NZV(user)) ? user : "",
(NZV(user)) ? "@" : "",
priv->host,
Modified: gigolo/trunk/src/passworddialog.c
===================================================================
--- gigolo/trunk/src/passworddialog.c 2009-02-28 10:45:08 UTC (rev 6803)
+++ gigolo/trunk/src/passworddialog.c 2009-02-28 11:11:52 UTC (rev 6804)
@@ -139,7 +139,7 @@
}
-GtkWidget *gigolo_password_dialog_new(GAskPasswordFlags flags, const gchar *user, const gchar *domain)
+GtkWidget *gigolo_password_dialog_new(GAskPasswordFlags flags, const gchar *user)
{
GtkWidget *dialog = g_object_new(GIGOLO_PASSWORD_DIALOG_TYPE, NULL);
GigoloPasswordDialogPrivate *priv = GIGOLO_PASSWORD_DIALOG_GET_PRIVATE(dialog);
@@ -160,8 +160,6 @@
if (flags & G_ASK_PASSWORD_NEED_DOMAIN)
{
gtk_widget_show(priv->box_domain);
- if (NZV(domain))
- gtk_entry_set_text(GTK_ENTRY(priv->entry_domain), domain);
gtk_widget_grab_focus(priv->entry_domain);
}
Modified: gigolo/trunk/src/passworddialog.h
===================================================================
--- gigolo/trunk/src/passworddialog.h 2009-02-28 10:45:08 UTC (rev 6803)
+++ gigolo/trunk/src/passworddialog.h 2009-02-28 11:11:52 UTC (rev 6804)
@@ -47,7 +47,7 @@
};
GType gigolo_password_dialog_get_type (void);
-GtkWidget* gigolo_password_dialog_new (GAskPasswordFlags flags, const gchar *user, const gchar *domain);
+GtkWidget* gigolo_password_dialog_new (GAskPasswordFlags flags, const gchar *user);
const gchar* gigolo_password_dialog_get_domain (GigoloPasswordDialog *dialog);
const gchar* gigolo_password_dialog_get_username (GigoloPasswordDialog *dialog);
Modified: gigolo/trunk/src/window.c
===================================================================
--- gigolo/trunk/src/window.c 2009-02-28 10:45:08 UTC (rev 6803)
+++ gigolo/trunk/src/window.c 2009-02-28 11:11:52 UTC (rev 6804)
@@ -289,7 +289,7 @@
g_free(label);
}
- gigolo_backend_gvfs_mount_uri(priv->backend_gvfs, uri, gigolo_bookmark_get_domain(bookmark), dialog);
+ gigolo_backend_gvfs_mount_uri(priv->backend_gvfs, uri, dialog);
if (gigolo_bookmark_get_autoconnect(bookmark))
gigolo_bookmark_set_should_not_autoconnect(bookmark, FALSE);
@@ -841,8 +841,8 @@
* not cancelled */
edit_dialog = gigolo_bookmark_edit_dialog_new_with_bookmark(
GTK_WINDOW(window), priv->settings, GIGOLO_BE_MODE_EDIT, bm);
- if (gigolo_bookmark_edit_dialog_run(GIGOLO_BOOKMARK_EDIT_DIALOG(edit_dialog)) ==
- GTK_RESPONSE_OK)
+ if (gigolo_bookmark_edit_dialog_run(
+ GIGOLO_BOOKMARK_EDIT_DIALOG(edit_dialog)) == GTK_RESPONSE_OK)
{
/* this fills the values of the dialog into 'bm' */
g_object_set(edit_dialog, "bookmark-update", bm, NULL);
More information about the Goodies-commits
mailing list