Merge lp:~jamalta/unity/683241-recyclebin-icon into lp:unity

[Jamal Fanaian]

Changing the trash icon depending on whether the trash is empty or not.

[Alex Launi (alexlauni)]

Looks good. The only comment I have is a formatting comment (which I'll fix, don't worry about it). When you create the trash monitor, the first param should be on the same line as the constructor, and then the other params aligned.

review: Approve

[Alex Launi (alexlauni)]

One more thing; in order to do that I need to ask you to sign the canonical contributors agreement. Signing the single-page agreement is very easy and is typically done with a single email. For more information about this agreement, look here: http://www.canonical.com/contributors

[Jamal Fanaian (jamalta)]

I had already signed it, but not with this email. I've submitted the contribution with the new email address. Thanks!

=== modified file 'src/TrashLauncherIcon.cpp'
--- src/TrashLauncherIcon.cpp	2010-11-24 18:59:55 +0000
+++ src/TrashLauncherIcon.cpp	2010-12-07 08:24:58 +0000
@@ -18,6 +18,8 @@
 
 #include "TrashLauncherIcon.h"
 
+#include <gio/gio.h>
+
 TrashLauncherIcon::TrashLauncherIcon (Launcher* IconManager)
 :   SimpleLauncherIcon(IconManager)
 {
@@ -26,6 +28,19 @@
   SetQuirk (LAUNCHER_ICON_QUIRK_VISIBLE, true);
   SetQuirk (LAUNCHER_ICON_QUIRK_RUNNING, false);
   SetIconType (LAUNCHER_ICON_TYPE_TRASH); 
+
+  m_TrashMonitor = g_file_monitor_directory (
+    g_file_new_for_uri("trash:///"),
+    G_FILE_MONITOR_NONE,
+    NULL,
+    NULL);
+
+  g_signal_connect(m_TrashMonitor,
+                   "changed",
+                   G_CALLBACK (&TrashLauncherIcon::OnTrashChanged),
+                   this);
+
+  UpdateTrashIcon ();
 }
 
 TrashLauncherIcon::~TrashLauncherIcon()
@@ -38,10 +53,58 @@
   if (button == 1)
   {
     GError *error = NULL;
-    
+
     g_spawn_command_line_async ("xdg-open trash://", &error);
-    
+
     if (error)
       g_error_free (error);
   }
 }
+
+void
+TrashLauncherIcon::UpdateTrashIcon ()
+{
+  GFile *location;
+  location = g_file_new_for_uri ("trash:///");
+
+  g_file_query_info_async (location,
+                           G_FILE_ATTRIBUTE_STANDARD_ICON, 
+                           G_FILE_QUERY_INFO_NONE, 
+                           0, 
+                           NULL, 
+                           &TrashLauncherIcon::UpdateTrashIconCb, 
+                           this);
+
+  g_object_unref(location);
+}
+
+void
+TrashLauncherIcon::UpdateTrashIconCb (GObject      *source,
+                                      GAsyncResult *res,
+                                      gpointer      data)
+{
+  TrashLauncherIcon *self = (TrashLauncherIcon*) data;
+  GFileInfo *info;
+  GIcon *icon;
+
+  info = g_file_query_info_finish (G_FILE (source), res, NULL);
+
+  if (info != NULL) {
+    icon = g_file_info_get_icon (info);
+    self->SetIconName (g_icon_to_string (icon));
+
+    g_object_unref(info);
+  }
+}
+
+void
+TrashLauncherIcon::OnTrashChanged (GFileMonitor        *monitor,
+                                   GFile               *file,
+                                   GFile               *other_file,
+                                   GFileMonitorEvent    event_type,
+                                   gpointer             data)
+{
+    TrashLauncherIcon *self = (TrashLauncherIcon*) data;
+    self->UpdateTrashIcon ();
+}
+
 
=== modified file 'src/TrashLauncherIcon.h'
--- src/TrashLauncherIcon.h	2010-11-24 18:59:55 +0000
+++ src/TrashLauncherIcon.h	2010-12-07 08:24:58 +0000
@@ -30,6 +30,13 @@
 
 protected:
   void OnMouseClick (int button);
+  void UpdateTrashIcon ();
+
+private:
+  GFileMonitor *m_TrashMonitor;
+  static void UpdateTrashIconCb (GObject *source, GAsyncResult *res, gpointer data);
+  static void OnTrashChanged (GFileMonitor *monitor, GFile *file, GFile *other_file,
+                              GFileMonitorEvent event_type, gpointer data);
 
 };