ekiga r6626 - in trunk: . lib/engine/addressbook/evolution

[dsandras svn gnome org]

Author: dsandras
Date: Sun Aug 17 17:48:12 2008
New Revision: 6626
URL: http://svn.gnome.org/viewvc/ekiga?rev=6626&view=rev

Log:
Made Edit the default action. It should have more priority than
delete. Indeed, if you can not call the user because there is no
callable address, you can fix that by editing the user, not deleting
it. Improved deletion confirmation message.


Modified:
   trunk/ChangeLog
   trunk/lib/engine/addressbook/evolution/evolution-contact.cpp

Modified: trunk/lib/engine/addressbook/evolution/evolution-contact.cpp
==============================================================================
--- trunk/lib/engine/addressbook/evolution/evolution-contact.cpp	(original)
+++ trunk/lib/engine/addressbook/evolution/evolution-contact.cpp	Sun Aug 17 17:48:12 2008
@@ -36,6 +36,7 @@
  */
 
 #include <iostream>
+#include <sstream>
 
 #include "config.h"
 
@@ -231,10 +232,10 @@
   if (populated)
     builder.add_separator ();
 
-  builder.add_action ("remove", _("_Remove"),
-		      sigc::mem_fun (this, &Evolution::Contact::remove_action));
   builder.add_action ("edit", _("_Edit"),
 		      sigc::mem_fun (this, &Evolution::Contact::edit_action));
+  builder.add_action ("remove", _("_Remove"),
+		      sigc::mem_fun (this, &Evolution::Contact::remove_action));
   populated = true;
 
   return populated;
@@ -387,10 +388,12 @@
 Evolution::Contact::remove_action ()
 {
   Ekiga::FormRequestSimple request;
+  std::stringstream strm;
 
   request.title (_("Remove contact"));
 
-  request.instructions (_("Please confirm you want that contact removed"));
+  strm << _("Are you sure you want to remove ") << get_name () << " " << _("from the address book ?");
+  request.instructions (strm.str ());
 
   request.submitted.connect (sigc::mem_fun (this,
 					    &Evolution::Contact::on_remove_form_submitted));