diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2008-09-26 14:41:19 +0800 |
|---|---|---|
| committer | Philip Withnall <pwithnall@src.gnome.org> | 2008-09-26 14:41:19 +0800 |
| commit | b2fc0d756d4f9f6ebd631e39f763eeba1f30c704 (patch) | |
| tree | 49b6ecc23e6ef01b2315586ee6aba6920c6f68ce /plugins | |
| parent | eb725acfbf3becac27e2e972fc3eaf41cbe4e7eb (diff) | |
| download | gsoc2013-evolution-b2fc0d756d4f9f6ebd631e39f763eeba1f30c704.tar.gz gsoc2013-evolution-b2fc0d756d4f9f6ebd631e39f763eeba1f30c704.tar.zst gsoc2013-evolution-b2fc0d756d4f9f6ebd631e39f763eeba1f30c704.zip | |
** Fix for bug #553461 and bug #553389
2008-09-26 Philip Withnall <philip@tecnocode.co.uk>
** Fix for bug #553461 and bug #553389
* publish-calendar.c (url_remove_clicked):
* publish-calendar.glade:
* url-editor-dialog.c (create_uri), (check_input),
(publish_service_changed), (set_from_uri):
* url-editor-dialog.h: Rename the "SSH" option to "Secure FTP
(SSH)"
and update the code accordingly. Also, change a related string
to use
better terminology.
svn path=/trunk/; revision=36455
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/publish-calendar/ChangeLog | 12 | ||||
| -rw-r--r-- | plugins/publish-calendar/publish-calendar.c | 2 | ||||
| -rw-r--r-- | plugins/publish-calendar/publish-calendar.glade | 2 | ||||
| -rw-r--r-- | plugins/publish-calendar/url-editor-dialog.c | 8 | ||||
| -rw-r--r-- | plugins/publish-calendar/url-editor-dialog.h | 2 |
5 files changed, 19 insertions, 7 deletions
diff --git a/plugins/publish-calendar/ChangeLog b/plugins/publish-calendar/ChangeLog index 7b26673770..52f1d4b2c0 100644 --- a/plugins/publish-calendar/ChangeLog +++ b/plugins/publish-calendar/ChangeLog @@ -1,3 +1,15 @@ +2008-09-26 Philip Withnall <philip@tecnocode.co.uk> + + ** Fix for bug #553461 and bug #553389 + + * publish-calendar.c (url_remove_clicked): + * publish-calendar.glade: + * url-editor-dialog.c (create_uri), (check_input), + (publish_service_changed), (set_from_uri): + * url-editor-dialog.h: Rename the "SSH" option to "Secure FTP (SSH)" + and update the code accordingly. Also, change a related string to use + better terminology. + 2008-09-02 Sankar P <psankar@novell.com> License Changes diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 28358767ae..a56c25e43d 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -592,7 +592,7 @@ url_remove_clicked (GtkButton *button, PublishUIData *ui) confirm = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, - _("Are you sure you want to remove this URL?")); + _("Are you sure you want to remove this location?")); gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_CANCEL, GTK_RESPONSE_NO); gtk_dialog_add_button (GTK_DIALOG (confirm), GTK_STOCK_REMOVE, GTK_RESPONSE_YES); gtk_dialog_set_default_response (GTK_DIALOG (confirm), GTK_RESPONSE_CANCEL); diff --git a/plugins/publish-calendar/publish-calendar.glade b/plugins/publish-calendar/publish-calendar.glade index f56eabbc10..6f6ae9dcf2 100644 --- a/plugins/publish-calendar/publish-calendar.glade +++ b/plugins/publish-calendar/publish-calendar.glade @@ -712,7 +712,7 @@ Free/Busy</property> <child> <widget class="GtkComboBox" id="publish_service"> <property name="visible">True</property> - <property name="items" translatable="yes">SSH + <property name="items" translatable="yes">Secure FTP (SSH) Public FTP FTP (with login) Windows share 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 */ diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h index b464ff2252..2d985e90e5 100644 --- a/plugins/publish-calendar/url-editor-dialog.h +++ b/plugins/publish-calendar/url-editor-dialog.h @@ -44,7 +44,7 @@ enum { }; enum { - TYPE_SSH, + TYPE_SFTP, TYPE_ANON_FTP, TYPE_FTP, TYPE_SMB, |