1 files changed, 11 insertions, 0 deletions
diff --git a/src/empathy-av.c b/src/empathy-av.c
index cb0e82b1b..9ef0fbf29 100644
--- a/src/empathy-av.c
+++ b/src/empathy-av.c
@@ -43,6 +43,7 @@
 
 static guint nb_windows = 0;
 static guint timeout_id = 0;
+static gboolean use_timer = TRUE;
 
 static gboolean
 timeout_cb (gpointer data)
@@ -56,6 +57,9 @@ timeout_cb (gpointer data)
 static void
 start_timer (void)
 {
+  if (!use_timer)
+    return;
+
   if (timeout_id != 0)
     return;
 
@@ -166,6 +170,13 @@ main (int argc,
       return EXIT_FAILURE;
     }
 
+  if (g_getenv ("EMPATHY_PERSIST") != NULL)
+    {
+      DEBUG ("Disable timer");
+
+      use_timer = FALSE;
+    }
+
   start_timer ();
 
   gtk_main ();