diff options
| author | Jo Shields <jms@destiny> | 2010-09-19 20:47:07 +0100 |
|---|---|---|
| committer | Jo Shields <jms@destiny> | 2010-09-19 20:47:07 +0100 |
| commit | 4247b7e6e67ab79cea4f5b80566ab1e8def6f6f2 (patch) | |
| tree | 37793aba80fc8180b56e789f0836ad37d0ee48af | |
| parent | b598108bd71748ab0dc7088a36835864f5f96e22 (diff) | |
| download | ayatana-indicator-application-4247b7e6e67ab79cea4f5b80566ab1e8def6f6f2.tar.gz ayatana-indicator-application-4247b7e6e67ab79cea4f5b80566ab1e8def6f6f2.tar.bz2 ayatana-indicator-application-4247b7e6e67ab79cea4f5b80566ab1e8def6f6f2.zip | |
The purpose of a dllmap is to turn a DllImport for "foo" into a dlopen of "bar". This is most commonly used to make apps more cross-platform, by specifying the Windows library name (foo.dll) into a Linux/OSX/etc filename (libfoo.so.0).
indicator-application has been binding directly to libappindicator.so.0, which means multiple places to update if the SONAME changes, and makes it less portable - this commit fixes this.
| -rw-r--r-- | bindings/mono/ApplicationIndicator.custom | 8 | ||||
| -rw-r--r-- | bindings/mono/app-indicator.sources.xml | 2 | ||||
| -rw-r--r-- | bindings/mono/appindicator-sharp.dll.config.in | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/bindings/mono/ApplicationIndicator.custom b/bindings/mono/ApplicationIndicator.custom index 11d16a8..fcc52d7 100644 --- a/bindings/mono/ApplicationIndicator.custom +++ b/bindings/mono/ApplicationIndicator.custom @@ -1,10 +1,10 @@ -[DllImport ("libappindicator.so.0")] +[DllImport ("appindicator.dll")] static extern int app_indicator_get_status (IntPtr i); -[DllImport ("libappindicator.so.0")] +[DllImport ("appindicator.dll")] static extern int app_indicator_get_category (IntPtr i); -[DllImport ("libappindicator.so.0")] +[DllImport ("appindicator.dll")] static extern void app_indicator_set_status (IntPtr i, int s); [GLib.Property ("status")] @@ -23,4 +23,4 @@ static extern void app_indicator_set_status (IntPtr i, int s); get { return (Category) app_indicator_get_category (Handle); } - }
\ No newline at end of file + } diff --git a/bindings/mono/app-indicator.sources.xml b/bindings/mono/app-indicator.sources.xml index 97faadf..6cf28e9 100644 --- a/bindings/mono/app-indicator.sources.xml +++ b/bindings/mono/app-indicator.sources.xml @@ -1,6 +1,6 @@ <gapi-parser-input> <api filename="libappindicator-api.raw"> - <library name="libappindicator.so.0"> + <library name="appindicator.dll"> <namespace name="AppIndicator"> <file>app-indicator.c</file> <file>../../src/app-indicator-enum-types.c</file> diff --git a/bindings/mono/appindicator-sharp.dll.config.in b/bindings/mono/appindicator-sharp.dll.config.in index d0e9e1e..6422a93 100644 --- a/bindings/mono/appindicator-sharp.dll.config.in +++ b/bindings/mono/appindicator-sharp.dll.config.in @@ -1,5 +1,5 @@ <configuration> - <dllmap dll="appindicator-sharp.dll" target="libappindicator@LIB_PREFIX@.0@LIB_SUFFIX@"/> + <dllmap dll="appindicator.dll" target="libappindicator@LIB_PREFIX@.0@LIB_SUFFIX@"/> <dllmap dll="libgtk-2.0-0.dll" target="libgtk-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> |