From 0552e5bda773b485d440a1e3f174cd8bff08fc33 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 14 Jun 2011 17:29:01 -0600
Subject: [PATCH] Nook2 driver: Dont put news in News subfolder

---
 src/calibre/devices/nook/driver.py  | 1 +
 src/calibre/devices/usbms/device.py | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/calibre/devices/nook/driver.py b/src/calibre/devices/nook/driver.py
index 2fe8f667b0..9c8f882f3d 100644
--- a/src/calibre/devices/nook/driver.py
+++ b/src/calibre/devices/nook/driver.py
@@ -88,6 +88,7 @@ class NOOK_COLOR(NOOK):
 
     WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'EBOOK_DISK'
     EBOOK_DIR_MAIN = 'My Files'
+    NEWS_IN_FOLDER = False
 
     def upload_cover(self, path, filename, metadata, filepath):
         pass
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index f0090989d9..442f3701c4 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -101,6 +101,9 @@ class Device(DeviceConfig, DevicePlugin):
     #: The maximum length of paths created on the device
     MAX_PATH_LEN = 250
 
+    #: Put news in its own folder
+    NEWS_IN_FOLDER = True
+
     def reset(self, key='-1', log_packets=False, report_progress=None,
             detected_device=None):
         self._main_prefix = self._card_a_prefix = self._card_b_prefix = None
@@ -946,7 +949,8 @@ class Device(DeviceConfig, DevicePlugin):
             extra_components = []
             tag = special_tag
             if tag.startswith(_('News')):
-                extra_components.append('News')
+                if self.NEWS_IN_FOLDER:
+                    extra_components.append('News')
             else:
                 for c in tag.split('/'):
                     c = sanitize(c)