4 files changed, 127 insertions, 226 deletions
diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index d98f2605f..f6c7e0b80 100644
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -21,13 +21,6 @@
   (gtype-id "EMPATHY_TYPE_CHATROOM_MANAGER")
 )
 
-(define-object Conf
-  (in-module "Empathy")
-  (parent "GObject")
-  (c-name "EmpathyConf")
-  (gtype-id "EMPATHY_TYPE_CONF")
-)
-
 (define-object Contact
   (in-module "Empathy")
   (parent "GObject")
@@ -233,23 +226,6 @@
 
 
 
-;; From empathy-chandler-glue.h
-
-(define-function dbus_glib_marshal_empathy_chandler_BOOLEAN__STRING_BOXED_STRING_BOXED_UINT_UINT_POINTER
-  (c-name "dbus_glib_marshal_empathy_chandler_BOOLEAN__STRING_BOXED_STRING_BOXED_UINT_UINT_POINTER")
-  (return-type "none")
-  (parameters
-    '("GClosure*" "closure")
-    '("GValue*-return_value" "G_GNUC_UNUSED")
-    '("guint" "n_param_values")
-    '("const-GValue*" "param_values")
-    '("gpointer-invocation_hint" "G_GNUC_UNUSED")
-    '("gpointer" "marshal_data")
-  )
-)
-
-
-
 ;; From empathy-chandler.h
 
 (define-function empathy_chandler_get_type
@@ -435,125 +411,6 @@
 
 
 
-;; From empathy-conf.h
-
-(define-function empathy_conf_get_type
-  (c-name "empathy_conf_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_conf_get
-  (c-name "empathy_conf_get")
-  (return-type "EmpathyConf*")
-)
-
-(define-function empathy_conf_shutdown
-  (c-name "empathy_conf_shutdown")
-  (return-type "none")
-)
-
-(define-method notify_add
-  (of-object "EmpathyConf")
-  (c-name "empathy_conf_notify_add")
-  (return-type "guint")
-  (parameters
-    '("const-gchar*" "key")
-    '("EmpathyConfNotifyFunc" "func")
-    '("gpointer" "data")
-  )
-)
-
-(define-method notify_remove
-  (of-object "EmpathyConf")
-  (c-name "empathy_conf_notify_remove")
-  (return-type "gboolean")
-  (parameters
-    '("guint" "id")
-  )
-)
-
-(define-method set_int
-  (of-object "EmpathyConf")
-  (c-name "empathy_conf_set_int")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "key")
-    '("gint" "value")
-  )
-)
-
-(define-method get_int
-  (of-object "EmpathyConf")
-  (c-name "empathy_conf_get_int")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "key")
-    '("gint*" "value")
-  )
-)
-
-(define-method set_bool
-  (of-object "EmpathyConf")
-  (c-name "empathy_conf_set_bool")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "key")
-    '("gboolean" "value")
-  )
-)
-
-(define-method get_bool
-  (of-object "EmpathyConf")
-  (c-name "empathy_conf_get_bool")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "key")
-    '("gboolean*" "value")
-  )
-)
-
-(define-method set_string
-  (of-object "EmpathyConf")
-  (c-name "empathy_conf_set_string")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "key")
-    '("const-gchar*" "value")
-  )
-)
-
-(define-method get_string
-  (of-object "EmpathyConf")
-  (c-name "empathy_conf_get_string")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "key")
-    '("gchar**" "value")
-  )
-)
-
-(define-method set_string_list
-  (of-object "EmpathyConf")
-  (c-name "empathy_conf_set_string_list")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "key")
-    '("GSList*" "value")
-  )
-)
-
-(define-method get_string_list
-  (of-object "EmpathyConf")
-  (c-name "empathy_conf_get_string_list")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "key")
-    '("GSList**" "value")
-  )
-)
-
-
-
 ;; From empathy-contact-factory.h
 
 (define-function empathy_contact_factory_get_type
@@ -977,47 +834,6 @@
 
 
 
-;; From empathy-enum-types.h
-
-(define-function empathy_reg_ex_type_get_type
-  (c-name "empathy_reg_ex_type_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_message_type_get_type
-  (c-name "empathy_message_type_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_capabilities_get_type
-  (c-name "empathy_capabilities_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_tp_call_status_get_type
-  (c-name "empathy_tp_call_status_get_type")
-  (return-type "GType")
-)
-
-
-
-;; From empathy-filter-glue.h
-
-(define-function dbus_glib_marshal_empathy_filter_BOOLEAN__STRING_BOXED_STRING_BOXED_UINT_UINT_UINT_POINTER
-  (c-name "dbus_glib_marshal_empathy_filter_BOOLEAN__STRING_BOXED_STRING_BOXED_UINT_UINT_UINT_POINTER")
-  (return-type "none")
-  (parameters
-    '("GClosure*" "closure")
-    '("GValue*-return_value" "G_GNUC_UNUSED")
-    '("guint" "n_param_values")
-    '("const-GValue*" "param_values")
-    '("gpointer-invocation_hint" "G_GNUC_UNUSED")
-    '("gpointer" "marshal_data")
-  )
-)
-
-
-
 ;; From empathy-filter.h
 
 (define-function empathy_filter_get_type
@@ -1273,10 +1089,6 @@
 
 
 
-;; From empathy-marshal.h
-
-
-
 ;; From empathy-message.h
 
 (define-function empathy_message_get_gtype
@@ -2248,10 +2060,6 @@
 
 
 
-;; From stamp-empathy-enum-types.h
-
-
-
 ;; From tp-stream-engine-gen.h
 
 (define-function dbus_g_proxy_begin_call
diff --git a/python/pyempathy/pyempathy.override b/python/pyempathy/pyempathy.override
index d1f434839..a21700fca 100644
--- a/python/pyempathy/pyempathy.override
+++ b/python/pyempathy/pyempathy.override
@@ -6,7 +6,6 @@ headers
 #include "empathy-chandler.h"
 #include "empathy-chatroom-manager.h"
 #include "empathy-chatroom.h"
-#include "empathy-conf.h"
 #include "empathy-contact-groups.h"
 #include "empathy-contact-list.h"
 #include "empathy-contact-manager.h"
diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index f63e16d4a..a8412437f 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -63,6 +63,13 @@
   (gtype-id "EMPATHY_TYPE_CHAT_WINDOW")
 )
 
+(define-object Conf
+  (in-module "Empathy")
+  (parent "GObject")
+  (c-name "EmpathyConf")
+  (gtype-id "EMPATHY_TYPE_CONF")
+)
+
 (define-object ContactListStore
   (in-module "Empathy")
   (parent "GtkTreeStore")
@@ -983,6 +990,125 @@
 
 
 
+;; From empathy-conf.h
+
+(define-function empathy_conf_get_type
+  (c-name "empathy_conf_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_conf_get
+  (c-name "empathy_conf_get")
+  (return-type "EmpathyConf*")
+)
+
+(define-function empathy_conf_shutdown
+  (c-name "empathy_conf_shutdown")
+  (return-type "none")
+)
+
+(define-method notify_add
+  (of-object "EmpathyConf")
+  (c-name "empathy_conf_notify_add")
+  (return-type "guint")
+  (parameters
+    '("const-gchar*" "key")
+    '("EmpathyConfNotifyFunc" "func")
+    '("gpointer" "data")
+  )
+)
+
+(define-method notify_remove
+  (of-object "EmpathyConf")
+  (c-name "empathy_conf_notify_remove")
+  (return-type "gboolean")
+  (parameters
+    '("guint" "id")
+  )
+)
+
+(define-method set_int
+  (of-object "EmpathyConf")
+  (c-name "empathy_conf_set_int")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("gint" "value")
+  )
+)
+
+(define-method get_int
+  (of-object "EmpathyConf")
+  (c-name "empathy_conf_get_int")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("gint*" "value")
+  )
+)
+
+(define-method set_bool
+  (of-object "EmpathyConf")
+  (c-name "empathy_conf_set_bool")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("gboolean" "value")
+  )
+)
+
+(define-method get_bool
+  (of-object "EmpathyConf")
+  (c-name "empathy_conf_get_bool")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("gboolean*" "value")
+  )
+)
+
+(define-method set_string
+  (of-object "EmpathyConf")
+  (c-name "empathy_conf_set_string")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("const-gchar*" "value")
+  )
+)
+
+(define-method get_string
+  (of-object "EmpathyConf")
+  (c-name "empathy_conf_get_string")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("gchar**" "value")
+  )
+)
+
+(define-method set_string_list
+  (of-object "EmpathyConf")
+  (c-name "empathy_conf_set_string_list")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("GSList*" "value")
+  )
+)
+
+(define-method get_string_list
+  (of-object "EmpathyConf")
+  (c-name "empathy_conf_get_string_list")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "key")
+    '("GSList**" "value")
+  )
+)
+
+
+
 ;; From empathy-contact-dialogs.h
 
 (define-function empathy_subscription_dialog_show
@@ -1302,35 +1428,6 @@
 
 
 
-;; From empathy-gtk-enum-types.h
-
-(define-function empathy_contact_widget_flags_get_type
-  (c-name "empathy_contact_widget_flags_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_contact_list_store_sort_get_type
-  (c-name "empathy_contact_list_store_sort_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_contact_list_store_col_get_type
-  (c-name "empathy_contact_list_store_col_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_contact_list_features_get_type
-  (c-name "empathy_contact_list_features_get_type")
-  (return-type "GType")
-)
-
-(define-function empathy_chat_view_block_get_type
-  (c-name "empathy_chat_view_block_get_type")
-  (return-type "GType")
-)
-
-
-
 ;; From empathy-images.h
 
 
@@ -2030,7 +2127,3 @@
 )
 
 
-
-;; From stamp-empathy-gtk-enum-types.h
-
-
diff --git a/python/pyempathygtk/pyempathygtk.override b/python/pyempathygtk/pyempathygtk.override
index f15151762..26eb10119 100644
--- a/python/pyempathygtk/pyempathygtk.override
+++ b/python/pyempathygtk/pyempathygtk.override
@@ -17,6 +17,7 @@ headers
 #include "empathy-chatrooms-window.h"
 #include "empathy-chat-view.h"
 #include "empathy-chat-window.h"
+#include "empathy-conf.h"
 #include "empathy-contact-dialogs.h"
 #include "empathy-contact-list-store.h"
 #include "empathy-contact-list-view.h"