diff options
| -rw-r--r-- | bindings/mono/Makefile.am | 2 | ||||
| -rw-r--r-- | bindings/mono/policy.0.0.appindicator-sharp.config.in | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/app-indicator.c | 10 | ||||
| -rw-r--r-- | src/application-service-appstore.c | 16 |
5 files changed, 24 insertions, 10 deletions
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 1219e0e..98fe6f9 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -10,7 +10,7 @@ MIDDLE_API = libappindicator-api.middle RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp -ASSEMBLY_VERSION = 0.1 +ASSEMBLY_VERSION = 0.1.0.0 ASSEMBLY = $(ASSEMBLY_NAME).dll POLICY = policy.$(POLICY_VERSION).$(ASSEMBLY_NAME) POLICY_VERSION = 0.0 diff --git a/bindings/mono/policy.0.0.appindicator-sharp.config.in b/bindings/mono/policy.0.0.appindicator-sharp.config.in index dd9e6e9..95c21ed 100644 --- a/bindings/mono/policy.0.0.appindicator-sharp.config.in +++ b/bindings/mono/policy.0.0.appindicator-sharp.config.in @@ -3,7 +3,7 @@ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <dependentAssembly> <assemblyIdentity name="@ASSEMBLY_NAME@" publicKeyToken="bcae265d1c7ab4c2" /> - <bindingRedirect oldVersion="0.0-@ASSEMBLY_VERSION@" newVersion="@ASSEMBLY_VERSION@"/> + <bindingRedirect oldVersion="0.0.0.0-@ASSEMBLY_VERSION@" newVersion="@ASSEMBLY_VERSION@"/> </dependentAssembly> </assemblyBinding> </runtime> diff --git a/configure.ac b/configure.ac index 9396c5c..bd3c6a4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(indicator-application, 0.2.0, ted@canonical.com) +AC_INIT(indicator-application, 0.2.1, ted@canonical.com) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-application, 0.2.0) +AM_INIT_AUTOMAKE(indicator-application, 0.2.1) AM_MAINTAINER_MODE diff --git a/src/app-indicator.c b/src/app-indicator.c index 6c2a8d9..32f512f 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -229,7 +229,7 @@ app_indicator_class_init (AppIndicatorClass *klass) "An icon for the indicator", "The default icon that is shown for the indicator.", NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT)); + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** AppIndicator:attention-icon-name: @@ -1408,12 +1408,12 @@ container_iterate (GtkWidget *widget, container_iterate, child); g_signal_connect_object (submenu, - "add", + "child-added", G_CALLBACK (submenu_changed), child, 0); g_signal_connect_object (submenu, - "remove", + "child-removed", G_CALLBACK (submenu_changed), child, 0); @@ -1552,11 +1552,11 @@ app_indicator_set_menu (AppIndicator *self, GtkMenu *menu) check_connect (self); g_signal_connect (menu, - "add", + "child-added", G_CALLBACK (client_menu_changed), self); g_signal_connect (menu, - "remove", + "child-removed", G_CALLBACK (client_menu_changed), self); } diff --git a/src/application-service-appstore.c b/src/application-service-appstore.c index 66943b5..15abea3 100644 --- a/src/application-service-appstore.c +++ b/src/application-service-appstore.c @@ -243,7 +243,21 @@ get_all_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * err static AppIndicatorStatus string_to_status(const gchar * status_string) { - return (AppIndicatorStatus) g_enum_get_value_by_nick((GEnumClass *)g_type_class_ref (APP_INDICATOR_TYPE_INDICATOR_STATUS), status_string); + GEnumClass * klass = G_ENUM_CLASS(g_type_class_ref(APP_INDICATOR_TYPE_INDICATOR_STATUS)); + g_return_val_if_fail(klass != NULL, APP_INDICATOR_STATUS_PASSIVE); + + AppIndicatorStatus retval = APP_INDICATOR_STATUS_PASSIVE; + + GEnumValue * val = g_enum_get_value_by_nick(klass, status_string); + if (val == NULL) { + g_warning("Unrecognized status '%s' assuming passive.", status_string); + } else { + retval = (AppIndicatorStatus)val->value; + } + + g_type_class_unref(klass); + + return retval; } /* A small helper function to get the position of an application |