diff options
| author | Alexander Larsson <alexl@redhat.com> | 2012-03-05 16:35:05 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2012-03-05 16:39:36 +0100 |
| commit | 7d4fad24db31155e01518fad9ec9e382a8d2fbff (patch) | |
| tree | ef802c824cba1fdad84272f7c922bcbfab716bdb | |
| parent | a928269918d598f4a687dfe64a9b4aa126e8bcab (diff) | |
| download | gnome-contacts-7d4fad24db31155e01518fad9ec9e382a8d2fbff.tar.gz | |
Rename member to avoid conflict with Dialgo.add_button method
| -rw-r--r-- | src/contacts-avatar-dialog.vala | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/contacts-avatar-dialog.vala b/src/contacts-avatar-dialog.vala index 4a3f35b..a2fd0dd 100644 --- a/src/contacts-avatar-dialog.vala +++ b/src/contacts-avatar-dialog.vala @@ -27,7 +27,7 @@ public class Contacts.AvatarDialog : Dialog { private Contact contact; private Grid frame_grid; private ScrolledWindow scrolled; - private ToolButton add_button; + private ToolButton the_add_button; private ToolButton crop_button; private ToolButton cancel_button; private Grid view_grid; @@ -222,7 +222,7 @@ public class Contacts.AvatarDialog : Dialog { cancel_button.hide (); scrolled.show (); - add_button.show (); + the_add_button.show (); }); cancel_button.show (); cancel_button.clicked.connect ((button) => { @@ -230,9 +230,9 @@ public class Contacts.AvatarDialog : Dialog { cancel_button.hide (); scrolled.show (); - add_button.show (); + the_add_button.show (); }); - add_button.hide (); + the_add_button.hide (); scrolled.hide (); } else selected_pixbuf (scale_pixbuf_for_avatar_use (pixbuf)); @@ -305,12 +305,12 @@ public class Contacts.AvatarDialog : Dialog { toolbar.set_vexpand (false); frame_grid.add (toolbar); - add_button = new ToolButton (null, null); - add_button.set_icon_name ("list-add-symbolic"); - add_button.get_style_context ().add_class (STYLE_CLASS_RAISED); - add_button.is_important = true; - toolbar.add (add_button); - add_button.clicked.connect (select_avatar_file_cb); + the_add_button = new ToolButton (null, null); + the_add_button.set_icon_name ("list-add-symbolic"); + the_add_button.get_style_context ().add_class (STYLE_CLASS_RAISED); + the_add_button.is_important = true; + toolbar.add (the_add_button); + the_add_button.clicked.connect (select_avatar_file_cb); crop_button = new ToolButton (null, null); crop_button.set_icon_name ("object-select-symbolic"); |