Updatre python binding

svn path=/trunk/; revision=720

diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index 8196a5a349fb7c933fe4b51447e08d8958512fd2..f9559611d5ba6868884b5c9749fd1200db6dae59 100644 (file)
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -63,6 +63,27 @@
   (gtype-id "EMPATHY_TYPE_IDLE")
 )
 
   (gtype-id "EMPATHY_TYPE_IDLE")
 )
 

+(define-object IrcNetwork
+  (in-module "Empathy")
+  (parent "GObject")
+  (c-name "EmpathyIrcNetwork")
+  (gtype-id "EMPATHY_TYPE_IRC_NETWORK")
+)
+
+(define-object IrcNetworkManager
+  (in-module "Empathy")
+  (parent "GObject")
+  (c-name "EmpathyIrcNetworkManager")
+  (gtype-id "EMPATHY_TYPE_IRC_NETWORK_MANAGER")
+)
+
+(define-object IrcServer
+  (in-module "Empathy")
+  (parent "GObject")
+  (c-name "EmpathyIrcServer")
+  (gtype-id "EMPATHY_TYPE_IRC_SERVER")
+)
+

 (define-object LogManager
   (in-module "Empathy")
   (parent "GObject")
 (define-object LogManager
   (in-module "Empathy")
   (parent "GObject")


@@ -135,8 +156,10 @@
   (c-name "EmpathyCapabilities")
   (gtype-id "EMPATHY_TYPE_CAPABILITIES")
   (values
   (c-name "EmpathyCapabilities")
   (gtype-id "EMPATHY_TYPE_CAPABILITIES")
   (values

+    '("none" "EMPATHY_CAPABILITIES_NONE")

     '("audio" "EMPATHY_CAPABILITIES_AUDIO")
     '("video" "EMPATHY_CAPABILITIES_VIDEO")
     '("audio" "EMPATHY_CAPABILITIES_AUDIO")
     '("video" "EMPATHY_CAPABILITIES_VIDEO")

+    '("unknown" "EMPATHY_CAPABILITIES_UNKNOWN")

   )
 )
 
   )
 )
 


@@ -975,6 +998,130 @@
 
 
 
 
 
 

+;; From empathy-irc-network.h
+
+(define-function empathy_irc_network_get_type
+  (c-name "empathy_irc_network_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_irc_network_new
+  (c-name "empathy_irc_network_new")
+  (is-constructor-of "EmpathyIrcNetwork")
+  (return-type "EmpathyIrcNetwork*")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method get_servers
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_get_servers")
+  (return-type "GSList*")
+)
+
+(define-method append_server
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_append_server")
+  (return-type "none")
+  (parameters
+    '("EmpathyIrcServer*" "server")
+  )
+)
+
+(define-method remove_server
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_remove_server")
+  (return-type "none")
+  (parameters
+    '("EmpathyIrcServer*" "server")
+  )
+)
+
+(define-method set_server_position
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_set_server_position")
+  (return-type "none")
+  (parameters
+    '("EmpathyIrcServer*" "server")
+    '("gint" "pos")
+  )
+)
+
+
+
+;; From empathy-irc-network-manager.h
+
+(define-function empathy_irc_network_manager_get_type
+  (c-name "empathy_irc_network_manager_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_irc_network_manager_new
+  (c-name "empathy_irc_network_manager_new")
+  (is-constructor-of "EmpathyIrcNetworkManager")
+  (return-type "EmpathyIrcNetworkManager*")
+  (parameters
+    '("const-gchar*" "global_file")
+    '("const-gchar*" "user_file")
+  )
+)
+
+(define-method add
+  (of-object "EmpathyIrcNetworkManager")
+  (c-name "empathy_irc_network_manager_add")
+  (return-type "none")
+  (parameters
+    '("EmpathyIrcNetwork*" "network")
+  )
+)
+
+(define-method remove
+  (of-object "EmpathyIrcNetworkManager")
+  (c-name "empathy_irc_network_manager_remove")
+  (return-type "none")
+  (parameters
+    '("EmpathyIrcNetwork*" "network")
+  )
+)
+
+(define-method get_networks
+  (of-object "EmpathyIrcNetworkManager")
+  (c-name "empathy_irc_network_manager_get_networks")
+  (return-type "GSList*")
+)
+
+(define-method find_network_by_address
+  (of-object "EmpathyIrcNetworkManager")
+  (c-name "empathy_irc_network_manager_find_network_by_address")
+  (return-type "EmpathyIrcNetwork*")
+  (parameters
+    '("const-gchar*" "address")
+  )
+)
+
+
+
+;; From empathy-irc-server.h
+
+(define-function empathy_irc_server_get_type
+  (c-name "empathy_irc_server_get_type")
+  (return-type "GType")
+)
+
+(define-function empathy_irc_server_new
+  (c-name "empathy_irc_server_new")
+  (is-constructor-of "EmpathyIrcServer")
+  (return-type "EmpathyIrcServer*")
+  (parameters
+    '("const-gchar*" "address")
+    '("guint" "port")
+    '("gboolean" "ssl")
+  )
+)
+
+
+

 ;; From empathy-log-manager.h
 
 (define-function empathy_log_manager_get_type
 ;; From empathy-log-manager.h
 
 (define-function empathy_log_manager_get_type


@@ -1739,6 +1886,12 @@
   (return-type "const-gchar*")
 )
 
   (return-type "const-gchar*")
 )
 

+(define-method get_channel
+  (of-object "EmpathyTpGroup")
+  (c-name "empathy_tp_group_get_channel")
+  (return-type "TpChan*")
+)
+

 (define-method is_member
   (of-object "EmpathyTpGroup")
   (c-name "empathy_tp_group_is_member")
 (define-method is_member
   (of-object "EmpathyTpGroup")
   (c-name "empathy_tp_group_is_member")

diff --git a/python/pyempathy/pyempathy.override b/python/pyempathy/pyempathy.override
index 7a7e6820d944bb300591002d1d0d299827cbfb5f..64b65e92066f3ac79913c8d7bdfc3e83f0426728 100644 (file)
--- a/python/pyempathy/pyempathy.override
+++ b/python/pyempathy/pyempathy.override
@@ -4,15 +4,20 @@ headers
 #include <pygobject.h>
 #include "empathy-avatar.h"
 #include "empathy-chandler.h"
 #include <pygobject.h>
 #include "empathy-avatar.h"
 #include "empathy-chandler.h"

-#include "empathy-chatroom-manager.h"

 #include "empathy-chatroom.h"
 #include "empathy-chatroom.h"

+#include "empathy-chatroom-manager.h"
+#include "empathy-contact.h"
+#include "empathy-contact-factory.h"

 #include "empathy-contact-groups.h"
 #include "empathy-contact-list.h"
 #include "empathy-contact-manager.h"
 #include "empathy-contact-groups.h"
 #include "empathy-contact-list.h"
 #include "empathy-contact-manager.h"

-#include "empathy-contact.h"

 #include "empathy-debug.h"
 #include "empathy-debug.h"

+#include "empathy-enum-types.h"

 #include "empathy-filter.h"
 #include "empathy-idle.h"
 #include "empathy-filter.h"
 #include "empathy-idle.h"

+#include "empathy-irc-network.h"
+#include "empathy-irc-network-manager.h"
+#include "empathy-irc-server.h"

 #include "empathy-log-manager.h"
 #include "empathy-message.h"
 #include "empathy-status-presets.h"
 #include "empathy-log-manager.h"
 #include "empathy-message.h"
 #include "empathy-status-presets.h"


@@ -25,8 +30,6 @@ headers
 #include "empathy-tp-group.h"
 #include "empathy-tp-roomlist.h"
 #include "empathy-utils.h"
 #include "empathy-tp-group.h"
 #include "empathy-tp-roomlist.h"
 #include "empathy-utils.h"

-#include "empathy-contact-factory.h"
-#include "empathy-enum-types.h"

 
 void empathy_add_constants(PyObject *module, const gchar *strip_prefix);
 void empathy_register_classes(PyObject *d);
 
 void empathy_add_constants(PyObject *module, const gchar *strip_prefix);
 void empathy_register_classes(PyObject *d);

diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index 0d5a3e5cac8e8b30ae17f28b5c6ad5d4bbdc8879..0ba5ecbc1e292a66489ad4b7b55232b83fd5601f 100644 (file)
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -333,8 +333,8 @@
   (varargs #t)
 )
 
   (varargs #t)
 )
 

-(define-function emapthy_account_widget_add_forget_button
-  (c-name "emapthy_account_widget_add_forget_button")
+(define-function empathy_account_widget_add_forget_button
+  (c-name "empathy_account_widget_add_forget_button")

   (return-type "none")
   (parameters
     '("McAccount*" "account")
   (return-type "none")
   (parameters
     '("McAccount*" "account")


@@ -380,6 +380,37 @@
   )
 )
 
   )
 )
 

+(define-function empathy_account_widget_icq_new
+  (c-name "empathy_account_widget_icq_new")
+  (is-constructor-of "EmpathyAccountWidgetIcq")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+(define-function empathy_account_widget_yahoo_new
+  (c-name "empathy_account_widget_yahoo_new")
+  (is-constructor-of "EmpathyAccountWidgetYahoo")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+
+
+
+;; From empathy-account-widget-irc.h
+
+(define-function empathy_account_widget_irc_new
+  (c-name "empathy_account_widget_irc_new")
+  (is-constructor-of "EmpathyAccountWidgetIrc")
+  (return-type "GtkWidget*")
+  (parameters
+    '("McAccount*" "account")
+  )
+)
+

 
 
 ;; From empathy-avatar-chooser.h
 
 
 ;; From empathy-avatar-chooser.h


@@ -1445,6 +1476,19 @@
 
 
 
 
 
 

+;; From empathy-irc-network-dialog.h
+
+(define-method dialog_show
+  (of-object "EmpathyIrcNetwork")
+  (c-name "empathy_irc_network_dialog_show")
+  (return-type "GtkWidget*")
+  (parameters
+    '("GtkWidget*" "parent")
+  )
+)
+
+
+

 ;; From empathy-log-window.h
 
 (define-function empathy_log_window_show
 ;; From empathy-log-window.h
 
 (define-function empathy_log_window_show

diff --git a/python/pyempathygtk/pyempathygtk.override b/python/pyempathygtk/pyempathygtk.override
index 4967fa6894108e5bd1d8b6122e65c014a61505b4..7df240bd1024bb14fee068d3c3fb712f9d2ad988 100644 (file)
--- a/python/pyempathygtk/pyempathygtk.override
+++ b/python/pyempathygtk/pyempathygtk.override
@@ -2,15 +2,17 @@
 headers
 #include <Python.h>
 #include <pygobject.h>
 headers
 #include <Python.h>
 #include <pygobject.h>

-#include "empathy-avatar-chooser.h"
-#include "empathy-avatar-image.h"

 #include "empathy-about-dialog.h"
 #include "empathy-account-chooser.h"
 #include "empathy-accounts-dialog.h"
 #include "empathy-account-widget.h"
 #include "empathy-about-dialog.h"
 #include "empathy-account-chooser.h"
 #include "empathy-accounts-dialog.h"
 #include "empathy-account-widget.h"

+#include "empathy-account-widget-irc.h"
+#include "empathy-avatar-chooser.h"
+#include "empathy-avatar-image.h"
+#include "empathy-call-window.h"
+#include "empathy-cell-renderer-activatable.h"

 #include "empathy-cell-renderer-expander.h"
 #include "empathy-cell-renderer-text.h"
 #include "empathy-cell-renderer-expander.h"
 #include "empathy-cell-renderer-text.h"

-#include "empathy-cell-renderer-activatable.h"

 #include "empathy-chat.h"
 #include "empathy-chatrooms-window.h"
 #include "empathy-chat-view.h"
 #include "empathy-chat.h"
 #include "empathy-chatrooms-window.h"
 #include "empathy-chat-view.h"


@@ -22,26 +24,27 @@ headers
 #include "empathy-contact-widget.h"
 #include "empathy-geometry.h"
 #include "empathy-group-chat.h"
 #include "empathy-contact-widget.h"
 #include "empathy-geometry.h"
 #include "empathy-group-chat.h"

+#include "empathy-gtk-enum-types.h"
+#include "empathy-gtk-marshal.h"

 #include "empathy-images.h"
 #include "empathy-images.h"

+#include "empathy-irc-network-dialog.h"

 #include "empathy-log-window.h"
 #include "empathy-main-window.h"
 #include "empathy-new-chatroom-dialog.h"
 #include "empathy-log-window.h"
 #include "empathy-main-window.h"
 #include "empathy-new-chatroom-dialog.h"

+#include "empathy-new-message-dialog.h"

 #include "empathy-preferences.h"
 #include "empathy-presence-chooser.h"
 #include "empathy-private-chat.h"
 #include "empathy-profile-chooser.h"
 #include "empathy-preferences.h"
 #include "empathy-presence-chooser.h"
 #include "empathy-private-chat.h"
 #include "empathy-profile-chooser.h"

+#include "empathy-smiley-manager.h"

 #include "empathy-spell-dialog.h"
 #include "empathy-spell.h"
 #include "empathy-status-icon.h"
 #include "empathy-spell-dialog.h"
 #include "empathy-spell.h"
 #include "empathy-status-icon.h"

-#include "empathy-theme.h"
-#include "empathy-theme-manager.h"

 #include "empathy-theme-boxes.h"
 #include "empathy-theme-boxes.h"

+#include "empathy-theme.h"

 #include "empathy-theme-irc.h"
 #include "empathy-theme-irc.h"

+#include "empathy-theme-manager.h"

 #include "empathy-ui-utils.h"
 #include "empathy-ui-utils.h"

-#include "empathy-smiley-manager.h"
-#include "empathy-new-message-dialog.h"
-#include "empathy-call-window.h"
-#include "empathy-gtk-enum-types.h"

 
 void empathy_add_constants(PyObject *module, const gchar *strip_prefix);
 void empathy_register_classes(PyObject *d);
 
 void empathy_add_constants(PyObject *module, const gchar *strip_prefix);
 void empathy_register_classes(PyObject *d);