[empathy] event-manager: use EmpathySubscriptionDialog
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] event-manager: use EmpathySubscriptionDialog
- Date: Fri, 6 Jul 2012 09:33:10 +0000 (UTC)
commit b020c790f9d30e23c34bc5a7fec1a4de4c2aa528
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Fri Jun 29 14:18:13 2012 +0200
event-manager: use EmpathySubscriptionDialog
https://bugzilla.gnome.org/show_bug.cgi?id=679136
src/empathy-event-manager.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index d10af58..c4d2e09 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -38,10 +38,10 @@
#include <extensions/extensions.h>
#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-contact-dialogs.h>
#include <libempathy-gtk/empathy-sound-manager.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include <libempathy-gtk/empathy-call-utils.h>
+#include <libempathy-gtk/empathy-subscription-dialog.h>
#include "empathy-event-manager.h"
#include "empathy-roster-window.h"
@@ -1063,9 +1063,18 @@ approve_channels (TpSimpleApprover *approver,
static void
event_pending_subscribe_func (EventPriv *event)
{
- empathy_subscription_dialog_show (event->public.contact, event->public.header,
- NULL);
+ GtkWidget *dialog;
+ FolksIndividual *individual;
+
+ individual = empathy_ensure_individual_from_tp_contact (
+ empathy_contact_get_tp_contact (event->public.contact));
+
+ dialog = empathy_subscription_dialog_new (individual, event->public.message);
+ gtk_window_present (GTK_WINDOW (dialog));
+
event_remove (event);
+
+ g_object_unref (individual);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]