aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bindings/mono/app-indicator.sources.xml2
-rw-r--r--bindings/mono/libappindicator-api.metadata14
-rw-r--r--configure.ac4
-rw-r--r--src/libappindicator/app-indicator.c8
4 files changed, 24 insertions, 4 deletions
diff --git a/bindings/mono/app-indicator.sources.xml b/bindings/mono/app-indicator.sources.xml
index 8ee8758..3585c44 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">
+ <library name="libappindicator.so.0">
<namespace name="AppIndicator">
<directory path="../../src/libappindicator">
<exclude>app-indicator-enum-types.h.in</exclude>
diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libappindicator-api.metadata
index ad0ebc0..f019f0a 100644
--- a/bindings/mono/libappindicator-api.metadata
+++ b/bindings/mono/libappindicator-api.metadata
@@ -7,11 +7,25 @@
<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="name">NewIcon</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="name">Category</attr>
+ <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="type">AppIndicatorCategory</attr>
<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="name">Status</attr>
+ <attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="type">AppIndicatorStatus</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_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']" />
+
+ <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']" />
</metadata>
diff --git a/configure.ac b/configure.ac
index 2992df2..114b42b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(indicator-application, 0.0.5, ted@canonical.com)
+AC_INIT(indicator-application, 0.0.4, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009 Canonical])
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.0.5)
+AM_INIT_AUTOMAKE(indicator-application, 0.0.4)
AM_MAINTAINER_MODE
diff --git a/src/libappindicator/app-indicator.c b/src/libappindicator/app-indicator.c
index 791f9ff..bb68cb2 100644
--- a/src/libappindicator/app-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -278,6 +278,7 @@ app_indicator_init (AppIndicator *self)
priv->icon_name = NULL;
priv->attention_icon_name = NULL;
priv->menu = NULL;
+ priv->menuservice = NULL;
priv->watcher_proxy = NULL;
priv->connection = NULL;
@@ -754,8 +755,13 @@ setup_dbusmenu (AppIndicator *self)
container_iterate,
root);
- priv->menuservice = dbusmenu_server_new ("/need/a/menu/path");
+ if (priv->menuservice == NULL) {
+ priv->menuservice = dbusmenu_server_new ("/need/a/menu/path");
+ }
+
dbusmenu_server_set_root (priv->menuservice, root);
+
+ return;
}
/**