Merge authors: Ted Gould (ted) Related merge proposals: https://code.launchpad.net/~ted/indicator-applet/python-v2work/+merge/11948 proposed by: Ted Gould (ted) review: Approve - Neil J. Patel (njpatel) ------------------------------------------------------------ revno: 30 [merge] committer: Ted Gould <[email protected]> branch nick: trunk timestamp: Thu 2009-09-17 09:05:12 -0500 message: Merging in branch updating the bindings to the v2 API modified: configure.ac src/indicate.defs src/indicate.override
-- lp:indicator-applet/python0.2 https://code.launchpad.net/~indicator-applet-developers/indicator-applet/indicate-python Your team ayatana-commits is subscribed to branch lp:indicator-applet/python0.2. To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-applet/indicate-python/+edit-subscription.
=== modified file 'configure.ac' --- configure.ac 2009-08-05 10:26:04 +0000 +++ configure.ac 2009-09-14 15:56:26 +0000 @@ -1,16 +1,16 @@ -AC_INIT(indicate-python, 0.0.3, [email protected]) +AC_INIT(indicate-python, 0.2.0, [email protected]) AC_PREREQ(2.50) AC_CONFIG_SRCDIR(config.h.in) AC_COPYRIGHT([Copyright 2009 Canonical]) PACKAGE=indicate-python -VERSION=0.0.3 +VERSION=0.2.0 AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AM_CONFIG_HEADER(config.h) PYGTK_REQUIRED=2.14.0 -LIBINDICATE_REQUIRED=0.1.1 +LIBINDICATE_REQUIRED=0.2.0 PYGOBJECT_REQUIRED=0.22 AM_MAINTAINER_MODE === modified file 'src/indicate.defs' --- src/indicate.defs 2009-04-10 15:17:38 +0000 +++ src/indicate.defs 2009-09-14 18:36:15 +0000 @@ -7,13 +7,6 @@ (gtype-id "INDICATE_TYPE_INDICATOR") ) -(define-object IndicatorMessage - (in-module "Indicate") - (parent "IndicateIndicator") - (c-name "IndicateIndicatorMessage") - (gtype-id "INDICATE_TYPE_INDICATOR_MESSAGE") -) - (define-object Listener (in-module "Indicate") (parent "GObject") @@ -83,12 +76,6 @@ (return-type "guint") ) -(define-method get_indicator_type - (of-object "IndicateIndicator") - (c-name "indicate_indicator_get_indicator_type") - (return-type "const-gchar*") -) - (define-method user_display (of-object "IndicateIndicator") (c-name "indicate_indicator_user_display") @@ -125,6 +112,26 @@ ) ) +(define-method set_property_int + (of-object "IndicateIndicator") + (c-name "indicate_indicator_set_property_int") + (return-type "none") + (parameters + '("const-gchar*" "key") + '("gint" "value") + ) +) + +(define-method set_property_bool + (of-object "IndicateIndicator") + (c-name "indicate_indicator_set_property_bool") + (return-type "none") + (parameters + '("const-gchar*" "key") + '("gboolean" "value") + ) +) + (define-method get_property (of-object "IndicateIndicator") (c-name "indicate_indicator_get_property") @@ -140,21 +147,20 @@ (return-type "GPtrArray*") ) - - -;; From indicator-message.h - -(define-function indicate_indicator_message_get_type - (c-name "indicate_indicator_message_get_type") - (return-type "GType") -) - -(define-function indicate_indicator_message_new - (c-name "indicate_indicator_message_new") - (is-constructor-of "IndicateIndicatorMessage") - (return-type "IndicateIndicatorMessage*") -) - +(define-method set_displayed + (of-object "IndicateIndicator") + (c-name "indicate_indicator_set_displayed") + (return-type "none") + (parameters + '("gboolean" "displayed") + ) +) + +(define-method get_displayed + (of-object "IndicateIndicator") + (c-name "indicate_indicator_get_displayed") + (return-type "gboolean") +) ;; From listener.h @@ -350,6 +356,15 @@ ) ) +(define-method set_count + (of-object "IndicateServer") + (c-name "indicate_server_set_count") + (return-type "none") + (parameters + '("guint" "count") + ) +) + (define-method show (of-object "IndicateServer") (c-name "indicate_server_show") @@ -397,41 +412,21 @@ (return-type "none") ) -(define-method emit_indicator_added - (of-object "IndicateServer") - (c-name "indicate_server_emit_indicator_added") - (return-type "none") - (parameters - '("guint" "id") - '("const-gchar*" "type") - ) -) - -(define-method emit_indicator_removed - (of-object "IndicateServer") - (c-name "indicate_server_emit_indicator_removed") - (return-type "none") - (parameters - '("guint" "id") - '("const-gchar*" "type") - ) -) - -(define-method emit_indicator_modified - (of-object "IndicateServer") - (c-name "indicate_server_emit_indicator_modified") - (return-type "none") - (parameters - '("guint" "id") - '("const-gchar*" "property") - ) -) - -(define-method emit_server_display - (of-object "IndicateServer") - (c-name "indicate_server_emit_server_display") - (return-type "none") -) +(define-method check_interest + (of-object "IndicateServer") + (c-name "indicate_server_check_interest") + (return-type "gboolean") + (parameters + '("IndicateInterests" "interest") + ) +) + +(define-method get_max_indicators + (of-object "IndicateServer") + (c-name "indicate_server_get_max_indicators") + (return-type "gint") +) + === modified file 'src/indicate.override' --- src/indicate.override 2009-08-05 10:26:04 +0000 +++ src/indicate.override 2009-09-14 16:41:57 +0000 @@ -28,7 +28,7 @@ headers #include <Python.h> #include <libindicate/indicator.h> -#include <libindicate/indicator-message.h> +#include <libindicate/indicator-messages.h> #include <libindicate/listener.h> #include <libindicate/server.h> #include <libindicate/interests.h>
_______________________________________________ Mailing list: https://launchpad.net/~ayatana-commits Post to : [email protected] Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
