diff options
| -rw-r--r-- | docs/libempathy-gtk/libempathy-gtk-docs.sgml | 2 | ||||
| -rw-r--r-- | docs/libempathy/libempathy-docs.sgml | 2 | ||||
| -rw-r--r-- | python/pyempathy/pyempathy.defs | 157 | ||||
| -rw-r--r-- | python/pyempathy/pyempathy.override | 2 | ||||
| -rw-r--r-- | python/pyempathygtk/pyempathygtk.defs | 91 | ||||
| -rw-r--r-- | python/pyempathygtk/pyempathygtk.override | 2 |
6 files changed, 161 insertions, 95 deletions
diff --git a/docs/libempathy-gtk/libempathy-gtk-docs.sgml b/docs/libempathy-gtk/libempathy-gtk-docs.sgml index 6c9fab9d8..df56e2784 100644 --- a/docs/libempathy-gtk/libempathy-gtk-docs.sgml +++ b/docs/libempathy-gtk/libempathy-gtk-docs.sgml @@ -34,7 +34,6 @@ <xi:include href="xml/empathy-chat-view.xml"/> <xi:include href="xml/empathy-chat-window.xml"/> <xi:include href="xml/empathy-contact-dialogs.xml"/> - <xi:include href="xml/empathy-contact-groups.xml"/> <xi:include href="xml/empathy-contact-list-store.xml"/> <xi:include href="xml/empathy-contact-list-view.xml"/> <xi:include href="xml/empathy-contact-widget.xml"/> @@ -53,7 +52,6 @@ <xi:include href="xml/empathy-spell-dialog.xml"/> <xi:include href="xml/empathy-spell.xml"/> <xi:include href="xml/empathy-status-icon.xml"/> - <xi:include href="xml/empathy-status-presets.xml"/> <xi:include href="xml/empathy-theme-manager.xml"/> <xi:include href="xml/empathy-ui-utils.xml"/> <xi:include href="xml/ephy-spinner.xml"/> diff --git a/docs/libempathy/libempathy-docs.sgml b/docs/libempathy/libempathy-docs.sgml index f0f49869e..5aa6819d1 100644 --- a/docs/libempathy/libempathy-docs.sgml +++ b/docs/libempathy/libempathy-docs.sgml @@ -22,6 +22,7 @@ <xi:include href="xml/empathy-chatroom.xml"/> <xi:include href="xml/empathy-conf.xml"/> <xi:include href="xml/empathy-contact-factory.xml"/> + <xi:include href="xml/empathy-contact-groups.xml"/> <xi:include href="xml/empathy-contact-list.xml"/> <xi:include href="xml/empathy-contact-manager.xml"/> <xi:include href="xml/empathy-contact.xml"/> @@ -31,6 +32,7 @@ <xi:include href="xml/empathy-log-manager.xml"/> <xi:include href="xml/empathy-message.xml"/> <xi:include href="xml/empathy-presence.xml"/> + <xi:include href="xml/empathy-status-presets.xml"/> <xi:include href="xml/empathy-time.xml"/> <xi:include href="xml/empathy-tp-call.xml"/> <xi:include href="xml/empathy-tp-chatroom.xml"/> diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs index 56825aba5..d98f2605f 100644 --- a/python/pyempathy/pyempathy.defs +++ b/python/pyempathy/pyempathy.defs @@ -233,6 +233,23 @@ +;; 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 @@ -613,6 +630,32 @@ +;; From empathy-contact-groups.h + +(define-function empathy_contact_groups_get_all + (c-name "empathy_contact_groups_get_all") + (return-type "none") +) + +(define-function empathy_contact_group_get_expanded + (c-name "empathy_contact_group_get_expanded") + (return-type "gboolean") + (parameters + '("const-gchar*" "group") + ) +) + +(define-function empathy_contact_group_set_expanded + (c-name "empathy_contact_group_set_expanded") + (return-type "none") + (parameters + '("const-gchar*" "group") + '("gboolean" "expanded") + ) +) + + + ;; From empathy-contact.h (define-function empathy_contact_get_type @@ -934,6 +977,47 @@ +;; 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 @@ -1189,6 +1273,10 @@ +;; From empathy-marshal.h + + + ;; From empathy-message.h (define-function empathy_message_get_gtype @@ -1392,6 +1480,71 @@ +;; From empathy-status-presets.h + +(define-function empathy_status_presets_get_all + (c-name "empathy_status_presets_get_all") + (return-type "none") +) + +(define-function empathy_status_presets_get + (c-name "empathy_status_presets_get") + (return-type "GList*") + (parameters + '("McPresence" "state") + '("gint" "max_number") + ) +) + +(define-function empathy_status_presets_set_last + (c-name "empathy_status_presets_set_last") + (return-type "none") + (parameters + '("McPresence" "state") + '("const-gchar*" "status") + ) +) + +(define-function empathy_status_presets_remove + (c-name "empathy_status_presets_remove") + (return-type "none") + (parameters + '("McPresence" "state") + '("const-gchar*" "status") + ) +) + +(define-function empathy_status_presets_reset + (c-name "empathy_status_presets_reset") + (return-type "none") +) + +(define-function empathy_status_presets_get_default_state + (c-name "empathy_status_presets_get_default_state") + (return-type "McPresence") +) + +(define-function empathy_status_presets_get_default_status + (c-name "empathy_status_presets_get_default_status") + (return-type "const-gchar*") +) + +(define-function empathy_status_presets_set_default + (c-name "empathy_status_presets_set_default") + (return-type "none") + (parameters + '("McPresence" "state") + '("const-gchar*" "status") + ) +) + +(define-function empathy_status_presets_clear_default + (c-name "empathy_status_presets_clear_default") + (return-type "none") +) + + + ;; From empathy-time.h (define-function empathy_time_get_current @@ -2095,6 +2248,10 @@ +;; 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 56b143917..d1f434839 100644 --- a/python/pyempathy/pyempathy.override +++ b/python/pyempathy/pyempathy.override @@ -7,6 +7,7 @@ headers #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" #include "empathy-contact.h" @@ -16,6 +17,7 @@ headers #include "empathy-log-manager.h" #include "empathy-message.h" #include "empathy-presence.h" +#include "empathy-status-presets.h" #include "empathy-time.h" #include "empathy-tp-chat.h" #include "empathy-tp-chatroom.h" diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs index 4970fe7e9..f63e16d4a 100644 --- a/python/pyempathygtk/pyempathygtk.defs +++ b/python/pyempathygtk/pyempathygtk.defs @@ -1015,32 +1015,6 @@ -;; From empathy-contact-groups.h - -(define-function empathy_contact_groups_get_all - (c-name "empathy_contact_groups_get_all") - (return-type "none") -) - -(define-function empathy_contact_group_get_expanded - (c-name "empathy_contact_group_get_expanded") - (return-type "gboolean") - (parameters - '("const-gchar*" "group") - ) -) - -(define-function empathy_contact_group_set_expanded - (c-name "empathy_contact_group_set_expanded") - (return-type "none") - (parameters - '("const-gchar*" "group") - '("gboolean" "expanded") - ) -) - - - ;; From empathy-contact-list-store.h (define-function empathy_contact_list_store_get_type @@ -1642,71 +1616,6 @@ -;; From empathy-status-presets.h - -(define-function empathy_status_presets_get_all - (c-name "empathy_status_presets_get_all") - (return-type "none") -) - -(define-function empathy_status_presets_get - (c-name "empathy_status_presets_get") - (return-type "GList*") - (parameters - '("McPresence" "state") - '("gint" "max_number") - ) -) - -(define-function empathy_status_presets_set_last - (c-name "empathy_status_presets_set_last") - (return-type "none") - (parameters - '("McPresence" "state") - '("const-gchar*" "status") - ) -) - -(define-function empathy_status_presets_remove - (c-name "empathy_status_presets_remove") - (return-type "none") - (parameters - '("McPresence" "state") - '("const-gchar*" "status") - ) -) - -(define-function empathy_status_presets_reset - (c-name "empathy_status_presets_reset") - (return-type "none") -) - -(define-function empathy_status_presets_get_default_state - (c-name "empathy_status_presets_get_default_state") - (return-type "McPresence") -) - -(define-function empathy_status_presets_get_default_status - (c-name "empathy_status_presets_get_default_status") - (return-type "const-gchar*") -) - -(define-function empathy_status_presets_set_default - (c-name "empathy_status_presets_set_default") - (return-type "none") - (parameters - '("McPresence" "state") - '("const-gchar*" "status") - ) -) - -(define-function empathy_status_presets_clear_default - (c-name "empathy_status_presets_clear_default") - (return-type "none") -) - - - ;; From empathy-theme-boxes.h (define-function empathy_theme_boxes_get_type diff --git a/python/pyempathygtk/pyempathygtk.override b/python/pyempathygtk/pyempathygtk.override index 3c7c1a446..f15151762 100644 --- a/python/pyempathygtk/pyempathygtk.override +++ b/python/pyempathygtk/pyempathygtk.override @@ -18,7 +18,6 @@ headers #include "empathy-chat-view.h" #include "empathy-chat-window.h" #include "empathy-contact-dialogs.h" -#include "empathy-contact-groups.h" #include "empathy-contact-list-store.h" #include "empathy-contact-list-view.h" #include "empathy-contact-widget.h" @@ -35,7 +34,6 @@ headers #include "empathy-spell-dialog.h" #include "empathy-spell.h" #include "empathy-status-icon.h" -#include "empathy-status-presets.h" #include "empathy-theme.h" #include "empathy-theme-manager.h" #include "empathy-theme-boxes.h" |