From a84d2ff1a684995ce75ff78c57c0e1ac2a4bf7d5 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 10 Feb 2008 17:12:07 +0000 Subject: Add a generic UI to make easy building UI for protocol specific settings. Port empathy-account-widget-*.[ch] to use that API. svn path=/trunk/; revision=621 --- python/pyempathy/pyempathy.defs | 69 ++++--------------------------- python/pyempathygtk.patch | 57 +++++++++++++++++++++++++ python/pyempathygtk/pyempathygtk.defs | 59 +++++++++++++++++--------- python/pyempathygtk/pyempathygtk.override | 4 +- 4 files changed, 107 insertions(+), 82 deletions(-) create mode 100644 python/pyempathygtk.patch (limited to 'python') diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs index 0c22ab6cc..116248f70 100644 --- a/python/pyempathy/pyempathy.defs +++ b/python/pyempathy/pyempathy.defs @@ -1962,6 +1962,15 @@ ) ) +(define-function empathy_call_with_contact_id + (c-name "empathy_call_with_contact_id") + (return-type "none") + (parameters + '("McAccount*" "account") + '("const-gchar*" "contact_id") + ) +) + (define-function empathy_chat_with_contact (c-name "empathy_chat_with_contact") (return-type "none") @@ -2004,63 +2013,3 @@ ) - -;; From tp-stream-engine-gen.h - -(define-function dbus_g_proxy_begin_call - (c-name "dbus_g_proxy_begin_call") - (return-type "return") - (parameters - ) -) - -(define-function dbus_g_proxy_begin_call - (c-name "dbus_g_proxy_begin_call") - (return-type "return") - (parameters - ) -) - -(define-function dbus_g_proxy_begin_call - (c-name "dbus_g_proxy_begin_call") - (return-type "return") - (parameters - ) -) - -(define-function dbus_g_proxy_begin_call - (c-name "dbus_g_proxy_begin_call") - (return-type "return") - (parameters - ) -) - -(define-function dbus_g_proxy_begin_call - (c-name "dbus_g_proxy_begin_call") - (return-type "return") - (parameters - ) -) - -(define-function dbus_g_proxy_begin_call - (c-name "dbus_g_proxy_begin_call") - (return-type "return") - (parameters - ) -) - -(define-function dbus_g_proxy_begin_call - (c-name "dbus_g_proxy_begin_call") - (return-type "return") - (parameters - ) -) - -(define-function dbus_g_proxy_begin_call - (c-name "dbus_g_proxy_begin_call") - (return-type "return") - (parameters - ) -) - - diff --git a/python/pyempathygtk.patch b/python/pyempathygtk.patch new file mode 100644 index 000000000..754735e81 --- /dev/null +++ b/python/pyempathygtk.patch @@ -0,0 +1,57 @@ +--- pyempathygtk.defs 2008-02-10 17:56:26.000000000 +0100 ++++ pyempathygtk/pyempathygtk.defs 2008-02-10 17:57:11.000000000 +0100 +@@ -147,13 +147,6 @@ + (gtype-id "EMPATHY_TYPE_THEME_MANAGER") + ) + +-(define-object Spinner +- (in-module "Ephy") +- (parent "GtkWidget") +- (c-name "EphySpinner") +- (gtype-id "EPHY_TYPE_SPINNER") +-) +- + ;; Enumerations and flags ... + + (define-enum ChatViewBlock +@@ -2112,40 +2105,3 @@ + (varargs #t) + ) + +- +- +-;; From ephy-spinner.h +- +-(define-function ephy_spinner_get_type +- (c-name "ephy_spinner_get_type") +- (return-type "GType") +-) +- +-(define-function ephy_spinner_new +- (c-name "ephy_spinner_new") +- (is-constructor-of "EphySpinner") +- (return-type "GtkWidget*") +-) +- +-(define-method start +- (of-object "EphySpinner") +- (c-name "ephy_spinner_start") +- (return-type "none") +-) +- +-(define-method stop +- (of-object "EphySpinner") +- (c-name "ephy_spinner_stop") +- (return-type "none") +-) +- +-(define-method set_size +- (of-object "EphySpinner") +- (c-name "ephy_spinner_set_size") +- (return-type "none") +- (parameters +- '("GtkIconSize" "size") +- ) +-) +- +- diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs index f92a3eeb2..4f5e0f5a4 100644 --- a/python/pyempathygtk/pyempathygtk.defs +++ b/python/pyempathygtk/pyempathygtk.defs @@ -320,7 +320,30 @@ -;; From empathy-account-widget-generic.h +;; From empathy-account-widget.h + +(define-function empathy_account_widget_new_with_glade + (c-name "empathy_account_widget_new_with_glade") + (return-type "GtkWidget*") + (parameters + '("McAccount*" "account") + '("GladeXML*" "glade") + '("const-gchar*" "root") + '("const-gchar*" "first_widget_name") + ) + (varargs #t) +) + +(define-function emapthy_account_widget_add_forget_button + (c-name "emapthy_account_widget_add_forget_button") + (return-type "none") + (parameters + '("McAccount*" "account") + '("GladeXML*" "glade") + '("const-gchar*" "button") + '("const-gchar*" "entry") + ) +) (define-function empathy_account_widget_generic_new (c-name "empathy_account_widget_generic_new") @@ -331,23 +354,15 @@ ) ) - - -;; From empathy-account-widget-jabber.h - -(define-function empathy_account_widget_jabber_new - (c-name "empathy_account_widget_jabber_new") - (is-constructor-of "EmpathyAccountWidgetJabber") +(define-function empathy_account_widget_salut_new + (c-name "empathy_account_widget_salut_new") + (is-constructor-of "EmpathyAccountWidgetSalut") (return-type "GtkWidget*") (parameters '("McAccount*" "account") ) ) - - -;; From empathy-account-widget-msn.h - (define-function empathy_account_widget_msn_new (c-name "empathy_account_widget_msn_new") (is-constructor-of "EmpathyAccountWidgetMsn") @@ -357,13 +372,9 @@ ) ) - - -;; From empathy-account-widget-salut.h - -(define-function empathy_account_widget_salut_new - (c-name "empathy_account_widget_salut_new") - (is-constructor-of "EmpathyAccountWidgetSalut") +(define-function empathy_account_widget_jabber_new + (c-name "empathy_account_widget_jabber_new") + (is-constructor-of "EmpathyAccountWidgetJabber") (return-type "GtkWidget*") (parameters '("McAccount*" "account") @@ -1869,6 +1880,16 @@ ;; From empathy-ui-utils.h +(define-function empathy_glade_get + (c-name "empathy_glade_get") + (return-type "GladeXML*") + (parameters + '("const-gchar*" "filename") + '("const-gchar*" "root") + '("const-gchar*" "domain") + ) +) + (define-function empathy_glade_get_file_simple (c-name "empathy_glade_get_file_simple") (return-type "none") diff --git a/python/pyempathygtk/pyempathygtk.override b/python/pyempathygtk/pyempathygtk.override index c7c59415b..f806b62f8 100644 --- a/python/pyempathygtk/pyempathygtk.override +++ b/python/pyempathygtk/pyempathygtk.override @@ -7,9 +7,7 @@ headers #include "empathy-about-dialog.h" #include "empathy-account-chooser.h" #include "empathy-accounts-dialog.h" -#include "empathy-account-widget-generic.h" -#include "empathy-account-widget-jabber.h" -#include "empathy-account-widget-msn.h" +#include "empathy-account-widget.h" #include "empathy-cell-renderer-expander.h" #include "empathy-cell-renderer-text.h" #include "empathy-cell-renderer-activatable.h" -- cgit v1.2.3