diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-08-22 00:37:48 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2009-08-22 00:37:48 +0800 |
| commit | 84e30dab1428affe335ef904377d07f8b5fdeb66 (patch) | |
| tree | fee9c8ec124a2b5804f6bb4ee31772db56a6e374 /python | |
| parent | fd8e9c5dc2584055177c7a79021cdd53ca431c22 (diff) | |
| parent | 3803736b4326d4bc00d58ccd25f910907f0b4521 (diff) | |
| download | gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.gz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.bz2 gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.lz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.xz gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.tar.zst gsoc2013-empathy-84e30dab1428affe335ef904377d07f8b5fdeb66.zip | |
Merge back from master
Diffstat (limited to 'python')
| -rw-r--r-- | python/pyempathy/pyempathy.defs | 16 | ||||
| -rw-r--r-- | python/pyempathygtk/pyempathygtk.defs | 8 |
2 files changed, 9 insertions, 15 deletions
diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs index 669c09013..b8f0b40aa 100644 --- a/python/pyempathy/pyempathy.defs +++ b/python/pyempathy/pyempathy.defs @@ -233,6 +233,7 @@ '("location" "EMPATHY_DEBUG_LOCATION") '("other" "EMPATHY_DEBUG_OTHER") '("share-desktop" "EMPATHY_DEBUG_SHARE_DESKTOP") + '("connectivity" "EMPATHY_DEBUG_CONNECTIVITY") ) ) @@ -1740,21 +1741,6 @@ ) ) -(define-method get_use_nm - (of-object "EmpathyIdle") - (c-name "empathy_idle_get_use_nm") - (return-type "gboolean") -) - -(define-method set_use_nm - (of-object "EmpathyIdle") - (c-name "empathy_idle_set_use_nm") - (return-type "none") - (parameters - '("gboolean" "use_nm") - ) -) - ;; From empathy-irc-network.h diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs index 5b23def9a..51d32709e 100644 --- a/python/pyempathygtk/pyempathygtk.defs +++ b/python/pyempathygtk/pyempathygtk.defs @@ -2033,4 +2033,12 @@ ) ) +(define-function make_absolute_url + (c-name "empathy_make_absolute_url") + (return-type "gchar*") + (parameters + '("const-gchar*" "url") + ) +) + |