aboutsummaryrefslogtreecommitdiff
path: root/bindings
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-01-06 10:17:44 -0500
committerKen VanDine <ken.vandine@canonical.com>2011-01-06 10:17:44 -0500
commit9d5b3b0e989c12c8ed600272aa895390b277c0dc (patch)
tree8e415a8e7136d6e135ec88d6cd186f1ae04e35e2 /bindings
parent54c9e642092a203b35f63acf915eef78d2cb1ef0 (diff)
parent2437d4ba20b168534165456ed0ed989a9f5f2695 (diff)
downloadlibayatana-appindicator-9d5b3b0e989c12c8ed600272aa895390b277c0dc.tar.gz
libayatana-appindicator-9d5b3b0e989c12c8ed600272aa895390b277c0dc.tar.bz2
libayatana-appindicator-9d5b3b0e989c12c8ed600272aa895390b277c0dc.zip
* Merged changes from ~ubuntu-desktop package
* Intial release. * debian/rules - Changes to build targets to get it building multipass for python 2.6 and 2.7
Diffstat (limited to 'bindings')
-rw-r--r--bindings/Makefile.in9
-rw-r--r--bindings/mono/Makefile.in9
-rw-r--r--bindings/mono/examples/Makefile.in9
-rw-r--r--bindings/mono/libappindicator-api.raw12
-rw-r--r--bindings/python/Makefile.in9
5 files changed, 24 insertions, 24 deletions
diff --git a/bindings/Makefile.in b/bindings/Makefile.in
index 07fa353..422b99b 100644
--- a/bindings/Makefile.in
+++ b/bindings/Makefile.in
@@ -114,7 +114,6 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSC = @CSC@
CYGPATH_W = @CYGPATH_W@
-DBUSSERVICEDIR = @DBUSSERVICEDIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DSYMUTIL = @DSYMUTIL@
@@ -141,10 +140,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@
GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@
GTK_SHARP_LIBS = @GTK_SHARP_LIBS@
HTML_DIR = @HTML_DIR@
-INDICATORDIR = @INDICATORDIR@
-INDICATORICONSDIR = @INDICATORICONSDIR@
-INDICATOR_CFLAGS = @INDICATOR_CFLAGS@
-INDICATOR_LIBS = @INDICATOR_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -161,6 +156,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
+LIBRARY_CFLAGS = @LIBRARY_CFLAGS@
+LIBRARY_LIBS = @LIBRARY_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_PREFIX = @LIB_PREFIX@
@@ -206,6 +203,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@
+TESTDEPS_LIBS = @TESTDEPS_LIBS@
VALA_API_GEN = @VALA_API_GEN@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
diff --git a/bindings/mono/Makefile.in b/bindings/mono/Makefile.in
index a13f039..ee11223 100644
--- a/bindings/mono/Makefile.in
+++ b/bindings/mono/Makefile.in
@@ -142,7 +142,6 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSC = @CSC@
CYGPATH_W = @CYGPATH_W@
-DBUSSERVICEDIR = @DBUSSERVICEDIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DSYMUTIL = @DSYMUTIL@
@@ -169,10 +168,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@
GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@
GTK_SHARP_LIBS = @GTK_SHARP_LIBS@
HTML_DIR = @HTML_DIR@
-INDICATORDIR = @INDICATORDIR@
-INDICATORICONSDIR = @INDICATORICONSDIR@
-INDICATOR_CFLAGS = @INDICATOR_CFLAGS@
-INDICATOR_LIBS = @INDICATOR_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -189,6 +184,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
+LIBRARY_CFLAGS = @LIBRARY_CFLAGS@
+LIBRARY_LIBS = @LIBRARY_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_PREFIX = @LIB_PREFIX@
@@ -234,6 +231,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@
+TESTDEPS_LIBS = @TESTDEPS_LIBS@
VALA_API_GEN = @VALA_API_GEN@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
diff --git a/bindings/mono/examples/Makefile.in b/bindings/mono/examples/Makefile.in
index 89a5024..a150667 100644
--- a/bindings/mono/examples/Makefile.in
+++ b/bindings/mono/examples/Makefile.in
@@ -75,7 +75,6 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSC = @CSC@
CYGPATH_W = @CYGPATH_W@
-DBUSSERVICEDIR = @DBUSSERVICEDIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DSYMUTIL = @DSYMUTIL@
@@ -102,10 +101,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@
GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@
GTK_SHARP_LIBS = @GTK_SHARP_LIBS@
HTML_DIR = @HTML_DIR@
-INDICATORDIR = @INDICATORDIR@
-INDICATORICONSDIR = @INDICATORICONSDIR@
-INDICATOR_CFLAGS = @INDICATOR_CFLAGS@
-INDICATOR_LIBS = @INDICATOR_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -122,6 +117,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
+LIBRARY_CFLAGS = @LIBRARY_CFLAGS@
+LIBRARY_LIBS = @LIBRARY_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_PREFIX = @LIB_PREFIX@
@@ -167,6 +164,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@
+TESTDEPS_LIBS = @TESTDEPS_LIBS@
VALA_API_GEN = @VALA_API_GEN@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
diff --git a/bindings/mono/libappindicator-api.raw b/bindings/mono/libappindicator-api.raw
index 115c7cf..203f141 100644
--- a/bindings/mono/libappindicator-api.raw
+++ b/bindings/mono/libappindicator-api.raw
@@ -27,14 +27,11 @@
<property name="PROP_ICON_NAME_S" cname="PROP_ICON_NAME_S" type="gchar*" readable="true" writeable="true" construct="true" />
<property name="PROP_ATTENTION_ICON_NAME_S" cname="PROP_ATTENTION_ICON_NAME_S" type="gchar*" readable="true" writeable="true" />
<property name="PROP_ICON_THEME_PATH_S" cname="PROP_ICON_THEME_PATH_S" type="gchar*" readable="true" writeable="true" construct="true" />
- <property name="PROP_MENU_S" cname="PROP_MENU_S" type="DbusGObjectPath" readable="true" />
<property name="PROP_CONNECTED_S" cname="PROP_CONNECTED_S" type="gboolean" readable="true" />
<property name="PROP_LABEL_S" cname="PROP_LABEL_S" type="gchar*" readable="true" writeable="true" />
<property name="PROP_LABEL_GUIDE_S" cname="PROP_LABEL_GUIDE_S" type="gchar*" readable="true" writeable="true" />
<property name="PROP_ORDERING_INDEX_S" cname="PROP_ORDERING_INDEX_S" type="guint" readable="true" writeable="true" />
- <property name="PROP_X_ORDERING_INDEX_S" cname="PROP_X_ORDERING_INDEX_S" type="guint" readable="true" writeable="true" />
- <property name="PROP_X_LABEL_S" cname="PROP_X_LABEL_S" type="gchar*" readable="true" writeable="true" />
- <property name="PROP_X_LABEL_GUIDE_S" cname="PROP_X_LABEL_GUIDE_S" type="gchar*" readable="true" writeable="true" />
+ <property name="PROP_DBUS_MENU_SERVER_S" cname="PROP_DBUS_MENU_SERVER_S" type="DbusmenuServer" readable="true" writeable="true" />
<signal when="LAST" field_name="new_icon">
<return-type type="void" />
<parameters>
@@ -95,6 +92,13 @@
<parameter type="GtkStatusIcon*" name="status_icon" />
</parameters>
</virtual_method>
+ <method name="BuildMenuFromDesktop" cname="app_indicator_build_menu_from_desktop">
+ <return-type type="void" />
+ <parameters>
+ <parameter type="const-gchar*" name="desktop_file" />
+ <parameter type="const-gchar*" name="desktop_profile" />
+ </parameters>
+ </method>
<method name="GetAttentionIcon" cname="app_indicator_get_attention_icon">
<return-type type="const-gchar*" />
</method>
diff --git a/bindings/python/Makefile.in b/bindings/python/Makefile.in
index 0ea6178..419334b 100644
--- a/bindings/python/Makefile.in
+++ b/bindings/python/Makefile.in
@@ -139,7 +139,6 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSC = @CSC@
CYGPATH_W = @CYGPATH_W@
-DBUSSERVICEDIR = @DBUSSERVICEDIR@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DSYMUTIL = @DSYMUTIL@
@@ -166,10 +165,6 @@ GTKDOC_REBASE = @GTKDOC_REBASE@
GTK_SHARP_CFLAGS = @GTK_SHARP_CFLAGS@
GTK_SHARP_LIBS = @GTK_SHARP_LIBS@
HTML_DIR = @HTML_DIR@
-INDICATORDIR = @INDICATORDIR@
-INDICATORICONSDIR = @INDICATORICONSDIR@
-INDICATOR_CFLAGS = @INDICATOR_CFLAGS@
-INDICATOR_LIBS = @INDICATOR_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -186,6 +181,8 @@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
+LIBRARY_CFLAGS = @LIBRARY_CFLAGS@
+LIBRARY_LIBS = @LIBRARY_LIBS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_PREFIX = @LIB_PREFIX@
@@ -231,6 +228,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
+TESTDEPS_CFLAGS = @TESTDEPS_CFLAGS@
+TESTDEPS_LIBS = @TESTDEPS_LIBS@
VALA_API_GEN = @VALA_API_GEN@
VERSION = @VERSION@
abs_builddir = @abs_builddir@