From e0de4a5f2a254beef02021573c57543dfd33311f Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xclaesse@gmail.com>
Date: Thu, 6 Dec 2007 14:31:58 +0000
Subject: Add a preference option to disable/enable NM support.

2007-12-06  Xavier Claessens  <xclaesse@gmail.com>

	* data/empathy.schemas.in:
	* libempathy-gtk/empathy-preferences.c:
	* libempathy-gtk/empathy-preferences.glade:
	* libempathy-gtk/empathy-preferences.h:
	* libempathy-gtk/empathy-status-icon.c:
	* libempathy/empathy-idle.c:
	* libempathy/empathy-idle.h: Add a preference option to disable/enable
	NM support.

svn path=/trunk/; revision=468
---
 data/empathy.schemas.in | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'data')

diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index 72ee4405e..732464867 100644
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -276,6 +276,21 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/empathy/use_nm</key>
+      <applyto>/apps/empathy/use_nm</applyto>
+      <owner>empathy</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Checks if NetworkManager should be used</short>
+	<long>
+	Whether or not the network manager should be used to automatically
+	disconnect/reconnect.
+        </long>
+      </locale>
+    </schema>
+
   </schemalist>  
 </gconfschemafile>
 
-- 
cgit v1.2.3