Merge lp:~marcobiscaro2112/unity/2011-03-08 into lp:unity

[Marco Biscaro]

    [launcher] Empty trash quicklist item is missing an ellipsis (LP: #731472)
    [launcher] Show disabled 'Empty trash' option when trash is already empty (LP: #723880)
    [dash] Adding ellipsis to 'Find XYZ' options (LP: #731162)

[Neil J. Patel (njpatel)]

Nice work, approved and merged, thank you!

=== modified file 'src/TrashLauncherIcon.cpp'
--- src/TrashLauncherIcon.cpp	2011-02-22 17:05:31 +0000
+++ src/TrashLauncherIcon.cpp	2011-03-09 16:32:29 +0000
@@ -26,6 +26,9 @@
 
 #include <gio/gio.h>
 #include <glib/gi18n-lib.h>
+#include <gconf/gconf-client.h>
+
+#define ASK_CONFIRMATION_KEY "/apps/nautilus/preferences/confirm_trash"
 
 TrashLauncherIcon::TrashLauncherIcon (Launcher* IconManager)
 :   SimpleLauncherIcon(IconManager)
@@ -73,21 +76,18 @@
   DbusmenuMenuitem *menu_item;
 
   /* Empty Trash */
-  if (_menu_items.find ("Empty") == _menu_items.end ())
-  {
-    menu_item = dbusmenu_menuitem_new ();
-    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, true);
-    dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
-
-    g_signal_connect (menu_item,
-                      DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, 
-                      (GCallback)&TrashLauncherIcon::OnEmptyTrash, this);
-
-    _menu_items["Empty"] = menu_item;
-  }
+  menu_item = dbusmenu_menuitem_new ();
+  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_VISIBLE, true);
+
+  g_signal_connect (menu_item,
+                    DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, 
+                    (GCallback)&TrashLauncherIcon::OnEmptyTrash, this);
+
+  _menu_items["Empty"] = menu_item;
 }
 
 void
@@ -98,7 +98,7 @@
   if (button == 1)
     ActivateLauncherIcon ();
 
-  else if (button == 3 && _empty == FALSE)
+  else if (button == 3)
   {
     EnsureMenuItemsReady ();
 
@@ -128,24 +128,37 @@
 void 
 TrashLauncherIcon::OnEmptyTrash(DbusmenuMenuitem *item, int time, TrashLauncherIcon *self)
 {
-  GtkWidget *dialog;
-  dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-                                   GTK_MESSAGE_WARNING,
-                                   GTK_BUTTONS_CANCEL,
-                                   NULL);
-
-  g_object_set (GTK_DIALOG (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 (dialog), _("Empty Trash"), GTK_RESPONSE_OK );
+  GConfClient *client;
+  GtkWidget   *dialog;
+  bool        ask_confirmation;
+
+  client = gconf_client_get_default ();
+  ask_confirmation = gconf_client_get_bool (client, ASK_CONFIRMATION_KEY, NULL);
+  g_object_unref (client);
+
+  if (ask_confirmation)
+  {
+    dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+                                     GTK_MESSAGE_WARNING,
+                                     GTK_BUTTONS_CANCEL,
+                                     NULL);
+
+    g_object_set (GTK_DIALOG (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 (dialog), _("Empty Trash"), GTK_RESPONSE_OK );
+  }
 
   QuicklistManager::Default ()->HideQuicklist (self->_quicklist);
 
-  if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) 
+  if (!ask_confirmation || gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) 
+  {
     g_thread_create ((GThreadFunc)&TrashLauncherIcon::EmptyTrashAction, NULL, FALSE, NULL);
+  }
 
-  gtk_widget_destroy (dialog);
+  if (ask_confirmation)
+    gtk_widget_destroy (dialog);
 
 }