[gnome-contacts] Revert avatar/fullname when editing fails



commit 655544489810ece347a831bf73d1c91156353eac
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Feb 1 12:21:31 2012 +0100

    Revert avatar/fullname when editing fails

 src/contacts-contact-pane.vala |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/src/contacts-contact-pane.vala b/src/contacts-contact-pane.vala
index 2f480d9..7ebad7f 100644
--- a/src/contacts-contact-pane.vala
+++ b/src/contacts-contact-pane.vala
@@ -1491,6 +1491,7 @@ public class Contacts.ContactPane : ScrolledWindow {
       return;
 
     var menu = new AvatarMenu (contact);
+    var image_frame = new ContactFrame (PROFILE_SIZE, menu);
     menu.icon_set.connect ( (icon) => {
 	Value v = Value (icon.get_type ());
 	v.set_object (icon);
@@ -1501,11 +1502,11 @@ public class Contacts.ContactPane : ScrolledWindow {
 					     var p = set_individual_property.end (result);
 					   } catch (Error e) {
 					     App.app.show_message (e.message);
+					     image_frame.set_image (contact.individual, contact);
 					   }
 				       });
       });
 
-    var image_frame = new ContactFrame (PROFILE_SIZE, menu);
     contact.keep_widget_uptodate (image_frame,  (w) => {
 	(w as ContactFrame).set_image (contact.individual, contact);
       });
@@ -1590,6 +1591,7 @@ public class Contacts.ContactPane : ScrolledWindow {
 					     var p = set_individual_property.end (result);
 					   } catch (Error e) {
 					     App.app.show_message (e.message);
+					     l.set_markup ("<span font='16'>" + contact.display_name + "</span>");
 					   }
 					 });
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]