Merge lp:~azzar1/unity/fix-808162 into lp:unity

[Andrea Azzarone]

Used Nautilus 3 DBus interface to fix bug #808162 and after all to have a clener file TrashLauncherIcon.cpp. Because the file is not so big i've uploaded the c++ style.

[Gord Allott (gordallott)]

looks good to me, works well, thanks :)

review: Approve

=== modified file 'plugins/unityshell/src/TrashLauncherIcon.cpp'
--- plugins/unityshell/src/TrashLauncherIcon.cpp	2011-08-09 17:29:42 +0000
+++ plugins/unityshell/src/TrashLauncherIcon.cpp	2011-08-19 15:49:33 +0000
@@ -15,25 +15,23 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Jason Smith <[e-mail]>
+ *              Andrea Azzarone <[e-mail]>
  */
 
 #include "TrashLauncherIcon.h"
 
+#include <glib/gi18n-lib.h>
 #include <Nux/WindowCompositor.h>
 
-#include <gio/gio.h>
-#include <glib/gi18n-lib.h>
-#include <gconf/gconf-client.h>
-
 #include "Launcher.h"
 #include "QuicklistManager.h"
 #include "QuicklistMenuItemLabel.h"
 
-
-#define ASK_CONFIRMATION_KEY "/apps/nautilus/preferences/confirm_trash"
+namespace unity {
 
 TrashLauncherIcon::TrashLauncherIcon(Launcher* IconManager)
-  :   SimpleLauncherIcon(IconManager)
+  : SimpleLauncherIcon(IconManager)
+  , proxy_("org.gnome.Nautilus", "/org/gnome/Nautilus", "org.gnome.Nautilus.FileOperations")
 {
   tooltip_text = _("Trash");
   SetIconName("user-trash");
@@ -41,55 +39,40 @@
   SetQuirk(QUIRK_RUNNING, false);
   SetIconType(TYPE_TRASH);
   SetShortcut('t');
-  _confirm_dialog = NULL;
-  _on_confirm_dialog_close_id = 0;
-
-  GFile* location = g_file_new_for_uri("trash:///");
-
-  m_TrashMonitor = g_file_monitor_directory(location,
+  
+  glib::Object<GFile> location(g_file_new_for_uri("trash:///"));
+
+  trash_monitor_ = g_file_monitor_directory(location,
                                             G_FILE_MONITOR_NONE,
                                             NULL,
                                             NULL);
 
-  _on_trash_changed_handler_id = g_signal_connect(m_TrashMonitor,
+  on_trash_changed_handler_id_ = g_signal_connect(trash_monitor_,
                                                   "changed",
                                                   G_CALLBACK(&TrashLauncherIcon::OnTrashChanged),
                                                   this);
 
   UpdateTrashIcon();
-
-  g_object_unref(location);
 }
 
 TrashLauncherIcon::~TrashLauncherIcon()
 {
-  if (_on_trash_changed_handler_id != 0)
-    g_signal_handler_disconnect((gpointer) m_TrashMonitor,
-                                _on_trash_changed_handler_id);
-
-  g_object_unref(m_TrashMonitor);
-
-  if (_on_confirm_dialog_close_id)
-    g_signal_handler_disconnect((gpointer) _confirm_dialog, _on_confirm_dialog_close_id);
-
-  if (_confirm_dialog)
-    gtk_widget_destroy(_confirm_dialog);
-}
-
-nux::Color
-TrashLauncherIcon::BackgroundColor()
-{
-  return nux::Color(0xFF333333);
-}
-
-nux::Color
-TrashLauncherIcon::GlowColor()
-{
-  return nux::Color(0xFF333333);
-}
-
-std::list<DbusmenuMenuitem*>
-TrashLauncherIcon::GetMenus()
+  if (on_trash_changed_handler_id_ != 0)
+    g_signal_handler_disconnect((gpointer) trash_monitor_,
+                                on_trash_changed_handler_id_);
+}
+
+nux::Color TrashLauncherIcon::BackgroundColor()
+{
+  return nux::Color(0xFF333333);
+}
+
+nux::Color TrashLauncherIcon::GlowColor()
+{
+  return nux::Color(0xFF333333);
+}
+
+std::list<DbusmenuMenuitem*> TrashLauncherIcon::GetMenus()
 {
   std::list<DbusmenuMenuitem*> result;
   DbusmenuMenuitem* menu_item;
@@ -99,7 +82,7 @@
   g_object_ref(menu_item);
 
   dbusmenu_menuitem_property_set(menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Empty Trash..."));
-  dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, !_empty);
+  dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, !empty_);
   dbusmenu_menuitem_property_set_bool(menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
 
   g_signal_connect(menu_item,
@@ -110,124 +93,21 @@
   return result;
 }
 
-void
-TrashLauncherIcon::ActivateLauncherIcon(ActionArg arg)
+void TrashLauncherIcon::ActivateLauncherIcon(ActionArg arg)
 {
-  GError* error = NULL;
+  glib::Error error;
 
   g_spawn_command_line_async("xdg-open trash://", &error);
-
-  if (error)
-    g_error_free(error);
-}
-
-void
-TrashLauncherIcon::OnConfirmDialogClose(GtkDialog* dialog,
-                                        gint response,
-                                        gpointer user_data)
-{
-  TrashLauncherIcon* self = (TrashLauncherIcon*)user_data;
-
-  if (response == GTK_RESPONSE_OK)
-    g_thread_create((GThreadFunc)&TrashLauncherIcon::EmptyTrashAction, NULL, FALSE, NULL);
-
-  if (self->_confirm_dialog)
-    gtk_widget_destroy(GTK_WIDGET(self->_confirm_dialog));
-
-  self->_confirm_dialog = NULL;
-  self->_on_confirm_dialog_close_id = 0;
-}
-
-void
-TrashLauncherIcon::OnEmptyTrash(DbusmenuMenuitem* item, int time, TrashLauncherIcon* self)
-{
-  GConfClient* client;
-  bool        ask_confirmation;
-
-  if (self->_confirm_dialog != NULL)
-  {
-    gtk_window_present_with_time(GTK_WINDOW(self->_confirm_dialog), time);
-    return;
-  }
-
-  client = gconf_client_get_default();
-  ask_confirmation = gconf_client_get_bool(client, ASK_CONFIRMATION_KEY, NULL);
-  g_object_unref(client);
-
-  if (ask_confirmation)
-  {
-    self->_confirm_dialog = gtk_message_dialog_new(NULL, GtkDialogFlags(0),
-                                                   GTK_MESSAGE_WARNING,
-                                                   GTK_BUTTONS_CANCEL,
-                                                   NULL);
-
-    g_object_set(GTK_DIALOG(self->_confirm_dialog),
-                 "text", _("Empty all items from Trash?"),
-                 "secondary-text", _("All items in the Trash will be permanently deleted."),
-                 NULL);
-    gtk_dialog_add_button(GTK_DIALOG(self->_confirm_dialog), _("Empty Trash"), GTK_RESPONSE_OK);
-    self->_on_confirm_dialog_close_id = g_signal_connect(self->_confirm_dialog, "response", (GCallback)&TrashLauncherIcon::OnConfirmDialogClose, self);
-    gtk_widget_show_all(self->_confirm_dialog);
-  }
-
-  QuicklistManager::Default()->HideQuicklist(self->_quicklist);
-
-  if (!ask_confirmation)
-    g_thread_create((GThreadFunc)&TrashLauncherIcon::EmptyTrashAction, NULL, FALSE, NULL);
-
-}
-
-void
-TrashLauncherIcon::EmptyTrashAction()
-{
-  // This function runs in a different thread
-  // created in TrashLauncherIcon::OnEmptyTrash
-  GFile* location;
-  location = g_file_new_for_uri("trash:///");
-
-  RecursiveDelete(location);
-
-  g_object_unref(location);
-
-}
-void
-TrashLauncherIcon::RecursiveDelete(GFile* location)
-{
-
-  GFileInfo* info;
-  GFile* child;
-  GFileEnumerator* enumerator;
-
-  enumerator = g_file_enumerate_children(location,
-                                         G_FILE_ATTRIBUTE_STANDARD_NAME ","
-                                         G_FILE_ATTRIBUTE_STANDARD_TYPE,
-                                         G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                                         NULL,
-                                         NULL);
-  if (enumerator)
-  {
-    while ((info = g_file_enumerator_next_file(enumerator, NULL, NULL)) != NULL)
-    {
-      child = g_file_get_child(location, g_file_info_get_name(info));
-      if (g_file_info_get_file_type(info) == G_FILE_TYPE_DIRECTORY) RecursiveDelete(child);
-
-      g_file_delete(child, NULL, NULL);
-      g_object_unref(child);
-      g_object_unref(info);
-
-    }
-
-    g_file_enumerator_close(enumerator, NULL, NULL);
-    g_object_unref(enumerator);
-  }
-
-}
-
-void
-TrashLauncherIcon::UpdateTrashIcon()
-{
-  GFile* location;
-  location = g_file_new_for_uri("trash:///");
+}
+
+void TrashLauncherIcon::OnEmptyTrash(DbusmenuMenuitem* item, int time, TrashLauncherIcon* self)
+{
+  self->proxy_.Call("EmptyTrash");
+}
+
+void TrashLauncherIcon::UpdateTrashIcon()
+{
+  glib::Object<GFile> location(g_file_new_for_uri("trash:///"));
 
   g_file_query_info_async(location,
                           G_FILE_ATTRIBUTE_STANDARD_ICON,
@@ -237,62 +117,53 @@
                           &TrashLauncherIcon::UpdateTrashIconCb,
                           this);
 
-  g_object_unref(location);
 }
 
-void
-TrashLauncherIcon::UpdateTrashIconCb(GObject*      source,
-                                     GAsyncResult* res,
-                                     gpointer      data)
+void TrashLauncherIcon::UpdateTrashIconCb(GObject* source,
+                                          GAsyncResult* res,
+                                          gpointer data)
 {
   TrashLauncherIcon* self = (TrashLauncherIcon*) data;
-  GFileInfo* info;
-  GIcon* icon;
-  gchar* icon_name;
 
   // FIXME: should use the generic LoadIcon function (not taking from the unity theme)
-  info = g_file_query_info_finish(G_FILE(source), res, NULL);
-
-  if (info != NULL)
-  {
-    icon = g_file_info_get_icon(info);
-    icon_name = g_icon_to_string(icon);
-    self->SetIconName(icon_name);
-
-    if (g_strcmp0(icon_name, "user-trash") == 0) self->_empty = TRUE;
-    else self->_empty = FALSE;
-
-    g_object_unref(info);
-    g_free(icon_name);
+  glib::Object<GFileInfo> info(g_file_query_info_finish(G_FILE(source), res, NULL));
+
+  if (info)
+  {    
+    glib::Object<GIcon> icon(g_file_info_get_icon(info));
+    glib::String icon_name(g_icon_to_string(icon));
+    
+    self->SetIconName(icon_name.Value());
+
+    self->empty_ = g_strcmp0(icon_name.Value(), "user-trash") == 0;
   }
 }
 
-void
-TrashLauncherIcon::OnTrashChanged(GFileMonitor*        monitor,
-                                  GFile*               file,
-                                  GFile*               other_file,
-                                  GFileMonitorEvent    event_type,
-                                  gpointer             data)
+void TrashLauncherIcon::OnTrashChanged(GFileMonitor* monitor,
+                                       GFile* file,
+                                       GFile* other_file,
+                                       GFileMonitorEvent event_type,
+                                       gpointer data)
 {
   TrashLauncherIcon* self = (TrashLauncherIcon*) data;
   self->UpdateTrashIcon();
 }
 
-nux::DndAction
-TrashLauncherIcon::OnQueryAcceptDrop(unity::DndData& dnd_data)
+
+nux::DndAction TrashLauncherIcon::OnQueryAcceptDrop(unity::DndData& dnd_data)
 {
   return nux::DNDACTION_MOVE;
 }
 
-void
-TrashLauncherIcon::OnAcceptDrop(unity::DndData& dnd_data)
+void TrashLauncherIcon::OnAcceptDrop(unity::DndData& dnd_data)
 {
   for (auto it : dnd_data.Uris())
   {
-    GFile* file = g_file_new_for_uri(it.c_str());
+    glib::Object<GFile> file(g_file_new_for_uri(it.c_str()));
     g_file_trash(file, NULL, NULL);
-    g_object_unref(file);
   }
   
   SetQuirk(LauncherIcon::QUIRK_PULSE_ONCE, true);
 }
+
+} // namespace unity

=== modified file 'plugins/unityshell/src/TrashLauncherIcon.h'
--- plugins/unityshell/src/TrashLauncherIcon.h	2011-08-09 17:29:42 +0000
+++ plugins/unityshell/src/TrashLauncherIcon.h	2011-08-19 15:49:33 +0000
@@ -20,9 +20,15 @@
 #ifndef TRASHLAUNCHERICON_H
 #define TRASHLAUNCHERICON_H
 
+#include <gio/gio.h>
+#include <UnityCore/GLibDBusProxy.h>
+#include <UnityCore/GLibWrapper.h>
+
 #include "DndData.h"
 #include "SimpleLauncherIcon.h"
 
+namespace unity {
+
 class TrashLauncherIcon : public SimpleLauncherIcon
 {
 
@@ -40,11 +46,10 @@
   void OnAcceptDrop(unity::DndData& dnd_data);
 
 private:
-  gulong _on_trash_changed_handler_id;
-  gulong _on_confirm_dialog_close_id;
-  GFileMonitor* m_TrashMonitor;
-  gboolean _empty;
-  GtkWidget*   _confirm_dialog;
+  gulong on_trash_changed_handler_id_;
+  glib::Object<GFileMonitor> trash_monitor_;
+  gboolean empty_;
+  glib::DBusProxy proxy_;
 
   void ActivateLauncherIcon(ActionArg arg);
   std::list<DbusmenuMenuitem*> GetMenus();
@@ -53,10 +58,8 @@
   static void OnTrashChanged(GFileMonitor* monitor, GFile* file, GFile* other_file,
                              GFileMonitorEvent event_type, gpointer data);
   static void OnEmptyTrash(DbusmenuMenuitem* item, int time, TrashLauncherIcon* self);
-  static void OnConfirmDialogClose(GtkDialog* dialog, gint response, gpointer user_data);
-  static void EmptyTrashAction();
-  static void RecursiveDelete(GFile* location);
-
 };
 
+} // namespace unity
+
 #endif // TRASHLAUNCHERICON_H