aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-event-manager.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-06-29 20:18:13 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-07-06 17:31:00 +0800
commitb020c790f9d30e23c34bc5a7fec1a4de4c2aa528 (patch)
tree9c1df58101d26259aa05688bf1841769f7af20fe /src/empathy-event-manager.c
parent875ec0d10b3042d2c40a7d0f288653adbdc281bf (diff)
downloadgsoc2013-empathy-b020c790f9d30e23c34bc5a7fec1a4de4c2aa528.tar
gsoc2013-empathy-b020c790f9d30e23c34bc5a7fec1a4de4c2aa528.tar.gz
gsoc2013-empathy-b020c790f9d30e23c34bc5a7fec1a4de4c2aa528.tar.bz2
gsoc2013-empathy-b020c790f9d30e23c34bc5a7fec1a4de4c2aa528.tar.lz
gsoc2013-empathy-b020c790f9d30e23c34bc5a7fec1a4de4c2aa528.tar.xz
gsoc2013-empathy-b020c790f9d30e23c34bc5a7fec1a4de4c2aa528.tar.zst
gsoc2013-empathy-b020c790f9d30e23c34bc5a7fec1a4de4c2aa528.zip
event-manager: use EmpathySubscriptionDialog
https://bugzilla.gnome.org/show_bug.cgi?id=679136
Diffstat (limited to 'src/empathy-event-manager.c')
-rw-r--r--src/empathy-event-manager.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index d10af58e8..c4d2e09a9 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