fixed renaming of virtual folders.

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

4 files changed, 66 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index f53f1638..5191707e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2006-01-12
 
+	* libsylph/virtual.c: virtual_rename_folder(): added.
+	* src/folderview.c: folderview_rename_folder_cb(): fixed renaming of
+	  virtual folders.
+	  folderview_move_folder_cb(): don't allow a virtual folder as parent.
+	  folderview_menu_popup(): enabled rename/delete of virtual folders
+	  on newsgroups.
+
+2006-01-12
+
 	* src/folderview.c: replace "Search messages..." with "Edit search
 	  condition..." menu on virtual folder.
 	  folderview_menu_popup(): code cleanup.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index cec9f0d7..2e99e50d 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,15 @@
 2006-01-12
 
+	* libsylph/virtual.c: virtual_rename_folder(): 追加。
+	* src/folderview.c: folderview_rename_folder_cb(): 仮想フォルダの
+	  名前変更を修正。
+	  folderview_move_folder_cb(): 仮想フォルダを親として許可しないように
+	  した。
+	  folderview_menu_popup(): ニュースグループ上で仮想フォルダの名称変更/
+	  削除を可能にした。
+
+2006-01-12
+
 	* src/folderview.c: 検索フォルダでは「メッセージを検索...」を
 	  「検索条件の編集...」メニューで置き換えるようにした。
 
diff --git a/libsylph/virtual.c b/libsylph/virtual.c
index c6449196..9d9de5b7 100644
--- a/libsylph/virtual.c
+++ b/libsylph/virtual.c
@@ -36,6 +36,7 @@
 
 #include "folder.h"
 #include "virtual.h"
+#include "mh.h"
 #include "procmsg.h"
 #include "procheader.h"
 #include "filter.h"
@@ -102,6 +103,9 @@ static gint    virtual_close		(Folder		*folder,
 static gint    virtual_scan_folder	(Folder		*folder,
 					 FolderItem	*item);
 
+static gint    virtual_rename_folder	(Folder		*folder,
+					 FolderItem	*item,
+					 const gchar	*name);
 static gint    virtual_remove_folder	(Folder		*folder,
 					 FolderItem	*item);
 
@@ -132,7 +136,7 @@ static FolderClass virtual_class =
 	virtual_scan_folder,
 
 	NULL,
-	NULL,
+	virtual_rename_folder,
 	NULL,
 	virtual_remove_folder,
 };
@@ -543,6 +547,15 @@ static gint virtual_scan_folder(Folder *folder, FolderItem *item)
 	return 0;
 }
 
+static gint virtual_rename_folder(Folder *folder, FolderItem *item,
+				  const gchar *name)
+{
+	g_return_val_if_fail(item != NULL, -1);
+	g_return_val_if_fail(item->stype == F_VIRTUAL, -1);
+
+	return mh_get_class()->rename_folder(folder, item, name);
+}
+
 static gint virtual_remove_folder(Folder *folder, FolderItem *item)
 {
 	gchar *path;
diff --git a/src/folderview.c b/src/folderview.c
index a14b5ef9..c7a5ab3c 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -284,6 +284,8 @@ static GtkItemFactoryEntry folderview_news_popup_entries[] =
 	{N_("/Su_bscribe to newsgroup..."),
 					NULL, folderview_new_news_group_cb, 0, NULL},
 	{N_("/_Remove newsgroup"),	NULL, folderview_rm_news_group_cb, 0, NULL},
+	{N_("/_Rename folder..."),	NULL, folderview_rename_folder_cb, 0, NULL},
+	{N_("/_Delete folder"),		NULL, folderview_delete_folder_cb, 0, NULL},
 	{N_("/---"),			NULL, NULL, 0, "<Separator>"},
 	{N_("/Down_load"),		NULL, folderview_download_cb, 0, NULL},
 	{N_("/---"),			NULL, NULL, 0, "<Separator>"},
@@ -1614,7 +1616,8 @@ static gboolean folderview_menu_popup(FolderView *folderview,
 		}
 		if (FOLDER_TYPE(folder) == F_IMAP ||
 		    FOLDER_TYPE(folder) == F_NEWS) {
-			if (item->parent != NULL && item->no_select == FALSE)
+			if (item->parent != NULL && item->no_select == FALSE &&
+			    item->stype != F_VIRTUAL)
 				download_msg = TRUE;
 		}
 	}
@@ -1665,8 +1668,18 @@ static gboolean folderview_menu_popup(FolderView *folderview,
 	SET_SENS(ifactory, "/Search messages...", search_folder);
 	SET_SENS(ifactory, "/Edit search condition...", search_folder);
 	SET_SENS(ifactory, "/Properties...", folder_property);
-	SET_SENS(ifactory, "/Subscribe to newsgroup...", new_folder);
-	SET_SENS(ifactory, "/Remove newsgroup", delete_folder);
+
+	if (FOLDER_TYPE(folder) == F_NEWS) {
+		SET_SENS(ifactory, "/Subscribe to newsgroup...", new_folder);
+		SET_SENS(ifactory, "/Remove newsgroup", delete_folder);
+		SET_VISIBILITY(ifactory, "/Remove newsgroup",
+			       item->stype != F_VIRTUAL);
+		SET_VISIBILITY(ifactory, "/Rename folder...",
+			       item->stype == F_VIRTUAL);
+		SET_VISIBILITY(ifactory, "/Delete folder",
+			       item->stype == F_VIRTUAL);
+	}
+
 	SET_VISIBILITY(ifactory, "/Search messages...",
 		       item->stype != F_VIRTUAL);
 	SET_VISIBILITY(ifactory, "/Edit search condition...",
@@ -2000,6 +2013,8 @@ static void folderview_download_cb(FolderView *folderview, guint action,
 	item = folderview_get_selected_item(folderview);
 	if (!item)
 		return;
+	if (item->stype == F_VIRTUAL)
+		return;
 
 	g_return_if_fail(item->folder != NULL);
 
@@ -2171,8 +2186,19 @@ static void folderview_rename_folder_cb(FolderView *folderview, guint action,
 	Xstrdup_a(old_path, item->path, {g_free(new_folder); return;});
 	old_id = folder_item_get_identifier(item);
 
-	if (item->folder->klass->rename_folder(item->folder, item,
-					       new_folder) < 0) {
+	if (item->stype == F_VIRTUAL) {
+		if (virtual_get_class()->rename_folder(item->folder, item,
+						       new_folder) < 0) {
+			alertpanel_error(_("Can't rename the folder '%s'."),
+					 item->name);
+			g_free(old_id);
+			gtk_tree_path_free(sel_path);
+			return;
+		}
+	} else if (item->folder->klass->rename_folder(item->folder, item,
+						      new_folder) < 0) {
+		alertpanel_error(_("Can't rename the folder '%s'."),
+				 item->name);
 		g_free(old_id);
 		gtk_tree_path_free(sel_path);
 		return;
@@ -2230,15 +2256,8 @@ static void folderview_move_folder_cb(FolderView *folderview, guint action,
 
 	new_parent = foldersel_folder_sel(item->folder, FOLDER_SEL_MOVE_FOLDER,
 					  NULL);
-	if (!new_parent) {
-		gtk_tree_path_free(sel_path);
-		return;
-	}
-	if (new_parent->folder != item->folder) {
-		gtk_tree_path_free(sel_path);
-		return;
-	}
-	if (new_parent == item->parent) {
+	if (!new_parent || new_parent->folder != item->folder ||
+	    new_parent == item->parent || new_parent->stype == F_VIRTUAL) {
 		gtk_tree_path_free(sel_path);
 		return;
 	}