From 50efb94e69a9cccebb7475f1977e7eb1f749f362 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 25 Apr 2008 09:33:29 +0000 Subject: Create contact menu in empathy-contact-menu.h svn path=/trunk/; revision=1046 --- python/pyempathy/pyempathy.defs | 7 ++ python/pyempathygtk/pyempathygtk.defs | 116 ++++++++++++++++++++-------------- python/update-binding.sh | 1 + 3 files changed, 77 insertions(+), 47 deletions(-) (limited to 'python') diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs index 99e068067..a722461c4 100644 --- a/python/pyempathy/pyempathy.defs +++ b/python/pyempathy/pyempathy.defs @@ -150,6 +150,7 @@ (values '("as-is" "EMPATHY_REGEX_AS_IS") '("browser" "EMPATHY_REGEX_BROWSER") + '("apt" "EMPATHY_REGEX_APT") '("email" "EMPATHY_REGEX_EMAIL") '("other" "EMPATHY_REGEX_OTHER") '("all" "EMPATHY_REGEX_ALL") @@ -1597,6 +1598,12 @@ (return-type "McAccount*") ) +(define-method get_channel + (of-object "EmpathyTpChat") + (c-name "empathy_tp_chat_get_channel") + (return-type "TpChannel*") +) + (define-method is_ready (of-object "EmpathyTpChat") (c-name "empathy_tp_chat_is_ready") diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs index fd3ca2015..604c959cd 100644 --- a/python/pyempathygtk/pyempathygtk.defs +++ b/python/pyempathygtk/pyempathygtk.defs @@ -152,22 +152,15 @@ ) ) -(define-flags ContactListFeatures +(define-flags ContactListFeatureFlags (in-module "Empathy") - (c-name "EmpathyContactListFeatures") - (gtype-id "EMPATHY_TYPE_CONTACT_LIST_FEATURES") + (c-name "EmpathyContactListFeatureFlags") + (gtype-id "EMPATHY_TYPE_CONTACT_LIST_FEATURE_FLAGS") (values '("none" "EMPATHY_CONTACT_LIST_FEATURE_NONE") '("groups-save" "EMPATHY_CONTACT_LIST_FEATURE_GROUPS_SAVE") '("groups-rename" "EMPATHY_CONTACT_LIST_FEATURE_GROUPS_RENAME") '("groups-remove" "EMPATHY_CONTACT_LIST_FEATURE_GROUPS_REMOVE") - '("contact-chat" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CHAT") - '("contact-call" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_CALL") - '("contact-log" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_LOG") - '("contact-ft" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_FT") - '("contact-invite" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_INVITE") - '("contact-edit" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_EDIT") - '("contact-info" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_INFO") '("contact-remove" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_REMOVE") '("contact-drop" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DROP") '("contact-drag" "EMPATHY_CONTACT_LIST_FEATURE_CONTACT_DRAG") @@ -189,6 +182,21 @@ ) ) +(define-flags ContactFeatureFlags + (in-module "Empathy") + (c-name "EmpathyContactFeatureFlags") + (gtype-id "EMPATHY_TYPE_CONTACT_FEATURE_FLAGS") + (values + '("none" "EMPATHY_CONTACT_FEATURE_NONE") + '("chat" "EMPATHY_CONTACT_FEATURE_CHAT") + '("call" "EMPATHY_CONTACT_FEATURE_CALL") + '("log" "EMPATHY_CONTACT_FEATURE_LOG") + '("edit" "EMPATHY_CONTACT_FEATURE_EDIT") + '("info" "EMPATHY_CONTACT_FEATURE_INFO") + '("all" "EMPATHY_CONTACT_FEATURE_ALL") + ) +) + ;; From empathy-images.h @@ -325,6 +333,12 @@ (return-type "guint") ) +(define-method get_contact_menu + (of-object "EmpathyChat") + (c-name "empathy_chat_get_contact_menu") + (return-type "GtkWidget*") +) + (define-method clear (of-object "EmpathyChat") (c-name "empathy_chat_clear") @@ -450,15 +464,6 @@ ) ) -(define-method set_margin - (of-object "EmpathyChatView") - (c-name "empathy_chat_view_set_margin") - (return-type "none") - (parameters - '("gint" "margin") - ) -) - (define-method scroll (of-object "EmpathyChatView") (c-name "empathy_chat_view_scroll") @@ -569,15 +574,6 @@ ) ) -(define-method set_is_group_chat - (of-object "EmpathyChatView") - (c-name "empathy_chat_view_set_is_group_chat") - (return-type "none") - (parameters - '("gboolean" "is_group_chat") - ) -) - (define-method get_last_timestamp (of-object "EmpathyChatView") (c-name "empathy_chat_view_get_last_timestamp") @@ -1286,25 +1282,11 @@ (return-type "EmpathyContactListView*") (parameters '("EmpathyContactListStore*" "store") - '("EmpathyContactListFeatures" "features") + '("EmpathyContactListFeatureFlags" "list_features") + '("EmpathyContactFeatureFlags" "contact_features") ) ) -(define-method set_features - (of-object "EmpathyContactListView") - (c-name "empathy_contact_list_view_set_features") - (return-type "none") - (parameters - '("EmpathyContactListFeatures" "features") - ) -) - -(define-method get_features - (of-object "EmpathyContactListView") - (c-name "empathy_contact_list_view_get_features") - (return-type "EmpathyContactListFeatures") -) - (define-method get_selected (of-object "EmpathyContactListView") (c-name "empathy_contact_list_view_get_selected") @@ -1321,9 +1303,6 @@ (of-object "EmpathyContactListView") (c-name "empathy_contact_list_view_get_contact_menu") (return-type "GtkWidget*") - (parameters - '("EmpathyContact*" "contact") - ) ) (define-method get_group_menu @@ -1809,3 +1788,46 @@ ) + +;; From empathy-contact-menu.h + +(define-method menu_new + (of-object "EmpathyContact") + (c-name "empathy_contact_menu_new") + (return-type "GtkWidget*") + (parameters + '("EmpathyContactFeatureFlags" "features") + ) +) + +(define-method chat_menu_item_new + (of-object "EmpathyContact") + (c-name "empathy_contact_chat_menu_item_new") + (return-type "GtkWidget*") +) + +(define-method call_menu_item_new + (of-object "EmpathyContact") + (c-name "empathy_contact_call_menu_item_new") + (return-type "GtkWidget*") +) + +(define-method log_menu_item_new + (of-object "EmpathyContact") + (c-name "empathy_contact_log_menu_item_new") + (return-type "GtkWidget*") +) + +(define-method info_menu_item_new + (of-object "EmpathyContact") + (c-name "empathy_contact_info_menu_item_new") + (return-type "GtkWidget*") +) + +(define-method edit_menu_item_new + (of-object "EmpathyContact") + (c-name "empathy_contact_edit_menu_item_new") + (return-type "GtkWidget*") +) + + diff --git a/python/update-binding.sh b/python/update-binding.sh index 4f780aedc..b39341ffc 100755 --- a/python/update-binding.sh +++ b/python/update-binding.sh @@ -67,6 +67,7 @@ python /usr/share/pygtk/2.0/codegen/h2def.py \ empathy-smiley-manager.h \ empathy-cell-renderer-text.h \ empathy-spell.h \ + empathy-contact-menu.h \ > ../python/pyempathygtk/pyempathygtk.defs # Keep original version -- cgit v1.2.1