[empathy] use the individual edit dialog when pressing F2
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] use the individual edit dialog when pressing F2
- Date: Wed, 30 Nov 2011 13:43:32 +0000 (UTC)
commit e0469fa0914a13961878ef435c1c275819e04e65
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Nov 30 14:41:30 2011 +0100
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.
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 64aaf5a..9d5b9ad 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]