Revision 2164 src/folderview.c

View differences:

folderview.c
69 69
#include "inc.h"
70 70
#include "send_message.h"
71 71
#include "virtual.h"
72
#include "plugin.h"
72 73

  
73 74
enum
74 75
{
......
1773 1774
	SET_VISIBILITY(ifactory, "/Edit search condition...",
1774 1775
		       item->stype == F_VIRTUAL);
1775 1776

  
1776

  
1777 1777
#undef SET_SENS
1778 1778
#undef SET_VISIBILITY
1779 1779

  
1780
	syl_plugin_signal_emit("folderview-menu-popup", ifactory);
1781

  
1780 1782
	gtk_menu_popup(GTK_MENU(popup), NULL, NULL, NULL, NULL,
1781 1783
		       event->button, event->time);
1782 1784

  
......
2282 2284
	if (!new_folder) return;
2283 2285
	AUTORELEASE_STR(new_folder, {g_free(new_folder); return;});
2284 2286

  
2287
#ifdef G_OS_WIN32
2288
	p = strpbrk(new_folder, "\\/:*?\"<>|");
2289
	if ((p && FOLDER_TYPE(item->folder) != F_IMAP) || (p && *p != '/') ||
2290
	    (p && p == '/' &&
2291
	     FOLDER_TYPE(item->folder) == F_IMAP && *(p + 1) != '\0')) {
2292
		alertpanel_error(_("`%c' can't be included in folder name."),
2293
				 *p);
2294
		return;
2295
	}
2296
#else
2285 2297
	p = strchr(new_folder, G_DIR_SEPARATOR);
2286 2298
	if ((p && FOLDER_TYPE(item->folder) != F_IMAP) ||
2287 2299
	    (p && FOLDER_TYPE(item->folder) == F_IMAP && *(p + 1) != '\0')) {
......
2289 2301
				 G_DIR_SEPARATOR);
2290 2302
		return;
2291 2303
	}
2304
#endif
2292 2305

  
2293 2306
	name = trim_string(new_folder, 32);
2294 2307
	AUTORELEASE_STR(name, {g_free(name); return;});

Also available in: Unified diff