From b2cda1d0c6d44f53f71bad9e256f41188677dfba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 1 Oct 2008 20:56:04 +0000 Subject: Merge revisions 36016:36533 from trunk. svn path=/branches/kill-bonobo/; revision=36534 --- plugins/publish-calendar/url-editor-dialog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/publish-calendar/url-editor-dialog.c') diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c index e396372c8a..ddc1653959 100644 --- a/plugins/publish-calendar/url-editor-dialog.c +++ b/plugins/publish-calendar/url-editor-dialog.c @@ -54,7 +54,7 @@ create_uri (UrlEditorDialog *dialog) method = "smb"; break; - case TYPE_SSH: + case TYPE_SFTP: method = "sftp"; break; @@ -110,7 +110,7 @@ check_input (UrlEditorDialog *dialog) /* This should probably be more complex, since ' ' isn't a valid server name */ switch (uri->service_type) { case TYPE_SMB: - case TYPE_SSH: + case TYPE_SFTP: case TYPE_FTP: case TYPE_DAV: case TYPE_DAVS: @@ -160,7 +160,7 @@ publish_service_changed (GtkComboBox *combo, UrlEditorDialog *dialog) gtk_widget_show (dialog->password_hbox); gtk_widget_show (dialog->remember_pw); break; - case TYPE_SSH: + case TYPE_SFTP: case TYPE_FTP: case TYPE_DAV: case TYPE_DAVS: @@ -275,7 +275,7 @@ set_from_uri (UrlEditorDialog *dialog) if (strcmp ((const char *)method, "smb") == 0) uri->service_type = TYPE_SMB; else if (strcmp ((const char *)method, "sftp") == 0) - uri->service_type = TYPE_SSH; + uri->service_type = TYPE_SFTP; else if (strcmp ((const char *)method, "ftp") == 0) /* we set TYPE_FTP here for now. if we don't find a * username later, we'll change it to TYPE_ANON_FTP */ -- cgit v1.2.3