fixed a typo. code cleanup.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2907 ee746299-78ed-0310-b773-934348b2243d

4 files changed, 19 insertions, 68 deletions

diff --git a/src/mimeview.c b/src/mimeview.c
index 8fe0a8fd..fffd508a 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1071,21 +1071,7 @@ void mimeview_save_as(MimeView *mimeview)
 	partinfo = mimeview_get_selected_part(mimeview);
 	g_return_if_fail(partinfo != NULL);
 
-	if (partinfo->filename)
-		defname = partinfo->filename;
-	else if (partinfo->name) {
-		Xstrdup_a(defname, partinfo->name, return);
-		subst_for_filename(defname);
-	}
-
-	filename = filesel_save_as(defname);
-	if (!filename) return;
-
-	if (procmime_get_part(filename, mimeview->file, partinfo) < 0)
-		alertpanel_error
-			(_("Can't save the part of multipart message."));
-
-	g_free(filename);
+	mimeview_save_part_as(mimeview, partinfo);
 }
 
 void mimeview_save_all(MimeView *mimeview)
@@ -1137,7 +1123,7 @@ void mimeview_print(MimeView *mimeview)
 	}
 }
 
-void mimeview_lauhch_part(MimeView *mimeview, MimeInfo *partinfo)
+void mimeview_launch_part(MimeView *mimeview, MimeInfo *partinfo)
 {
 	gchar *filename;
 
@@ -1198,21 +1184,22 @@ void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo)
 
 void mimeview_save_part_as(MimeView *mimeview, MimeInfo *partinfo)
 {
-	gchar *filename;
+	gchar *filename = NULL;
 	gchar *defname = NULL;
 
 	g_return_if_fail(partinfo != NULL);
 
 	if (!mimeview->file) return;
 
-	if (partinfo->filename)
-		defname = partinfo->filename;
-	else if (partinfo->name) {
-		Xstrdup_a(defname, partinfo->name, return);
+	if (partinfo->filename) {
+		filename = filesel_save_as(partinfo->filename);
+	} else if (partinfo->name) {
+		defname = g_strdup(partinfo->name);
 		subst_for_filename(defname);
+		filename = filesel_save_as(defname);
+		g_free(defname);
 	}
 
-	filename = filesel_save_as(defname);
 	if (!filename) return;
 
 	if (procmime_get_part(filename, mimeview->file, partinfo) < 0)
@@ -1233,15 +1220,7 @@ static void mimeview_launch(MimeView *mimeview)
 	partinfo = mimeview_get_selected_part(mimeview);
 	g_return_if_fail(partinfo != NULL);
 
-	filename = procmime_get_tmp_file_name(partinfo);
-
-	if (procmime_get_part(filename, mimeview->file, partinfo) < 0)
-		alertpanel_error
-			(_("Can't save the part of multipart message."));
-	else
-		mimeview_view_file(filename, partinfo, NULL);
-
-	g_free(filename);
+	mimeview_launch_part(mimeview, partinfo);
 }
 
 static void mimeview_open_with(MimeView *mimeview)
@@ -1256,35 +1235,7 @@ static void mimeview_open_with(MimeView *mimeview)
 	partinfo = mimeview_get_selected_part(mimeview);
 	g_return_if_fail(partinfo != NULL);
 
-	filename = procmime_get_tmp_file_name(partinfo);
-
-	if (procmime_get_part(filename, mimeview->file, partinfo) < 0) {
-		alertpanel_error
-			(_("Can't save the part of multipart message."));
-		g_free(filename);
-		return;
-	}
-
-	if (!prefs_common.mime_open_cmd_history)
-		prefs_common.mime_open_cmd_history =
-			add_history(NULL, prefs_common.mime_open_cmd);
-
-	cmd = input_dialog_combo
-		(_("Open with"),
-		 _("Enter the command line to open file:\n"
-		   "(`%s' will be replaced with file name)"),
-		 prefs_common.mime_open_cmd,
-		 prefs_common.mime_open_cmd_history,
-		 TRUE);
-	if (cmd) {
-		mimeview_view_file(filename, partinfo, cmd);
-		g_free(prefs_common.mime_open_cmd);
-		prefs_common.mime_open_cmd = cmd;
-		prefs_common.mime_open_cmd_history =
-			add_history(prefs_common.mime_open_cmd_history, cmd);
-	}
-
-	g_free(filename);
+	mimeview_open_part_with(mimeview, partinfo);
 }
 
 static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
diff --git a/src/mimeview.h b/src/mimeview.h
index f5742c8d..1dca1a19 100644
--- a/src/mimeview.h
+++ b/src/mimeview.h
@@ -94,7 +94,7 @@ void mimeview_save_all			(MimeView	*mimeview);
 
 void mimeview_print			(MimeView	*mimeview);
 
-void mimeview_lauhch_part		(MimeView	*mimeview,
+void mimeview_launch_part		(MimeView	*mimeview,
 					 MimeInfo	*partinfo);
 void mimeview_open_part_with		(MimeView	*mimeview,
 					 MimeInfo	*partinfo);
diff --git a/src/summaryview.c b/src/summaryview.c
index 21c3b1b7..4543cd76 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1995,11 +1995,11 @@ static void summary_update_display_state(SummaryView *summaryview,
 
 static guint attract_hash_func(gconstpointer key)
 {
-	gchar *str;
+	gchar str[BUFFSIZE];
 	gchar *p;
 	guint h;
 
-	Xstrdup_a(str, (const gchar *)key, return 0);
+	strncpy2(str, (const gchar *)key, sizeof(str));
 	trim_subject_for_compare(str);
 
 	p = str;
@@ -2417,9 +2417,9 @@ static void summary_set_row(SummaryView *summaryview, GtkTreeIter *iter,
 	else
 		date_s = _("(No Date)");
 	if (prefs_common.swap_from && msginfo->from && msginfo->to) {
-		gchar *from;
+		gchar from[BUFFSIZE];
 
-		Xstrdup_a(from, msginfo->from, return);
+		strncpy2(from, msginfo->from, sizeof(from));
 		extract_address(from);
 		if (account_address_exist(from))
 			sw_from_s = g_strconcat("-->", msginfo->to, NULL);
@@ -3764,7 +3764,7 @@ void summary_add_address(SummaryView *summaryview)
 {
 	GtkTreeIter iter;
 	MsgInfo *msginfo = NULL;
-	gchar *from;
+	gchar from[BUFFSIZE];
 
 	if (!summaryview->selected) return;
 
@@ -3774,7 +3774,7 @@ void summary_add_address(SummaryView *summaryview)
 		return;
 
 	GET_MSG_INFO(msginfo, &iter);
-	Xstrdup_a(from, msginfo->from, return);
+	strncpy2(from, msginfo->from, sizeof(from));
 	eliminate_address_comment(from);
 	extract_address(from);
 	addressbook_add_contact(msginfo->fromname, from, NULL);
diff --git a/src/textview.c b/src/textview.c
index 89b58d2e..8c16942a 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -768,7 +768,7 @@ static void textview_part_menu_activated(GtkWidget *widget, gpointer data)
 
 	switch (type) {
 	case PART_MENU_OPEN:
-		mimeview_lauhch_part(mimeview, mimeinfo);
+		mimeview_launch_part(mimeview, mimeinfo);
 		break;
 	case PART_MENU_OPEN_WITH:
 		mimeview_open_part_with(mimeview, mimeinfo);