Bug #499322 - Use extension for "Save as" suggested file name

6 files changed, 22 insertions, 7 deletions

diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index 92ef88c01a..5214f611d3 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -259,7 +259,7 @@ action_address_book_save_as_cb (GtkAction *action,
 
 	string = eab_suggest_filename (list);
 	file = e_shell_run_save_dialog (
-		shell, _("Save as vCard"), string, NULL, NULL);
+		shell, _("Save as vCard"), string, "*.vcf:text/x-vcard,text/directory", NULL, NULL);
 	g_free (string);
 
 	if (file == NULL)
@@ -560,7 +560,7 @@ action_contact_save_as_cb (GtkAction *action,
 
 	string = eab_suggest_filename (list);
 	file = e_shell_run_save_dialog (
-		shell, _("Save as vCard"), string, NULL, NULL);
+		shell, _("Save as vCard"), string, "*.vcf:text/x-vcard,text/directory", NULL, NULL);
 	g_free (string);
 
 	if (file == NULL)
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index b5fd49bb83..b0408b6b5a 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -1101,8 +1101,11 @@ action_event_save_as_cb (GtkAction *action,
 	client = event->comp_data->client;
 	icalcomp = event->comp_data->icalcomp;
 
+	/* To Translators: Default filename part saving an event to a file when no summary is filed, the '.ics' extension is concatenated to it */
+	string = icalcomp_suggest_filename (icalcomp, _("event"));
 	file = e_shell_run_save_dialog (
-		shell, _("Save as iCalendar"), NULL, NULL, NULL);
+		shell, _("Save as iCalendar"), string, "*.ics:text/calendar", NULL, NULL);
+	g_free (string);
 	if (file == NULL)
 		return;
 
diff --git a/modules/calendar/e-cal-shell-view-memopad.c b/modules/calendar/e-cal-shell-view-memopad.c
index 5f1ed972dd..3a92cbc777 100644
--- a/modules/calendar/e-cal-shell-view-memopad.c
+++ b/modules/calendar/e-cal-shell-view-memopad.c
@@ -258,8 +258,11 @@ action_calendar_memopad_save_as_cb (GtkAction *action,
 	comp_data = list->data;
 	g_slist_free (list);
 
+	/* To Translators: Default filename part saving a memo to a file when no summary is filed, the '.ics' extension is concatenated to it */
+	string = icalcomp_suggest_filename (comp_data->icalcomp, _("memo"));
 	file = e_shell_run_save_dialog (
-		shell, _("Save as iCalendar"), NULL, NULL, NULL);
+		shell, _("Save as iCalendar"), string, "*.ics:text/calendar", NULL, NULL);
+	g_free (string);
 	if (file == NULL)
 		return;
 
diff --git a/modules/calendar/e-cal-shell-view-taskpad.c b/modules/calendar/e-cal-shell-view-taskpad.c
index e011568117..c88dee0d4c 100644
--- a/modules/calendar/e-cal-shell-view-taskpad.c
+++ b/modules/calendar/e-cal-shell-view-taskpad.c
@@ -326,8 +326,11 @@ action_calendar_taskpad_save_as_cb (GtkAction *action,
 	comp_data = list->data;
 	g_slist_free (list);
 
+	/* To Translators: Default filename part saving a task to a file when no summary is filed, the '.ics' extension is concatenated to it */
+	string = icalcomp_suggest_filename (comp_data->icalcomp, _("task"));
 	file = e_shell_run_save_dialog (
-		shell, _("Save as iCalendar"), NULL, NULL, NULL);
+		shell, _("Save as iCalendar"), string, "*.ics:text/calendar", NULL, NULL);
+	g_free (string);
 	if (file == NULL)
 		return;
 
diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c
index 78531fc8ba..394d6091a4 100644
--- a/modules/calendar/e-memo-shell-view-actions.c
+++ b/modules/calendar/e-memo-shell-view-actions.c
@@ -522,8 +522,11 @@ action_memo_save_as_cb (GtkAction *action,
 	comp_data = list->data;
 	g_slist_free (list);
 
+	/* To Translators: Default filename part saving a memo to a file when no summary is filed, the '.ics' extension is concatenated to it */
+	string = icalcomp_suggest_filename (comp_data->icalcomp, _("memo"));
 	file = e_shell_run_save_dialog (
-		shell, _("Save as iCalendar"), NULL, NULL, NULL);
+		shell, _("Save as iCalendar"), string, "*.ics:text/calendar", NULL, NULL);
+	g_free (string);
 	if (file == NULL)
 		return;
 
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index f923a03f2b..6e79c23395 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -647,8 +647,11 @@ action_task_save_as_cb (GtkAction *action,
 	comp_data = list->data;
 	g_slist_free (list);
 
+	/* To Translators: Default filename part saving a task to a file when no summary is filed, the '.ics' extension is concatenated to it */
+	string = icalcomp_suggest_filename (comp_data->icalcomp, _("task"));
 	file = e_shell_run_save_dialog (
-		shell, _("Save as iCalendar"), NULL, NULL, NULL);
+		shell, _("Save as iCalendar"), string, "*.ics:text/calendar", NULL, NULL);
+	g_free (string);
 	if (file == NULL)
 		return;