aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-01-02 18:29:58 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-01-02 18:29:58 +0800
commit8d0eb500144999ede2897bb0dd3248b0aa3399ec (patch)
tree1eb268021e9aa683ea46d3c889405a81b7371467
parentd462005a1704b8d5342b7972217eceb33019dc43 (diff)
downloadgsoc2013-empathy-8d0eb500144999ede2897bb0dd3248b0aa3399ec.tar
gsoc2013-empathy-8d0eb500144999ede2897bb0dd3248b0aa3399ec.tar.gz
gsoc2013-empathy-8d0eb500144999ede2897bb0dd3248b0aa3399ec.tar.bz2
gsoc2013-empathy-8d0eb500144999ede2897bb0dd3248b0aa3399ec.tar.lz
gsoc2013-empathy-8d0eb500144999ede2897bb0dd3248b0aa3399ec.tar.xz
gsoc2013-empathy-8d0eb500144999ede2897bb0dd3248b0aa3399ec.tar.zst
gsoc2013-empathy-8d0eb500144999ede2897bb0dd3248b0aa3399ec.zip
call: pass the proper flag to gtk_application_inhibit()
We have to use '|' to combine flags, not '&'...
-rw-r--r--src/empathy-call.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 348866f86..71fef2e10 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -119,8 +119,8 @@ call_window_inhibit_cb (EmpathyCallWindow *window,
inhibit_id = gtk_application_inhibit (GTK_APPLICATION (app),
GTK_WINDOW (window),
- GTK_APPLICATION_INHIBIT_LOGOUT & GTK_APPLICATION_INHIBIT_SWITCH &
- GTK_APPLICATION_INHIBIT_SUSPEND & GTK_APPLICATION_INHIBIT_IDLE,
+ GTK_APPLICATION_INHIBIT_LOGOUT | GTK_APPLICATION_INHIBIT_SWITCH |
+ GTK_APPLICATION_INHIBIT_SUSPEND | GTK_APPLICATION_INHIBIT_IDLE,
_("In a call"));
}
else