Merge lp:~3v1n0/unity/gnome-file-manager-trash into lp:unity

[Marco Trevisan (Treviño)]

FileManagerOpener: moved to unity-shared and renamed as FileManager

The implementation is GnomeFileManager. Updated TrashLauncherIcon and VolumeImp.

Moved launcher/FileManagerOpener to unity-shared/FileManager, renamed the implementation to GnomeFileManager, and added another virtual method to empty the trash.
Before requesting the trash file deletion, we call the GtkApplication interface to update the application time-stamp so that the dialog will be always presented.

Using this for TrashLauncherIcon, and VolumeImp.

Added/updated tests.

[Brandon Schaefer (brandontschaefer)]

Yay for working test now. LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/CMakeLists.txt'
--- launcher/CMakeLists.txt	2013-02-27 01:16:31 +0000
+++ launcher/CMakeLists.txt	2013-03-25 15:57:22 +0000
@@ -32,7 +32,6 @@
      FavoriteStore.cpp
      FavoriteStoreGSettings.cpp
      FavoriteStorePrivate.cpp
-     FileManagerOpenerImp.cpp
      HudLauncherIcon.cpp
      Launcher.cpp
      LauncherController.cpp

=== modified file 'launcher/DeviceLauncherSection.cpp'
--- launcher/DeviceLauncherSection.cpp	2013-03-13 20:54:45 +0000
+++ launcher/DeviceLauncherSection.cpp	2013-03-25 15:57:22 +0000
@@ -20,8 +20,8 @@
 #include "DeviceLauncherSection.h"
 #include "DeviceNotificationDisplayImp.h"
 #include "DevicesSettings.h"
-#include "FileManagerOpenerImp.h"
 #include "VolumeImp.h"
+#include "unity-shared/GnomeFileManager.h"
 
 namespace unity
 {
@@ -32,7 +32,7 @@
                                              DevicesSettings::Ptr devices_settings)
   : monitor_(volume_monitor)
   , devices_settings_(devices_settings)
-  , file_manager_opener_(std::make_shared<FileManagerOpenerImp>())
+  , file_manager_(std::make_shared<GnomeFileManager>())
   , device_notification_display_(std::make_shared<DeviceNotificationDisplayImp>())
 {
   monitor_->volume_added.connect(sigc::mem_fun(this, &DeviceLauncherSection::OnVolumeAdded));
@@ -57,7 +57,7 @@
   if (map_.find(volume) != map_.end())
     return;
 
-  auto vol = std::make_shared<VolumeImp>(volume, file_manager_opener_, device_notification_display_);
+  auto vol = std::make_shared<VolumeImp>(volume, file_manager_, device_notification_display_);
   VolumeLauncherIcon::Ptr icon(new VolumeLauncherIcon(vol, devices_settings_));
 
   map_[volume] = icon;

=== modified file 'launcher/DeviceLauncherSection.h'
--- launcher/DeviceLauncherSection.h	2012-10-11 01:44:15 +0000
+++ launcher/DeviceLauncherSection.h	2013-03-25 15:57:22 +0000
@@ -26,8 +26,8 @@
 #include "AbstractVolumeMonitorWrapper.h"
 #include "DevicesSettings.h"
 #include "DeviceNotificationDisplay.h"
-#include "FileManagerOpener.h"
 #include "VolumeLauncherIcon.h"
+#include "unity-shared/FileManager.h"
 
 namespace unity
 {
@@ -53,7 +53,7 @@
   std::map<GVolume*, VolumeLauncherIcon::Ptr> map_;
   AbstractVolumeMonitorWrapper::Ptr monitor_;
   DevicesSettings::Ptr devices_settings_;
-  FileManagerOpener::Ptr file_manager_opener_;
+  FileManager::Ptr file_manager_;
   DeviceNotificationDisplay::Ptr device_notification_display_;
 };
 

=== modified file 'launcher/TrashLauncherIcon.cpp'
--- launcher/TrashLauncherIcon.cpp	2013-03-21 19:50:20 +0000
+++ launcher/TrashLauncherIcon.cpp	2013-03-25 15:57:22 +0000
@@ -25,28 +25,27 @@
 #include <glib/gi18n-lib.h>
 #include <Nux/WindowCompositor.h>
 #include <NuxCore/Logger.h>
-#include <UnityCore/GLibDBusProxy.h>
 #include <zeitgeist.h>
 
 #include "Launcher.h"
 #include "QuicklistManager.h"
 #include "QuicklistMenuItemLabel.h"
-#include "FileManagerOpenerImp.h"
+#include "unity-shared/GnomeFileManager.h"
 
 namespace unity
 {
 namespace launcher
 {
-DECLARE_LOGGER(logger, "unity.launcher.icon");
+DECLARE_LOGGER(logger, "unity.launcher.icon.trash");
 namespace
 {
   const std::string ZEITGEIST_UNITY_ACTOR = "application://compiz.desktop";
-  const std::string TRASH_URI = "trash:///";
+  const std::string TRASH_URI = "trash:";
 }
 
-TrashLauncherIcon::TrashLauncherIcon(FileManagerOpener::Ptr const& fmo)
+TrashLauncherIcon::TrashLauncherIcon(FileManager::Ptr const& fmo)
   : SimpleLauncherIcon(IconType::TRASH)
-  , file_manager_(fmo ? fmo : std::make_shared<FileManagerOpenerImp>())
+  , file_manager_(fmo ? fmo : std::make_shared<GnomeFileManager>())
 {
   tooltip_text = _("Trash");
   icon_name = "user-trash";
@@ -86,12 +85,8 @@
   dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, !empty_);
   dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
   empty_activated_signal_.Connect(menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-  [this] (DbusmenuMenuitem*, unsigned) {
-    auto proxy = std::make_shared<glib::DBusProxy>("org.gnome.Nautilus", "/org/gnome/Nautilus",
-                                                   "org.gnome.Nautilus.FileOperations");
-
-    // Passing the proxy to the lambda we ensure that it will be destroyed when needed
-    proxy->CallBegin("EmptyTrash", nullptr, [proxy] (GVariant*, glib::Error const&) {});
+  [this] (DbusmenuMenuitem*, unsigned timestamp) {
+    file_manager_->EmptyTrash(timestamp);
   });
 
   result.push_back(menu_item);

=== modified file 'launcher/TrashLauncherIcon.h'
--- launcher/TrashLauncherIcon.h	2013-03-21 19:50:20 +0000
+++ launcher/TrashLauncherIcon.h	2013-03-25 15:57:22 +0000
@@ -26,7 +26,7 @@
 
 #include "DndData.h"
 #include "SimpleLauncherIcon.h"
-#include "FileManagerOpener.h"
+#include "unity-shared/FileManager.h"
 
 namespace unity
 {
@@ -35,9 +35,8 @@
 
 class TrashLauncherIcon : public SimpleLauncherIcon
 {
-
 public:
-  TrashLauncherIcon(FileManagerOpener::Ptr const& = nullptr);
+  TrashLauncherIcon(FileManager::Ptr const& = nullptr);
 
 protected:
   void UpdateTrashIcon();
@@ -55,7 +54,7 @@
   static void UpdateTrashIconCb(GObject* source, GAsyncResult* res, gpointer data);
 
   bool empty_;
-  FileManagerOpener::Ptr file_manager_;
+  FileManager::Ptr file_manager_;
   glib::Cancellable cancellable_;
   glib::Object<GFileMonitor> trash_monitor_;
   glib::Signal<void, GFileMonitor*, GFile*, GFile*, GFileMonitorEvent> trash_changed_signal_;

=== modified file 'launcher/VolumeImp.cpp'
--- launcher/VolumeImp.cpp	2013-03-21 19:52:02 +0000
+++ launcher/VolumeImp.cpp	2013-03-25 15:57:22 +0000
@@ -36,13 +36,13 @@
 {
 public:
   Impl(glib::Object<GVolume> const& volume,
-       FileManagerOpener::Ptr const& file_manager_opener,
+       FileManager::Ptr const& file_manager,
        DeviceNotificationDisplay::Ptr const& device_notification_display,
        VolumeImp* parent)
     : parent_(parent)
     , open_timestamp_(0)
     , volume_(volume)
-    , file_manager_opener_(file_manager_opener)
+    , file_manager_(file_manager)
     , device_notification_display_(device_notification_display)
   {
     signal_volume_changed_.Connect(volume_, "changed", [this] (GVolume*) {
@@ -167,7 +167,7 @@
 
   void OpenInFileManager()
   {
-    file_manager_opener_->Open(GetUri(), open_timestamp_);
+    file_manager_->Open(GetUri(), open_timestamp_);
   }
 
   std::string GetUri()
@@ -216,7 +216,7 @@
   unsigned long long open_timestamp_;
   glib::Cancellable cancellable_;
   glib::Object<GVolume> volume_;
-  FileManagerOpener::Ptr file_manager_opener_;
+  FileManager::Ptr file_manager_;
   DeviceNotificationDisplay::Ptr device_notification_display_;
 
   glib::Signal<void, GVolume*> signal_volume_changed_;
@@ -228,9 +228,9 @@
 //
 
 VolumeImp::VolumeImp(glib::Object<GVolume> const& volume,
-                     FileManagerOpener::Ptr const& file_manager_opener,
+                     FileManager::Ptr const& file_manager,
                      DeviceNotificationDisplay::Ptr const& device_notification_display)
-  : pimpl(new Impl(volume, file_manager_opener, device_notification_display, this))
+  : pimpl(new Impl(volume, file_manager, device_notification_display, this))
 {}
 
 VolumeImp::~VolumeImp()

=== modified file 'launcher/VolumeImp.h'
--- launcher/VolumeImp.h	2013-03-13 20:54:45 +0000
+++ launcher/VolumeImp.h	2013-03-25 15:57:22 +0000
@@ -25,8 +25,8 @@
 #include <UnityCore/GLibWrapper.h>
 
 #include "DeviceNotificationDisplay.h"
-#include "FileManagerOpener.h"
 #include "Volume.h"
+#include "unity-shared/FileManager.h"
 
 namespace unity
 {
@@ -39,7 +39,7 @@
   typedef std::shared_ptr<VolumeImp> Ptr;
 
   VolumeImp(glib::Object<GVolume> const& volume,
-            FileManagerOpener::Ptr const& file_manager_opener,
+            FileManager::Ptr const& file_manager,
             DeviceNotificationDisplay::Ptr const& device_notification_display);
   virtual ~VolumeImp();
 

=== added file 'tests/test_mock_filemanager.h'
--- tests/test_mock_filemanager.h	1970-01-01 00:00:00 +0000
+++ tests/test_mock_filemanager.h	2013-03-25 15:57:22 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the  Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Marco Trevisan (Treviño) <[e-mail]>
+ */
+
+#ifndef TEST_MOCK_FILEMANAGER_H
+#define TEST_MOCK_FILEMANAGER_H
+
+#include "FileManager.h"
+
+namespace unity
+{
+
+struct MockFileManager : FileManager
+{
+  typedef std::shared_ptr<MockFileManager> Ptr;
+
+  MOCK_METHOD2(Open, void(std::string const& uri, unsigned long long time));
+  MOCK_METHOD1(EmptyTrash, void(unsigned long long time));
+};
+
+}
+
+#endif
\ No newline at end of file

=== modified file 'tests/test_trash_launcher_icon.cpp'
--- tests/test_trash_launcher_icon.cpp	2013-03-14 00:17:36 +0000
+++ tests/test_trash_launcher_icon.cpp	2013-03-25 15:57:22 +0000
@@ -20,25 +20,22 @@
 #include <gmock/gmock.h>
 
 #include "TrashLauncherIcon.h"
+#include "test_mock_filemanager.h"
 
 using namespace unity;
 using namespace unity::launcher;
 
 namespace
 {
-struct MockFileManagerOpener : launcher::FileManagerOpener
-{
-  MOCK_METHOD2(Open, void(std::string const& uri, unsigned long long time));
-};
 
 struct TestTrashLauncherIcon : testing::Test
 {
   TestTrashLauncherIcon()
-    : fmo_(std::make_shared<MockFileManagerOpener>())
-    , icon(fmo_)
+    : fm_(std::make_shared<MockFileManager>())
+    , icon(fm_)
   {}
 
-  std::shared_ptr<MockFileManagerOpener> fmo_;
+  MockFileManager::Ptr fm_;
   TrashLauncherIcon icon;
 };
 
@@ -50,8 +47,26 @@
 TEST_F(TestTrashLauncherIcon, Activate)
 {
   unsigned long long time = g_random_int();
-  EXPECT_CALL(*fmo_, Open("trash:///", time));
+  EXPECT_CALL(*fm_, Open("trash:", time));
   icon.Activate(ActionArg(ActionArg::Source::LAUNCHER, 0, time));
 }
 
+TEST_F(TestTrashLauncherIcon, Quicklist)
+{
+  auto const& menus = icon.Menus();
+  EXPECT_EQ(menus.size(), 1);
+}
+
+TEST_F(TestTrashLauncherIcon, QuicklistEmptyTrash)
+{
+  auto const& menus = icon.Menus();
+  ASSERT_EQ(menus.size(), 1);
+
+  auto const& empty_trash_menu = menus.front();
+
+  unsigned time = g_random_int();
+  EXPECT_CALL(*fm_, EmptyTrash(time));
+  dbusmenu_menuitem_handle_event(empty_trash_menu, DBUSMENU_MENUITEM_EVENT_ACTIVATED, nullptr, time);
+}
+
 }

=== modified file 'tests/test_volume_imp.cpp'
--- tests/test_volume_imp.cpp	2013-03-13 20:54:45 +0000
+++ tests/test_volume_imp.cpp	2013-03-25 15:57:22 +0000
@@ -26,19 +26,12 @@
 #include "gmockvolume.h"
 #include "launcher/VolumeImp.h"
 #include "test_utils.h"
+#include "test_mock_filemanager.h"
 using namespace unity;
 
 namespace
 {
 
-class MockFileManagerOpener : public launcher::FileManagerOpener
-{
-public:
-  typedef std::shared_ptr<MockFileManagerOpener> Ptr;
-
-  MOCK_METHOD2(Open, void(std::string const& uri, unsigned long long time));
-};
-
 class MockDeviceNotificationDisplay : public launcher::DeviceNotificationDisplay
 {
 public:
@@ -53,14 +46,14 @@
   void SetUp()
   {
     gvolume_ = g_mock_volume_new();
-    file_manager_opener_.reset(new MockFileManagerOpener);
+    file_manager_.reset(new MockFileManager);
     device_notification_display_.reset(new MockDeviceNotificationDisplay);
     volume_.reset(new launcher::VolumeImp(glib::Object<GVolume>(G_VOLUME(gvolume_.RawPtr()), glib::AddRef()),
-                                          file_manager_opener_, device_notification_display_));
+                                          file_manager_, device_notification_display_));
   }
 
   glib::Object<GMockVolume> gvolume_;
-  MockFileManagerOpener::Ptr file_manager_opener_;
+  MockFileManager::Ptr file_manager_;
   MockDeviceNotificationDisplay::Ptr device_notification_display_;
   launcher::VolumeImp::Ptr volume_;
 };
@@ -129,14 +122,14 @@
 TEST_F(TestVolumeImp, TestMountAndOpenInFileManager)
 {
   unsigned long long time = g_random_int();
-  EXPECT_CALL(*file_manager_opener_, Open(ROOT_FILE_URI, time));
+  EXPECT_CALL(*file_manager_, Open(ROOT_FILE_URI, time));
 
   volume_->MountAndOpenInFileManager(time);
   EXPECT_EQ(g_mock_volume_last_mount_had_mount_operation(gvolume_), TRUE);
   EXPECT_TRUE(volume_->IsMounted());
 
   time = g_random_int();
-  EXPECT_CALL(*file_manager_opener_, Open(ROOT_FILE_URI, time));
+  EXPECT_CALL(*file_manager_, Open(ROOT_FILE_URI, time));
 
   volume_->MountAndOpenInFileManager(time);
   EXPECT_EQ(g_mock_volume_last_mount_had_mount_operation(gvolume_), TRUE);

=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2013-02-01 20:30:27 +0000
+++ unity-shared/CMakeLists.txt	2013-03-25 15:57:22 +0000
@@ -26,6 +26,7 @@
      DebugDBusInterface.cpp
      DefaultThumbnailProvider.cpp
      DeltaRestrainment.cpp
+     GnomeFileManager.cpp
      FontSettings.cpp
      GraphicsUtils.cpp
      IMTextEntry.cpp

=== renamed file 'launcher/FileManagerOpener.h' => 'unity-shared/FileManager.h'
--- launcher/FileManagerOpener.h	2013-03-13 20:54:45 +0000
+++ unity-shared/FileManager.h	2013-03-25 15:57:22 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2012 Canonical Ltd
+ * Copyright (C) 2012-2013 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -15,34 +15,33 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Andrea Azzarone <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
-#ifndef UNITYSHELL_FILEMANAGER_OPENER_H
-#define UNITYSHELL_FILEMANAGER_OPENER_H
+#ifndef UNITYSHELL_FILEMANAGER_H
+#define UNITYSHELL_FILEMANAGER_H
 
 #include <memory>
 #include <string>
 
 namespace unity
 {
-namespace launcher
-{
 
-class FileManagerOpener
+class FileManager
 {
 public:
-  typedef std::shared_ptr<FileManagerOpener> Ptr;
+  typedef std::shared_ptr<FileManager> Ptr;
 
-  FileManagerOpener() = default;
-  virtual ~FileManagerOpener() {}
+  FileManager() = default;
+  virtual ~FileManager() {}
   virtual void Open(std::string const& uri, unsigned long long timestamp = 0) = 0;
+  virtual void EmptyTrash(unsigned long long timestamp = 0) = 0;
 
 private:
-  FileManagerOpener(FileManagerOpener const&) = delete;
-  FileManagerOpener& operator=(FileManagerOpener const&) = delete;
+  FileManager(FileManager const&) = delete;
+  FileManager& operator=(FileManager const&) = delete;
 };
 
 }
-}
 
 #endif

=== renamed file 'launcher/FileManagerOpenerImp.cpp' => 'unity-shared/GnomeFileManager.cpp'
--- launcher/FileManagerOpenerImp.cpp	2013-03-13 20:54:45 +0000
+++ unity-shared/GnomeFileManager.cpp	2013-03-25 15:57:22 +0000
@@ -18,19 +18,24 @@
  *              Marco Trevisan <[e-mail]>
  */
 
-#include "FileManagerOpenerImp.h"
+#include "GnomeFileManager.h"
 #include <NuxCore/Logger.h>
 #include <UnityCore/GLibWrapper.h>
+#include <UnityCore/GLibDBusProxy.h>
 #include <gdk/gdk.h>
+#include <gio/gio.h>
 
 namespace unity
 {
-namespace launcher
+
+namespace
 {
-
-DECLARE_LOGGER(logger, "unity.launcher.filemanager.opener.imp");
-
-void FileManagerOpenerImp::Open(std::string const& uri, unsigned long long timestamp)
+DECLARE_LOGGER(logger, "unity.filemanager.gnome");
+
+const std::string TRASH_URI = "trash:";
+}
+
+void GnomeFileManager::Open(std::string const& uri, unsigned long long timestamp)
 {
   if (uri.empty())
   {
@@ -54,5 +59,49 @@
   }
 }
 
-}
+void GnomeFileManager::Activate(unsigned long long timestamp)
+{
+  glib::Cancellable cancellable;
+  glib::Object<GFile> file(g_file_new_for_uri(TRASH_URI.c_str()));
+  glib::Object<GAppInfo> app_info(g_file_query_default_handler(file, cancellable, nullptr));
+
+  if (app_info)
+  {
+    GdkDisplay* display = gdk_display_get_default();
+    glib::Object<GdkAppLaunchContext> context(gdk_display_get_app_launch_context(display));
+
+    if (timestamp > 0)
+      gdk_app_launch_context_set_timestamp(context, timestamp);
+
+    auto const& gcontext = glib::object_cast<GAppLaunchContext>(context);
+    auto proxy = std::make_shared<glib::DBusProxy>("org.gnome.NautilusApplication",
+                                                   "/org/gnome/NautilusApplication",
+                                                   "org.gtk.Application");
+
+    glib::String context_string(g_app_launch_context_get_startup_notify_id(gcontext, app_info, nullptr));
+
+    if (context_string && g_utf8_validate(context_string, -1, nullptr))
+    {
+      GVariantBuilder builder;
+      g_variant_builder_init(&builder, G_VARIANT_TYPE("a{sv}"));
+      g_variant_builder_add(&builder, "{sv}", "desktop-startup-id", g_variant_new("s", context_string.Value()));
+      GVariant *param = g_variant_new("(@a{sv})", g_variant_builder_end(&builder));
+
+      // Passing the proxy to the lambda we ensure that it will be destroyed when needed
+      proxy->CallBegin("Activate", param, [proxy] (GVariant*, glib::Error const&) {});
+    }
+  }
+}
+
+void GnomeFileManager::EmptyTrash(unsigned long long timestamp)
+{
+  Activate(timestamp);
+
+  auto proxy = std::make_shared<glib::DBusProxy>("org.gnome.Nautilus", "/org/gnome/Nautilus",
+                                                 "org.gnome.Nautilus.FileOperations");
+
+  // Passing the proxy to the lambda we ensure that it will be destroyed when needed
+  proxy->CallBegin("EmptyTrash", nullptr, [proxy] (GVariant*, glib::Error const&) {});
+}
+
 }

=== renamed file 'launcher/FileManagerOpenerImp.h' => 'unity-shared/GnomeFileManager.h'
--- launcher/FileManagerOpenerImp.h	2013-03-13 20:54:45 +0000
+++ unity-shared/GnomeFileManager.h	2013-03-25 15:57:22 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2012 Canonical Ltd
+ * Copyright (C) 2012-2013 Canonical Ltd
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -15,25 +15,27 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Andrea Azzarone <[e-mail]>
+ *              Marco Trevisan <[e-mail]>
  */
 
-#ifndef UNITYSHELL_FILEMANAGER_OPENER_IMP_H
-#define UNITYSHELL_FILEMANAGER_OPENER_IMP_H
+#ifndef UNITYSHELL_GNOME_FILEMANAGER_H
+#define UNITYSHELL_GNOME_FILEMANAGER_H
 
-#include "FileManagerOpener.h"
+#include "FileManager.h"
 
 namespace unity
 {
-namespace launcher
-{
 
-class FileManagerOpenerImp : public FileManagerOpener
+class GnomeFileManager : public FileManager
 {
 public:
-  virtual void Open(std::string const& uri, unsigned long long timestamp);
+  void Open(std::string const& uri, unsigned long long timestamp);
+  void EmptyTrash(unsigned long long timestamp);
+
+private:
+  void Activate(unsigned long long timestamp);
 };
 
 }
-}
 
 #endif