diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-11-30 21:41:30 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-11-30 21:41:33 +0800 |
commit | e0469fa0914a13961878ef435c1c275819e04e65 (patch) | |
tree | aad7402ca3d49d6c10b04a3b847509747c3a45ba /libempathy-gtk | |
parent | 984c03d2e1cd94fc6699d7b627080ed2d73d5466 (diff) | |
download | gsoc2013-empathy-e0469fa0914a13961878ef435c1c275819e04e65.tar gsoc2013-empathy-e0469fa0914a13961878ef435c1c275819e04e65.tar.gz gsoc2013-empathy-e0469fa0914a13961878ef435c1c275819e04e65.tar.bz2 gsoc2013-empathy-e0469fa0914a13961878ef435c1c275819e04e65.tar.lz gsoc2013-empathy-e0469fa0914a13961878ef435c1c275819e04e65.tar.xz gsoc2013-empathy-e0469fa0914a13961878ef435c1c275819e04e65.tar.zst gsoc2013-empathy-e0469fa0914a13961878ef435c1c275819e04e65.zip |
use the individual edit dialog when pressing F2
We already use it when using the menu so there is no reason to keep using the
old one.
Diffstat (limited to 'libempathy-gtk')
-rw-r--r-- | libempathy-gtk/empathy-individual-view.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 64aaf5a0a..9d5b9adc6 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -46,7 +46,7 @@ #include "empathy-individual-view.h" #include "empathy-individual-menu.h" #include "empathy-individual-store.h" -#include "empathy-contact-dialogs.h" +#include "empathy-individual-edit-dialog.h" #include "empathy-individual-dialogs.h" #include "empathy-images.h" #include "empathy-linking-dialog.h" @@ -988,7 +988,6 @@ individual_view_key_press_event_cb (EmpathyIndividualView *view, g_idle_add (individual_view_popup_menu_idle_cb, data); } else if (event->keyval == GDK_KEY_F2) { FolksIndividual *individual; - EmpathyContact *contact; g_return_val_if_fail (EMPATHY_IS_INDIVIDUAL_VIEW (view), FALSE); @@ -996,15 +995,9 @@ individual_view_key_press_event_cb (EmpathyIndividualView *view, if (individual == NULL) return FALSE; - contact = empathy_contact_dup_from_folks_individual (individual); - if (contact == NULL) { - g_object_unref (individual); - return FALSE; - } - empathy_contact_edit_dialog_show (contact, NULL); + empathy_individual_edit_dialog_show (individual, NULL); g_object_unref (individual); - g_object_unref (contact); } return FALSE; |