aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--python/pyempathy/pyempathy.defs11
-rw-r--r--python/pyempathygtk/pyempathygtk.defs86
-rw-r--r--python/pyempathygtk/pyempathygtk.override2
-rwxr-xr-xpython/update-binding.sh2
4 files changed, 31 insertions, 70 deletions
diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs
index 6b6f7dfd3..003564bc5 100644
--- a/python/pyempathy/pyempathy.defs
+++ b/python/pyempathy/pyempathy.defs
@@ -282,6 +282,17 @@
(c-name "empathy_account_manager_create")
(return-type "EmpathyAccount*")
(parameters
+ '("const-gchar*" "connection_manager")
+ '("const-gchar*" "protocol")
+ '("const-gchar*" "display_name")
+ )
+)
+
+(define-method create_by_profile
+ (of-object "EmpathyAccountManager")
+ (c-name "empathy_account_manager_create_by_profile")
+ (return-type "EmpathyAccount*")
+ (parameters
'("McProfile*" "profile")
)
)
diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs
index 377eea43a..1eb50c30f 100644
--- a/python/pyempathygtk/pyempathygtk.defs
+++ b/python/pyempathygtk/pyempathygtk.defs
@@ -118,11 +118,11 @@
(gtype-id "EMPATHY_TYPE_PRESENCE_CHOOSER")
)
-(define-object ProfileChooser
+(define-object ProtocolChooser
(in-module "Empathy")
(parent "GtkComboBox")
- (c-name "EmpathyProfileChooser")
- (gtype-id "EMPATHY_TYPE_PROFILE_CHOOSER")
+ (c-name "EmpathyProtocolChooser")
+ (gtype-id "EMPATHY_TYPE_PROTOCOL_CHOOSER")
)
(define-object SmileyManager
@@ -254,25 +254,6 @@
)
)
-(define-enum Sound
- (in-module "Empathy")
- (c-name "EmpathySound")
- (gtype-id "EMPATHY_TYPE_SOUND")
- (values
- '("empathy-sound-message-incoming" "EMPATHY_SOUND_MESSAGE_INCOMING")
- '("empathy-sound-message-outgoing" "EMPATHY_SOUND_MESSAGE_OUTGOING")
- '("empathy-sound-conversation-new" "EMPATHY_SOUND_CONVERSATION_NEW")
- '("empathy-sound-contact-connected" "EMPATHY_SOUND_CONTACT_CONNECTED")
- '("empathy-sound-contact-disconnected" "EMPATHY_SOUND_CONTACT_DISCONNECTED")
- '("empathy-sound-account-connected" "EMPATHY_SOUND_ACCOUNT_CONNECTED")
- '("empathy-sound-account-disconnected" "EMPATHY_SOUND_ACCOUNT_DISCONNECTED")
- '("empathy-sound-phone-incoming" "EMPATHY_SOUND_PHONE_INCOMING")
- '("empathy-sound-phone-outgoing" "EMPATHY_SOUND_PHONE_OUTGOING")
- '("empathy-sound-phone-hangup" "EMPATHY_SOUND_PHONE_HANGUP")
- '("last-empathy-sound" "LAST_EMPATHY_SOUND")
- )
-)
-
;; From empathy-account-chooser.h
@@ -1541,28 +1522,31 @@
-;; From empathy-profile-chooser.h
+;; From empathy-protocol-chooser.h
-(define-function profile_chooser_get_type
- (c-name "empathy_profile_chooser_get_type")
+(define-function protocol_chooser_get_type
+ (c-name "empathy_protocol_chooser_get_type")
(return-type "GType")
)
-(define-function profile_chooser_new
- (c-name "empathy_profile_chooser_new")
- (is-constructor-of "EmpathyProfileChooser")
+(define-function protocol_chooser_new
+ (c-name "empathy_protocol_chooser_new")
+ (is-constructor-of "EmpathyProtocolChooser")
(return-type "GtkWidget*")
)
(define-method dup_selected
- (of-object "EmpathyProfileChooser")
- (c-name "empathy_profile_chooser_dup_selected")
- (return-type "McProfile*")
+ (of-object "EmpathyProtocolChooser")
+ (c-name "empathy_protocol_chooser_dup_selected")
+ (return-type "TpConnectionManager*")
+ (parameters
+ '("TpConnectionManagerProtocol**" "protocol")
+ )
)
-(define-method n_profiles
- (of-object "EmpathyProfileChooser")
- (c-name "empathy_profile_chooser_n_profiles")
+(define-method n_protocols
+ (of-object "EmpathyProtocolChooser")
+ (c-name "empathy_protocol_chooser_n_protocols")
(return-type "gint")
)
@@ -1782,14 +1766,6 @@
)
)
-(define-function icon_name_from_account
- (c-name "empathy_icon_name_from_account")
- (return-type "const-gchar*")
- (parameters
- '("EmpathyAccount*" "account")
- )
-)
-
(define-function icon_name_for_presence
(c-name "empathy_icon_name_for_presence")
(return-type "const-gchar*")
@@ -1985,30 +1961,4 @@
)
)
-(define-function sound_play
- (c-name "empathy_sound_play")
- (return-type "none")
- (parameters
- '("GtkWidget*" "widget")
- '("EmpathySound" "sound_id")
- )
-)
-
-(define-function sound_play_full
- (c-name "empathy_sound_play_full")
- (return-type "gboolean")
- (parameters
- '("GtkWidget*" "widget")
- '("EmpathySound" "sound_id")
- '("ca_finish_callback_t" "callback")
- '("gpointer" "user_data")
- )
-)
-
-(define-method stop
- (of-object "EmpathySound")
- (c-name "empathy_sound_stop")
- (return-type "none")
-)
-
diff --git a/python/pyempathygtk/pyempathygtk.override b/python/pyempathygtk/pyempathygtk.override
index 3229cbac2..035ef1344 100644
--- a/python/pyempathygtk/pyempathygtk.override
+++ b/python/pyempathygtk/pyempathygtk.override
@@ -27,7 +27,7 @@ headers
#include "empathy-log-window.h"
#include "empathy-new-message-dialog.h"
#include "empathy-presence-chooser.h"
-#include "empathy-profile-chooser.h"
+#include "empathy-protocol-chooser.h"
#include "empathy-smiley-manager.h"
#include "empathy-spell.h"
#include "empathy-theme-boxes.h"
diff --git a/python/update-binding.sh b/python/update-binding.sh
index 854c33159..3636b6341 100755
--- a/python/update-binding.sh
+++ b/python/update-binding.sh
@@ -74,7 +74,7 @@ python /usr/share/pygobject/2.0/codegen/h2def.py \
empathy-log-window.h \
empathy-new-message-dialog.h \
empathy-presence-chooser.h \
- empathy-profile-chooser.h \
+ empathy-protocol-chooser.h \
empathy-smiley-manager.h \
empathy-spell.h \
empathy-theme-boxes.h \