diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-11-25 17:25:44 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-11-25 17:25:44 +0800 |
| commit | 5e3f159c66c8a68aad18c3d2ddd79ac9bc6ece79 (patch) | |
| tree | fa7182156a95d5cbe856299976a13ad8c585e6fe /src/empathy.c | |
| parent | c487a45a3509c2cda4bd712ed818924ccb09184f (diff) | |
| parent | 212a4ecbdb3a41933a208f401f1803a930061cb7 (diff) | |
| download | gsoc2013-empathy-5e3f159c66c8a68aad18c3d2ddd79ac9bc6ece79.tar gsoc2013-empathy-5e3f159c66c8a68aad18c3d2ddd79ac9bc6ece79.tar.gz gsoc2013-empathy-5e3f159c66c8a68aad18c3d2ddd79ac9bc6ece79.tar.bz2 gsoc2013-empathy-5e3f159c66c8a68aad18c3d2ddd79ac9bc6ece79.tar.lz gsoc2013-empathy-5e3f159c66c8a68aad18c3d2ddd79ac9bc6ece79.tar.xz gsoc2013-empathy-5e3f159c66c8a68aad18c3d2ddd79ac9bc6ece79.tar.zst gsoc2013-empathy-5e3f159c66c8a68aad18c3d2ddd79ac9bc6ece79.zip | |
Merge branch 'notifications-635500'
Diffstat (limited to 'src/empathy.c')
| -rw-r--r-- | src/empathy.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/empathy.c b/src/empathy.c index 7a66d2d67..357b47e8e 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -65,6 +65,7 @@ #include "empathy-accounts-dialog.h" #include "empathy-status-icon.h" #include "empathy-ft-manager.h" +#include "empathy-notifications-approver.h" #include "extensions/extensions.h" @@ -116,6 +117,7 @@ struct _EmpathyApp EmpathyIdle *idle; EmpathyConnectivity *connectivity; GSettings *gsettings; + EmpathyNotificationsApprover *notifications_approver; #ifdef HAVE_GEOCLUE EmpathyLocationManager *location_manager; #endif @@ -155,6 +157,7 @@ empathy_app_dispose (GObject *object) #endif tp_clear_object (&self->ft_factory); tp_clear_object (&self->gsettings); + tp_clear_object (&self->notifications_approver); if (dispose != NULL) dispose (object); @@ -258,6 +261,9 @@ empathy_app_command_line (GApplication *app, gtk_widget_show (self->window); self->icon = empathy_status_icon_new (GTK_WINDOW (self->window), self->start_hidden); + + self->notifications_approver = + empathy_notifications_approver_dup_singleton (); } else { |