diff options
author | Ted Gould <ted@gould.cx> | 2010-06-01 11:07:44 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2010-06-01 11:07:44 -0500 |
commit | 1b748b2921b4b552dddd2cf0c58acbd5304541a5 (patch) | |
tree | 7dddbe70262b8e41202f3f4bf10335c4c06e2d35 /bindings | |
parent | 0e3c221bdfee662f2eddf548c4988f409aa72fde (diff) | |
parent | e0ddc2dbf98ad7411b9a29b34bfd99f94f1ce74e (diff) | |
download | ayatana-indicator-application-1b748b2921b4b552dddd2cf0c58acbd5304541a5.tar.gz ayatana-indicator-application-1b748b2921b4b552dddd2cf0c58acbd5304541a5.tar.bz2 ayatana-indicator-application-1b748b2921b4b552dddd2cf0c58acbd5304541a5.zip |
Merging in trunk
Diffstat (limited to 'bindings')
-rw-r--r-- | bindings/mono/Makefile.am | 12 | ||||
-rw-r--r-- | bindings/mono/appindicator-sharp-0.1.pc.in | 2 | ||||
-rw-r--r-- | bindings/mono/libappindicator-api.metadata | 46 |
3 files changed, 29 insertions, 31 deletions
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 7e2b0d2..4d2d8b4 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -12,7 +12,7 @@ METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp ASSEMBLY = appindicator-sharp.dll TARGET = $(ASSEMBLY) $(ASSEMBLY).config -assemblydir = $(libdir)/appindicator-sharp-0.1 +assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(MIDDLE_API) $(RAW_API) $(TEST) DISTCLEANFILES = $(ASSEMBLY).config @@ -46,21 +46,13 @@ $(MIDDLE_API): $(METADATA) $(RAW_API) fi $(API): $(MIDDLE_API) Makefile.am - sed -e "s|PROP_ID_S|ID|" \ - -e "s|PROP_ID_S|id|" \ - -e "s|PROP_STATUS_S|Status|" \ + sed -e "s|PROP_ID_S|id|" \ -e "s|PROP_STATUS_S|status|" \ - -e "s|PROP_CATEGORY_S|Category|" \ -e "s|PROP_CATEGORY_S|category|" \ - -e "s|PROP_ICON_NAME_S|IconName|" \ -e "s|PROP_ICON_NAME_S|icon-name|" \ - -e "s|PROP_ATTENTION_ICON_NAME_S|AttentionIconName|" \ -e "s|PROP_ATTENTION_ICON_NAME_S|attention-icon-name|" \ - -e "s|PROP_ICON_THEME_PATH_S|IconThemePath|" \ -e "s|PROP_ICON_THEME_PATH_S|icon-theme-path|" \ - -e "s|PROP_MENU_S|Menu|" \ -e "s|PROP_MENU_S|menu|" \ - -e "s|PROP_CONNECTED_S|Connected|" \ -e "s|PROP_CONNECTED_S|connected|" \ $< > $@ diff --git a/bindings/mono/appindicator-sharp-0.1.pc.in b/bindings/mono/appindicator-sharp-0.1.pc.in index 33ff1d7..11ae719 100644 --- a/bindings/mono/appindicator-sharp-0.1.pc.in +++ b/bindings/mono/appindicator-sharp-0.1.pc.in @@ -1,7 +1,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ -assemblies_dir=${libdir}/appindicator-sharp-0.1 +assemblies_dir=${libdir}/cli/appindicator-sharp-0.1 Name: appindicator-sharp Description: application indicators for .NET diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libappindicator-api.metadata index c94cc5b..8f9df53 100644 --- a/bindings/mono/libappindicator-api.metadata +++ b/bindings/mono/libappindicator-api.metadata @@ -9,27 +9,33 @@ <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='connection_changed']" name="cname">connection-changed</attr> <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="name">NewIcon</attr> <attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="cname">new-icon</attr> - <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='id']" name="name">ID</attr> - <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="hidden"></attr> - <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="hidden"></attr> - <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="hidden"></attr> - <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="hidden"></attr> - <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='icon-name']" name="name">IconName</attr> - <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='attention-icon-name']" name="name">AttentionIconName</attr> - <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='menu']" name="name">Menu</attr> - <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='menu']" name="type">GtkMenu*</attr> - <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='connected']" name="name">Connected</attr> - <attr path="/api/namespace/object[@cname='AppIndicator']/method[@name='SetMenu']" name="name">SetMenu</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ID_S']" name="name">ID</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="hidden">true</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="hidden">true</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ICON_NAME_S']" name="name">IconName</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ATTENTION_ICON_NAME_S']" name="name">AttentionIconName</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ICON_THEME_PATH_S']" name="name">IconThemePath</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_MENU_S']" name="name">Menu</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_MENU_S']" name="type">GtkMenu*</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CONNECTED_S']" name="name">Connected</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/method[@name='SetMenu']" name="name">SetMenu</attr> - <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_id']" /> - <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_status']" /> - <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_icon']" /> - <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_category']" /> - <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_attention_icon']" /> + <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new']/*/*[@name='id']" name="property_name">id</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new']/*/*[@name='icon_name']" name="property_name">icon-name</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new']/*/*[@name='category']" name="property_name">category</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new_with_path']/*/*[@name='id']" name="property_name">id</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new_with_path']/*/*[@name='icon_name']" name="property_name">icon-name</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new_with_path']/*/*[@name='category']" name="property_name">category</attr> + <attr path="/api/namespace/object[@cname='AppIndicator']/constructor[@cname='app_indicator_new_with_path']/*/*[@name='icon_path']" name="property_name">icon-theme-path</attr> + + <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_id']" /> + <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_status']" /> + <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_icon']" /> + <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_category']" /> + <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_attention_icon']" /> <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_id']" /> - <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_status']" /> - <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_icon']" /> - <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_category']" /> - <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_attention_icon']" /> + <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_status']" /> + <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_icon']" /> + <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_attention_icon']" /> </metadata> |