Merge back from master

[empathy.git] / python / pyempathy / pyempathy.defs

diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index 669c0901348fa00c7b4604e02484dbb2b9f968e1..b8f0b40aa6bb42c89adc2218157baedcf19c5a6e 100644 (file)
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -233,6 +233,7 @@
     '("location" "EMPATHY_DEBUG_LOCATION")
     '("other" "EMPATHY_DEBUG_OTHER")
     '("share-desktop" "EMPATHY_DEBUG_SHARE_DESKTOP")
+    '("connectivity" "EMPATHY_DEBUG_CONNECTIVITY")
   )
 )
 
@@ -1740,21 +1741,6 @@
   )
 )
 
-(define-method get_use_nm
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_get_use_nm")
-  (return-type "gboolean")
-)
-
-(define-method set_use_nm
-  (of-object "EmpathyIdle")
-  (c-name "empathy_idle_set_use_nm")
-  (return-type "none")
-  (parameters
-    '("gboolean" "use_nm")
-  )
-)
-
 
 
 ;; From empathy-irc-network.h