diff options
| -rw-r--r-- | ChangeLog | 112 | ||||
| -rw-r--r-- | bindings/mono/Makefile.am | 52 | ||||
| -rw-r--r-- | bindings/mono/Makefile.in | 49 | ||||
| -rw-r--r-- | bindings/mono/app-indicator.sources.xml | 8 | ||||
| -rw-r--r-- | bindings/mono/libappindicator-api.raw | 192 | ||||
| -rw-r--r-- | bindings/mono/policy.0.0.appindicator-sharp.config.in | 10 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 31 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rw-r--r-- | debian/libappindicator0.1-cil.installcligac | 1 | ||||
| -rw-r--r-- | docs/reference/html/libappindicator-app-indicator.html | 110 | ||||
| -rw-r--r-- | docs/reference/html/object-tree.html | 2 | ||||
| -rw-r--r-- | docs/reference/libappindicator-docs.sgml | 2 | ||||
| -rw-r--r-- | docs/reference/version.xml | 2 | ||||
| -rw-r--r-- | src/app-indicator.c | 2 | ||||
| -rw-r--r-- | src/application-service-appstore.c | 16 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.in | 2 | ||||
| -rw-r--r-- | tests/test-libappindicator-fallback-item.c | 2 | ||||
| -rw-r--r-- | tests/test-libappindicator-fallback-watcher.c | 13 |
21 files changed, 339 insertions, 303 deletions
@@ -1,5 +1,117 @@ # Generated by Makefile. Do not edit. +2010-06-21 Ted Gould <ted@gould.cx> + + 0.2.1 + +2010-06-21 Ted Gould <ted@gould.cx> + + Fixing policy version numbers. + +2010-06-21 Ken VanDine <ken.vandine@canonical.com> + + Use full assembly version for the policy file + +2010-06-18 Ted Gould <ted@gould.cx> + + Fix mono versioning. + +2010-06-18 Ted Gould <ted@gould.cx> + + Cleaning up file name definitions + +2010-06-18 Ted Gould <ted@gould.cx> + + Adding the policy config to the installed files. + +2010-06-18 Ted Gould <ted@gould.cx> + + Switching to the policy name. + +2010-06-18 Ted Gould <ted@gould.cx> + + Swithcing the version to be the assembly version. + +2010-06-18 Ted Gould <ted@gould.cx> + + Fixup the gacutil stuff. Still doesn't ununinstall. + +2010-06-18 Ted Gould <ted@gould.cx> + + Fixing policy name + +2010-06-18 Ted Gould <ted@gould.cx> + + Replacing the macros with the proper data + +2010-06-18 Ted Gould <ted@gould.cx> + + Fixing the distcheck by cleaning up + +2010-06-18 Ted Gould <ted@gould.cx> + + Readjusting so that the policy file is in the same directory as the DLL + +2010-06-18 Ted Gould <ted@gould.cx> + + Fixing directories + +2010-06-18 Ted Gould <ted@gould.cx> + + Typo + +2010-06-18 Ted Gould <ted@gould.cx> + + Generating a policy dll + +2010-06-18 Ted Gould <ted@gould.cx> + + Make icon switching work again. + +2010-06-18 Ted Gould <ted@gould.cx> + + Remove the assert with checking if the value is NULL. + +2010-06-17 Ted Gould <ted@gould.cx> + + Use class ref and unref to allocate it if need be. + +2010-06-17 Ted Gould <ted@gould.cx> + + Reworking to make more clear and use the GEnumValue structure correctly. + +2010-06-17 Ted Gould <ted@gould.cx> + + Icon name shouldn't be construct only. + +2010-06-18 Ted Gould <ted@gould.cx> + + Fix mono bindings by restricting gapi2-parser + +2010-06-17 Ted Gould <ted@gould.cx> + + Linking Bug + +2010-06-17 Ted Gould <ted@gould.cx> + + Only work with specific files instead of the whole directory. + +2010-06-11 Ted Gould <ted@gould.cx> + + More time for initial fallback. + +2010-06-11 Ted Gould <ted@gould.cx> + + Increase the timeouts, but make it so that the watcher shutsdown when seen. + +2010-06-11 Ted Gould <ted@gould.cx> + + Increasing timeout to hopefully make it work on Hudson with load. + +2010-06-03 Ted Gould <ted@gould.cx> + + 0.2.0 + 2010-06-01 Ted Gould <ted@gould.cx> Distcheck fixes diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 4d2d8b4..98fe6f9 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -10,11 +10,33 @@ MIDDLE_API = libappindicator-api.middle RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp -ASSEMBLY = appindicator-sharp.dll -TARGET = $(ASSEMBLY) $(ASSEMBLY).config +ASSEMBLY_VERSION = 0.1.0.0 +ASSEMBLY = $(ASSEMBLY_NAME).dll +POLICY = policy.$(POLICY_VERSION).$(ASSEMBLY_NAME) +POLICY_VERSION = 0.0 +DLLPOLICY = $(POLICY).dll + +TARGET = \ + $(ASSEMBLY) \ + $(ASSEMBLY).config \ + $(DLLPOLICY) \ + $(POLICY).config + assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) -CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(MIDDLE_API) $(RAW_API) $(TEST) + +CLEANFILES = \ + $(ASSEMBLY) \ + $(ASSEMBLY).mdb \ + generated-stamp \ + generated/*.cs \ + $(API) \ + $(MIDDLE_API) \ + $(RAW_API) \ + $(TEST) \ + $(DLLPOLICY) \ + $(POLICY).config + DISTCLEANFILES = $(ASSEMBLY).config TEST_SOURCES = TestIndicator.cs customs = ApplicationIndicator.custom @@ -26,10 +48,11 @@ EXTRA_DIST = \ appindicator-sharp.dll.config.in \ app-indicator.sources.xml \ $(ASSEMBLY_NAME).snk \ + $(POLICY).config.in \ $(customs) \ $(TEST_SOURCES) -GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib" +GACUTIL_FLAGS=-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib references = $(GTK_SHARP_LIBS) test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY) @@ -72,14 +95,27 @@ $(ASSEMBLY): generated-stamp $(srcdir)/AssemblyInfo.cs $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) $(srcdir)/AssemblyInfo.cs install-data-local: - echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \ - $(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1; + echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -i $(ASSEMBLY_NAME).dll $(GACUTIL_FLAGS) || exit 1; + echo "$(GACUTIL) -i $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -i $(DLLPOLICY) $(GACUTIL_FLAGS) || exit 1; uninstall-local: - echo "$(GACUTIL) -u $(ASSEMBLY_NAME) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \ - $(GACUTIL) -u $(ASSEMBLY_NAME) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1; + echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; + echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -u $(POLICY) $(GACUTIL_FLAGS) || exit 1; $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) all: $(TEST) + +$(POLICY).config: $(POLICY).config.in Makefile + sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \ + -e "s|@ASSEMBLY_VERSION@|$(ASSEMBLY_VERSION)|g" \ + $< > $@ + +$(DLLPOLICY): $(POLICY).config $(ASSEMBLY_NAME).snk Makefile + $(AL) -link:$(POLICY).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk + diff --git a/bindings/mono/Makefile.in b/bindings/mono/Makefile.in index bb51068..7c36f5d 100644 --- a/bindings/mono/Makefile.in +++ b/bindings/mono/Makefile.in @@ -296,11 +296,31 @@ MIDDLE_API = libappindicator-api.middle RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp -ASSEMBLY = appindicator-sharp.dll -TARGET = $(ASSEMBLY) $(ASSEMBLY).config +ASSEMBLY_VERSION = 0.1.0.0 +ASSEMBLY = $(ASSEMBLY_NAME).dll +POLICY = policy.$(POLICY_VERSION).$(ASSEMBLY_NAME) +POLICY_VERSION = 0.0 +DLLPOLICY = $(POLICY).dll +TARGET = \ + $(ASSEMBLY) \ + $(ASSEMBLY).config \ + $(DLLPOLICY) \ + $(POLICY).config + assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) -CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(MIDDLE_API) $(RAW_API) $(TEST) +CLEANFILES = \ + $(ASSEMBLY) \ + $(ASSEMBLY).mdb \ + generated-stamp \ + generated/*.cs \ + $(API) \ + $(MIDDLE_API) \ + $(RAW_API) \ + $(TEST) \ + $(DLLPOLICY) \ + $(POLICY).config + DISTCLEANFILES = $(ASSEMBLY).config TEST_SOURCES = TestIndicator.cs customs = ApplicationIndicator.custom @@ -312,10 +332,11 @@ EXTRA_DIST = \ appindicator-sharp.dll.config.in \ app-indicator.sources.xml \ $(ASSEMBLY_NAME).snk \ + $(POLICY).config.in \ $(customs) \ $(TEST_SOURCES) -GACUTIL_FLAGS = "-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib" +GACUTIL_FLAGS = -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib references = $(GTK_SHARP_LIBS) test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY) api_includes = $(GTK_SHARP_CFLAGS) @@ -754,18 +775,30 @@ $(ASSEMBLY): generated-stamp $(srcdir)/AssemblyInfo.cs $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) $(srcdir)/AssemblyInfo.cs install-data-local: - echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \ - $(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1; + echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -i $(ASSEMBLY_NAME).dll $(GACUTIL_FLAGS) || exit 1; + echo "$(GACUTIL) -i $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -i $(DLLPOLICY) $(GACUTIL_FLAGS) || exit 1; uninstall-local: - echo "$(GACUTIL) -u $(ASSEMBLY_NAME) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \ - $(GACUTIL) -u $(ASSEMBLY_NAME) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1; + echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; + echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -u $(POLICY) $(GACUTIL_FLAGS) || exit 1; $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) all: $(TEST) +$(POLICY).config: $(POLICY).config.in Makefile + sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \ + -e "s|@ASSEMBLY_VERSION@|$(ASSEMBLY_VERSION)|g" \ + $< > $@ + +$(DLLPOLICY): $(POLICY).config $(ASSEMBLY_NAME).snk Makefile + $(AL) -link:$(POLICY).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/bindings/mono/app-indicator.sources.xml b/bindings/mono/app-indicator.sources.xml index 0d82430..2649eb4 100644 --- a/bindings/mono/app-indicator.sources.xml +++ b/bindings/mono/app-indicator.sources.xml @@ -2,10 +2,10 @@ <api filename="libappindicator-api.raw"> <library name="libappindicator.so.0"> <namespace name="AppIndicator"> - <directory path="../../src"> - <exclude>app-indicator-enum-types.h.in</exclude> - <exclude>app-indicator-enum-types.c.in</exclude> - </directory> + <file>../../src/app-indicator.c</file> + <file>../../src/app-indicator-enum-types.c</file> + <file>../../src/app-indicator-enum-types.h</file> + <file>../../src/app-indicator.h</file> </namespace> </library> </api> diff --git a/bindings/mono/libappindicator-api.raw b/bindings/mono/libappindicator-api.raw index a42560c..1609613 100644 --- a/bindings/mono/libappindicator-api.raw +++ b/bindings/mono/libappindicator-api.raw @@ -19,182 +19,12 @@ <member cname="APP_INDICATOR_STATUS_ACTIVE" name="Active" /> <member cname="APP_INDICATOR_STATUS_ATTENTION" name="Attention" /> </enum> - <callback name="OrgAyatanaIndicatorApplicationServiceGetApplicationsReply" cname="org_ayatana_indicator_application_service_get_applications_reply"> - <return-type type="void" /> - <parameters> - <parameter type="DBusGProxy*" name="proxy" /> - <parameter type="GPtrArray*" name="OUT_applications" /> - <parameter type="GError*" name="error" /> - <parameter type="gpointer" name="userdata" /> - </parameters> - </callback> - <callback name="OrgFreedesktop_DBus_PropertiesGetAllReply" cname="org_freedesktop_DBus_Properties_get_all_reply"> - <return-type type="void" /> - <parameters> - <parameter type="DBusGProxy*" name="proxy" /> - <parameter type="GHashTable*" name="OUT_Properties" /> - <parameter type="GError*" name="error" /> - <parameter type="gpointer" name="userdata" /> - </parameters> - </callback> - <callback name="OrgFreedesktop_DBus_PropertiesGetReply" cname="org_freedesktop_DBus_Properties_get_reply"> - <return-type type="void" /> - <parameters> - <parameter type="DBusGProxy*" name="proxy" /> - <parameter type="GValue" name="OUT_Value" /> - <parameter type="GError*" name="error" /> - <parameter type="gpointer" name="userdata" /> - </parameters> - </callback> - <callback name="OrgFreedesktop_DBus_PropertiesSetReply" cname="org_freedesktop_DBus_Properties_set_reply"> - <return-type type="void" /> - <parameters> - <parameter type="DBusGProxy*" name="proxy" /> - <parameter type="GError*" name="error" /> - <parameter type="gpointer" name="userdata" /> - </parameters> - </callback> - <callback name="OrgKde_StatusNotifierWatcherIsNotificationHostRegisteredReply" cname="org_kde_StatusNotifierWatcher_is_notification_host_registered_reply"> - <return-type type="void" /> - <parameters> - <parameter type="DBusGProxy*" name="proxy" /> - <parameter type="gboolean" name="OUT_hasHost" /> - <parameter type="GError*" name="error" /> - <parameter type="gpointer" name="userdata" /> - </parameters> - </callback> - <callback name="OrgKde_StatusNotifierWatcherProtocolVersionReply" cname="org_kde_StatusNotifierWatcher_protocol_version_reply"> - <return-type type="void" /> - <parameters> - <parameter type="DBusGProxy*" name="proxy" /> - <parameter type="char*" name="OUT_version" /> - <parameter type="GError*" name="error" /> - <parameter type="gpointer" name="userdata" /> - </parameters> - </callback> - <callback name="OrgKde_StatusNotifierWatcherRegisterNotificationHostReply" cname="org_kde_StatusNotifierWatcher_register_notification_host_reply"> - <return-type type="void" /> - <parameters> - <parameter type="DBusGProxy*" name="proxy" /> - <parameter type="GError*" name="error" /> - <parameter type="gpointer" name="userdata" /> - </parameters> - </callback> - <callback name="OrgKde_StatusNotifierWatcherRegisterStatusNotifierItemReply" cname="org_kde_StatusNotifierWatcher_register_status_notifier_item_reply"> - <return-type type="void" /> - <parameters> - <parameter type="DBusGProxy*" name="proxy" /> - <parameter type="GError*" name="error" /> - <parameter type="gpointer" name="userdata" /> - </parameters> - </callback> - <callback name="OrgKde_StatusNotifierWatcherRegisteredStatusNotifierItemsReply" cname="org_kde_StatusNotifierWatcher_registered_status_notifier_items_reply"> - <return-type type="void" /> - <parameters> - <parameter type="DBusGProxy*" name="proxy" /> - <parameter type="char*" name="*" /> - <parameter type="GError*" name="error" /> - <parameter type="gpointer" name="userdata" /> - </parameters> - </callback> - <object name="ApplicationServiceAppstore" cname="ApplicationServiceAppstore" parent="GObject"> - <signal name="ApplicationAdded" cname="application-added" when="LAST" field_name="application_added"> - <return-type type="void" /> - <parameters> - <parameter type="ApplicationServiceAppstore*" name="appstore" /> - <parameter type="gchar*" name="arg2" /> - <parameter type="gint" name="arg3" /> - <parameter type="gchar*" name="arg4" /> - <parameter type="gchar*" name="arg5" /> - <parameter type="gpointer" name="arg6" /> - </parameters> - </signal> - <signal name="ApplicationRemoved" cname="application-removed" when="LAST" field_name="application_removed"> - <return-type type="void" /> - <parameters> - <parameter type="ApplicationServiceAppstore*" name="appstore" /> - <parameter type="gint" name="arg2" /> - <parameter type="gpointer" name="arg3" /> - </parameters> - </signal> - <signal name="ApplicationIconChanged" cname="application-icon-changed" when="LAST" field_name="application_icon_changed"> - <return-type type="void" /> - <parameters> - <parameter type="ApplicationServiceAppstore*" name="appstore" /> - <parameter type="gint" name="arg2" /> - <parameter type="const-gchar*" name="arg3" /> - <parameter type="gpointer" name="arg4" /> - </parameters> - </signal> - <method name="ApplicationAdd" cname="application_service_appstore_application_add"> - <return-type type="void" /> - <parameters> - <parameter type="const-gchar*" name="dbus_name" /> - <parameter type="const-gchar*" name="dbus_object" /> - </parameters> - </method> - <method name="ApplicationRemove" cname="application_service_appstore_application_remove"> - <return-type type="void" /> - <parameters> - <parameter type="const-gchar*" name="dbus_name" /> - <parameter type="const-gchar*" name="dbus_object" /> - </parameters> - </method> - <method name="GetType" cname="application_service_appstore_get_type" shared="true"> - <return-type type="GType" /> - </method> - <constructor cname="application_service_appstore_new"> - <parameters> - <parameter type="AppLruFile*" name="lrufile" /> - </parameters> - </constructor> - </object> - <object name="ApplicationServiceWatcher" cname="ApplicationServiceWatcher" parent="GObject"> - <signal name="ServiceRegistered" cname="service-registered" when="LAST" field_name="service_registered"> - <return-type type="void" /> - <parameters> - <parameter type="ApplicationServiceWatcher*" name="watcher" /> - <parameter type="gchar*" name="object" /> - <parameter type="gpointer" name="data" /> - </parameters> - </signal> - <signal name="ServiceUnregistered" cname="service-unregistered" when="LAST" field_name="service_unregistered"> - <return-type type="void" /> - <parameters> - <parameter type="ApplicationServiceWatcher*" name="watcher" /> - <parameter type="gchar*" name="object" /> - <parameter type="gpointer" name="data" /> - </parameters> - </signal> - <signal name="NotificationHostRegistered" cname="notification-host-registered" when="LAST" field_name="notification_host_registered"> - <return-type type="void" /> - <parameters> - <parameter type="ApplicationServiceWatcher*" name="watcher" /> - <parameter type="gpointer" name="data" /> - </parameters> - </signal> - <signal name="NotificationHostUnregistered" cname="notification-host-unregistered" when="LAST" field_name="notification_host_unregistered"> - <return-type type="void" /> - <parameters> - <parameter type="ApplicationServiceWatcher*" name="watcher" /> - <parameter type="gpointer" name="data" /> - </parameters> - </signal> - <method name="GetType" cname="application_service_watcher_get_type" shared="true"> - <return-type type="GType" /> - </method> - <constructor cname="application_service_watcher_new"> - <parameters> - <parameter type="ApplicationServiceAppstore*" name="appstore" /> - </parameters> - </constructor> - </object> <object name="AppIndicator" cname="AppIndicator" parent="GObject"> <field name="Priv" cname="priv" type="AppIndicatorPrivate*" /> <property name="PROP_ID_S" cname="PROP_ID_S" type="gchar*" readable="true" writeable="true" construct-only="true" /> <property name="PROP_CATEGORY_S" cname="PROP_CATEGORY_S" type="gchar*" readable="true" writeable="true" construct-only="true" /> <property name="PROP_STATUS_S" cname="PROP_STATUS_S" type="gchar*" readable="true" writeable="true" /> - <property name="PROP_ICON_NAME_S" cname="PROP_ICON_NAME_S" type="gchar*" readable="true" writeable="true" construct="true" /> + <property name="PROP_ICON_NAME_S" cname="PROP_ICON_NAME_S" type="gchar*" readable="true" writeable="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-only="true" /> <property name="PROP_MENU_S" cname="PROP_MENU_S" type="DbusGObjectPath" readable="true" /> @@ -303,25 +133,5 @@ </parameters> </method> </object> - <object name="AppLruFile" cname="AppLruFile" parent="GObject"> - <method name="GetType" cname="app_lru_file_get_type" shared="true"> - <return-type type="GType" /> - </method> - <constructor cname="app_lru_file_new" /> - <method name="Sort" cname="app_lru_file_sort"> - <return-type type="gint" /> - <parameters> - <parameter type="const-gchar*" name="id_a" /> - <parameter type="const-gchar*" name="id_b" /> - </parameters> - </method> - <method name="Touch" cname="app_lru_file_touch"> - <return-type type="void" /> - <parameters> - <parameter type="const-gchar*" name="id" /> - <parameter type="const-gchar*" name="category" /> - </parameters> - </method> - </object> </namespace> </api>
\ No newline at end of file diff --git a/bindings/mono/policy.0.0.appindicator-sharp.config.in b/bindings/mono/policy.0.0.appindicator-sharp.config.in new file mode 100644 index 0000000..95c21ed --- /dev/null +++ b/bindings/mono/policy.0.0.appindicator-sharp.config.in @@ -0,0 +1,10 @@ +<configuration> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="@ASSEMBLY_NAME@" publicKeyToken="bcae265d1c7ab4c2" /> + <bindingRedirect oldVersion="0.0.0.0-@ASSEMBLY_VERSION@" newVersion="@ASSEMBLY_VERSION@"/> + </dependentAssembly> + </assemblyBinding> + </runtime> +</configuration> @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for indicator-application 0.2.0. +# Generated by GNU Autoconf 2.65 for indicator-application 0.2.1. # # Report bugs to <ted@canonical.com>. # @@ -703,8 +703,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='indicator-application' PACKAGE_TARNAME='indicator-application' -PACKAGE_VERSION='0.2.0' -PACKAGE_STRING='indicator-application 0.2.0' +PACKAGE_VERSION='0.2.1' +PACKAGE_STRING='indicator-application 0.2.1' PACKAGE_BUGREPORT='ted@canonical.com' PACKAGE_URL='' @@ -1505,7 +1505,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures indicator-application 0.2.0 to adapt to many kinds of systems. +\`configure' configures indicator-application 0.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1576,7 +1576,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of indicator-application 0.2.0:";; + short | recursive ) echo "Configuration of indicator-application 0.2.1:";; esac cat <<\_ACEOF @@ -1709,7 +1709,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -indicator-application configure 0.2.0 +indicator-application configure 0.2.1 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1989,7 +1989,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by indicator-application $as_me 0.2.0, which was +It was created by indicator-application $as_me 0.2.1, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2803,7 +2803,7 @@ fi # Define the identity of the package. PACKAGE=indicator-application - VERSION=0.2.0 + VERSION=0.2.1 cat >>confdefs.h <<_ACEOF @@ -13684,7 +13684,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by indicator-application $as_me 0.2.0, which was +This file was extended by indicator-application $as_me 0.2.1, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13750,7 +13750,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -indicator-application config.status 0.2.0 +indicator-application config.status 0.2.1 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" 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/debian/changelog b/debian/changelog index 285b966..7ceb250 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,20 @@ -indicator-application (0.2.0-0ubuntu3) UNRELEASED; urgency=low +indicator-application (0.2.1-0ubuntu1) UNRELEASED; urgency=low + * New upstream release. + * Fix icon updating (LP: #594199) + * Change Mono bindings to only parse particular files (LP: #592706) + * Make a policy for migrating the mono bindings + * Test fixes to make them more reliable + * debian/control: Fixing version numbers + * debian/control: Making the 0.1-cil replace and provide the 0.0-cil + * debian/libappindicator0.1-cil.installcligac: Add the policy.dll + file to the install. + + [Ken VanDine] * renamed cil binary to libappindicator0.1 to match the assembly version (LP: #592706) - -- Ken VanDine <ken.vandine@canonical.com> Fri, 11 Jun 2010 10:56:46 -0400 + -- Ted Gould <ted@ubuntu.com> Mon, 21 Jun 2010 14:25:39 -0500 indicator-application (0.2.0-0ubuntu2) maverick; urgency=low @@ -395,6 +406,14 @@ indicator-application (0.0.3-0ubuntu1) lucid; urgency=low -- Ted Gould <ted@ubuntu.com> Thu, 10 Dec 2009 13:34:40 -0600 +indicator-application (0.0.2-0ubuntu1~ppa1) karmic; urgency=low + + * Upstream release 0.0.2 + * Updates API to use GTK instead of dbusmenu to make it + easier for upstream developers to use. + + -- Ted Gould <ted@ubuntu.com> Fri, 04 Dec 2009 14:50:45 -0600 + indicator-application (0.0.2-0~ppa3) karmic; urgency=low * debian/watch: @@ -404,14 +423,6 @@ indicator-application (0.0.2-0~ppa3) karmic; urgency=low -- Ken VanDine <ken.vandine@canonical.com> Thu, 10 Dec 2009 09:00:06 -0500 -indicator-application (0.0.2-0ubuntu1~ppa1) karmic; urgency=low - - * Upstream release 0.0.2 - * Updates API to use GTK instead of dbusmenu to make it - easier for upstream developers to use. - - -- Ted Gould <ted@ubuntu.com> Fri, 04 Dec 2009 14:50:45 -0600 - indicator-application (0.0.1-0ubuntu3~ppa4) karmic; urgency=low * Adding in copyright headers and licenses diff --git a/debian/control b/debian/control index 2a80792..bdd065d 100644 --- a/debian/control +++ b/debian/control @@ -96,8 +96,10 @@ Description: Application Indicators Package: libappindicator0.1-cil Section: cli-mono Architecture: all -Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4~) -Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4~) +Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4), + libappindicator0.0-cil (<= 0.2.0-0ubuntu4) +Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4) +Provides: libappindicator0.0-cil Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends} @@ -110,8 +112,8 @@ Description: CLI bindings for libappindicator Package: libappindicator0.1-cil-dev Section: libdevel Architecture: all -Replaces: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~) -Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~) +Replaces: libappindicator-cil-dev (<= 0.0.19-0ubuntu4) +Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4) Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, diff --git a/debian/libappindicator0.1-cil.installcligac b/debian/libappindicator0.1-cil.installcligac index 7e66dd2..ad89d2c 100644 --- a/debian/libappindicator0.1-cil.installcligac +++ b/debian/libappindicator0.1-cil.installcligac @@ -1 +1,2 @@ /usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll +/usr/lib/cli/appindicator-sharp-0.1/policy.0.0.appindicator-sharp.dll diff --git a/docs/reference/html/libappindicator-app-indicator.html b/docs/reference/html/libappindicator-app-indicator.html index f3e2c45..f94b82e 100644 --- a/docs/reference/html/libappindicator-app-indicator.html +++ b/docs/reference/html/libappindicator-app-indicator.html @@ -66,48 +66,48 @@ enum <a class="link" href="libappindicator-app-indicator.html#App <a class="link" href="libappindicator-app-indicator.html#AppIndicatorPrivate" title="AppIndicatorPrivate">AppIndicatorPrivate</a>; <a class="link" href="libappindicator-app-indicator.html#AppIndicator-struct" title="AppIndicator">AppIndicator</a>; <a class="link" href="libappindicator-app-indicator.html#AppIndicatorClass" title="AppIndicatorClass">AppIndicatorClass</a>; -<a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-type" title="app_indicator_get_type ()">app_indicator_get_type</a> (<em class="parameter"><code><span class="type">void</span></code></em>); -<a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="returnvalue">AppIndicator</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-new" title="app_indicator_new ()">app_indicator_new</a> (<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>, - <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>, +<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-type" title="app_indicator_get_type ()">app_indicator_get_type</a> (<em class="parameter"><code><span class="type">void</span></code></em>); +<a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="returnvalue">AppIndicator</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-new" title="app_indicator_new ()">app_indicator_new</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>, + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>, <em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicatorCategory" title="enum AppIndicatorCategory"><span class="type">AppIndicatorCategory</span></a> category</code></em>); -<a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="returnvalue">AppIndicator</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-new-with-path" title="app_indicator_new_with_path ()">app_indicator_new_with_path</a> (<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>, - <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>, +<a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="returnvalue">AppIndicator</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-new-with-path" title="app_indicator_new_with_path ()">app_indicator_new_with_path</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>, + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>, <em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicatorCategory" title="enum AppIndicatorCategory"><span class="type">AppIndicatorCategory</span></a> category</code></em>, - <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_path</code></em>); + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_path</code></em>); <span class="returnvalue">void</span> <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-status" title="app_indicator_set_status ()">app_indicator_set_status</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>, <em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicatorStatus" title="enum AppIndicatorStatus"><span class="type">AppIndicatorStatus</span></a> status</code></em>); <span class="returnvalue">void</span> <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-attention-icon" title="app_indicator_set_attention_icon ()">app_indicator_set_attention_icon</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>, - <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>); + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>); <span class="returnvalue">void</span> <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-menu" title="app_indicator_set_menu ()">app_indicator_set_menu</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>, <em class="parameter"><code><a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> *menu</code></em>); <span class="returnvalue">void</span> <a class="link" href="libappindicator-app-indicator.html#app-indicator-set-icon" title="app_indicator_set_icon ()">app_indicator_set_icon</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>, - <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>); -const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-id" title="app_indicator_get_id ()">app_indicator_get_id</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>); + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>); +const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-id" title="app_indicator_get_id ()">app_indicator_get_id</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>); <a class="link" href="libappindicator-app-indicator.html#AppIndicatorCategory" title="enum AppIndicatorCategory"><span class="returnvalue">AppIndicatorCategory</span></a> <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-category" title="app_indicator_get_category ()">app_indicator_get_category</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>); <a class="link" href="libappindicator-app-indicator.html#AppIndicatorStatus" title="enum AppIndicatorStatus"><span class="returnvalue">AppIndicatorStatus</span></a> <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-status" title="app_indicator_get_status ()">app_indicator_get_status</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>); -const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-icon" title="app_indicator_get_icon ()">app_indicator_get_icon</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>); -const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-attention-icon" title="app_indicator_get_attention_icon ()">app_indicator_get_attention_icon</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>); +const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-icon" title="app_indicator_get_icon ()">app_indicator_get_icon</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>); +const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-attention-icon" title="app_indicator_get_attention_icon ()">app_indicator_get_attention_icon</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>); <a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="returnvalue">GtkMenu</span></a> * <a class="link" href="libappindicator-app-indicator.html#app-indicator-get-menu" title="app_indicator_get_menu ()">app_indicator_get_menu</a> (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>); </pre> </div> <div class="refsect1" title="Object Hierarchy"> <a name="libappindicator-app-indicator.object-hierarchy"></a><h2>Object Hierarchy</h2> <pre class="synopsis"> - <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a> + <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----AppIndicator </pre> </div> <div class="refsect1" title="Properties"> <a name="libappindicator-app-indicator.properties"></a><h2>Properties</h2> <pre class="synopsis"> - "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-name" title='The "attention-icon-name" property'>attention-icon-name</a>" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write - "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--category" title='The "category" property'>category</a>" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only - "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--connected" title='The "connected" property'>connected</a>" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read - "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-name" title='The "icon-name" property'>icon-name</a>" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct - "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-theme-path" title='The "icon-theme-path" property'>icon-theme-path</a>" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only - "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--id" title='The "id" property'>id</a>" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only + "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-name" title='The "attention-icon-name" property'>attention-icon-name</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write + "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--category" title='The "category" property'>category</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only + "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--connected" title='The "connected" property'>connected</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read + "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-name" title='The "icon-name" property'>icon-name</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct + "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-theme-path" title='The "icon-theme-path" property'>icon-theme-path</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only + "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--id" title='The "id" property'>id</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--menu" title='The "menu" property'>menu</a>" <span class="type">DBusGObjectPath</span>* : Read - "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--status" title='The "status" property'>status</a>" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write + "<a class="link" href="libappindicator-app-indicator.html#AppIndicator--status" title='The "status" property'>status</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write </pre> </div> <div class="refsect1" title="Signals"> @@ -139,7 +139,7 @@ An application indicator is a way for an application to put <pre class="programlisting">#define APP_INDICATOR_TYPE (app_indicator_get_type ()) </pre> <p> -Get the <a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for a <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a>. +Get the <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for a <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a>. </p> </div> <hr> @@ -148,7 +148,7 @@ Get the <a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#G <pre class="programlisting">#define APP_INDICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), APP_INDICATOR_TYPE, AppIndicator)) </pre> <p> -Safely convert a <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> into an <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a>. +Safely convert a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> into an <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -165,14 +165,14 @@ Safely convert a <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Objec <pre class="programlisting">#define APP_INDICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), APP_INDICATOR_TYPE, AppIndicatorClass)) </pre> <p> -Safely convert a <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> into a <a class="link" href="libappindicator-app-indicator.html#AppIndicatorClass" title="AppIndicatorClass"><span class="type">AppIndicatorClass</span></a>. +Safely convert a <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> into a <a class="link" href="libappindicator-app-indicator.html#AppIndicatorClass" title="AppIndicatorClass"><span class="type">AppIndicatorClass</span></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> <td><p><span class="term"><em class="parameter"><code>klass</code></em> :</span></p></td> <td> -<a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> based class to convert. +<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> based class to convert. </td> </tr></tbody> </table></div> @@ -189,7 +189,7 @@ Checks to see if <em class="parameter"><code>obj</code></em> is in the object hi <col align="left" valign="top"> <tbody><tr> <td><p><span class="term"><em class="parameter"><code>obj</code></em> :</span></p></td> -<td>An <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> to check +<td>An <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> to check </td> </tr></tbody> </table></div> @@ -206,7 +206,7 @@ Checks to see if <em class="parameter"><code>klass</code></em> is in the object <col align="left" valign="top"> <tbody><tr> <td><p><span class="term"><em class="parameter"><code>klass</code></em> :</span></p></td> -<td>An <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> to check +<td>An <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> to check </td> </tr></tbody> </table></div> @@ -223,7 +223,7 @@ Gets a pointer to the <a class="link" href="libappindicator-app-indicator.html#A <col align="left" valign="top"> <tbody><tr> <td><p><span class="term"><em class="parameter"><code>obj</code></em> :</span></p></td> -<td>A <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> in the class hierarchy of <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a>. +<td>A <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</span></a> in the class hierarchy of <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a>. </td> </tr></tbody> </table></div> @@ -405,7 +405,7 @@ The signals and external functions that make up the <a class="link" href="libapp <col align="left" valign="top"> <tbody> <tr> -<td><p><span class="term"><a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> <em class="structfield"><code><a name="AppIndicatorClass.parent-class"></a>parent_class</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObjectClass"><span class="type">GObjectClass</span></a> <em class="structfield"><code><a name="AppIndicatorClass.parent-class"></a>parent_class</code></em>;</span></p></td> <td>Mia familia </td> </tr> @@ -457,15 +457,15 @@ The signals and external functions that make up the <a class="link" href="libapp <hr> <div class="refsect2" title="app_indicator_get_type ()"> <a name="app-indicator-get-type"></a><h3>app_indicator_get_type ()</h3> -<pre class="programlisting"><a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> app_indicator_get_type (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> +<pre class="programlisting"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a> app_indicator_get_type (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> <p> -Generates or returns the unique <a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a>. +Generates or returns the unique <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> A unique <a href="/usr/share/gtk-doc/html/gobject/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> objects. +<td> A unique <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> objects. </td> </tr></tbody> </table></div> @@ -473,8 +473,8 @@ Generates or returns the unique <a href="/usr/share/gtk-doc/html/gobject/gobject <hr> <div class="refsect2" title="app_indicator_new ()"> <a name="app-indicator-new"></a><h3>app_indicator_new ()</h3> -<pre class="programlisting"><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="returnvalue">AppIndicator</span></a> * app_indicator_new (<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>, - <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>, +<pre class="programlisting"><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="returnvalue">AppIndicator</span></a> * app_indicator_new (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>, + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>, <em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicatorCategory" title="enum AppIndicatorCategory"><span class="type">AppIndicatorCategory</span></a> category</code></em>);</pre> <p> Creates a new <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> setting the properties: @@ -511,10 +511,10 @@ Creates a new <a class="link" href="libappindicator-app-indicator.html#AppIndica <hr> <div class="refsect2" title="app_indicator_new_with_path ()"> <a name="app-indicator-new-with-path"></a><h3>app_indicator_new_with_path ()</h3> -<pre class="programlisting"><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="returnvalue">AppIndicator</span></a> * app_indicator_new_with_path (<em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>, - <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>, +<pre class="programlisting"><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="returnvalue">AppIndicator</span></a> * app_indicator_new_with_path (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *id</code></em>, + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>, <em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicatorCategory" title="enum AppIndicatorCategory"><span class="type">AppIndicatorCategory</span></a> category</code></em>, - <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_path</code></em>);</pre> + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_path</code></em>);</pre> <p> Creates a new <a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> setting the properties: <a class="link" href="libappindicator-app-indicator.html#AppIndicator--id" title='The "id" property'><span class="type">"id"</span></a> with <em class="parameter"><code>id</code></em>, <a class="link" href="libappindicator-app-indicator.html#AppIndicator--category" title='The "category" property'><span class="type">"category"</span></a> @@ -580,7 +580,7 @@ Wrapper function for property <a class="link" href="libappindicator-app-indicato <div class="refsect2" title="app_indicator_set_attention_icon ()"> <a name="app-indicator-set-attention-icon"></a><h3>app_indicator_set_attention_icon ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> app_indicator_set_attention_icon (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>, - <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>);</pre> + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>);</pre> <p> Wrapper function for property <a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-name" title='The "attention-icon-name" property'><span class="type">"attention-icon-name"</span></a>. </p> @@ -632,7 +632,7 @@ Sets the menu that should be shown when the Application Indicator <div class="refsect2" title="app_indicator_set_icon ()"> <a name="app-indicator-set-icon"></a><h3>app_indicator_set_icon ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> app_indicator_set_icon (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>, - <em class="parameter"><code>const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>);</pre> + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *icon_name</code></em>);</pre> <p> Sets the default icon to use when the status is active but not set to attention. In most cases, this should be the @@ -658,7 +658,7 @@ Sets the default icon to use when the status is active but <hr> <div class="refsect2" title="app_indicator_get_id ()"> <a name="app-indicator-get-id"></a><h3>app_indicator_get_id ()</h3> -<pre class="programlisting">const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * app_indicator_get_id (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre> +<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * app_indicator_get_id (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre> <p> Wrapper function for property <a class="link" href="libappindicator-app-indicator.html#AppIndicator--id" title='The "id" property'><span class="type">"id"</span></a>. </p> @@ -727,7 +727,7 @@ Wrapper function for property <a class="link" href="libappindicator-app-indicato <hr> <div class="refsect2" title="app_indicator_get_icon ()"> <a name="app-indicator-get-icon"></a><h3>app_indicator_get_icon ()</h3> -<pre class="programlisting">const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * app_indicator_get_icon (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre> +<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * app_indicator_get_icon (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre> <p> Wrapper function for property <a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-name" title='The "icon-name" property'><span class="type">"icon-name"</span></a>. </p> @@ -750,7 +750,7 @@ Wrapper function for property <a class="link" href="libappindicator-app-indicato <hr> <div class="refsect2" title="app_indicator_get_attention_icon ()"> <a name="app-indicator-get-attention-icon"></a><h3>app_indicator_get_attention_icon ()</h3> -<pre class="programlisting">const <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * app_indicator_get_attention_icon (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre> +<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * app_indicator_get_attention_icon (<em class="parameter"><code><a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *self</code></em>);</pre> <p> Wrapper function for property <a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-name" title='The "attention-icon-name" property'><span class="type">"attention-icon-name"</span></a>. </p> @@ -788,7 +788,7 @@ Gets the menu being used for this application indicator. </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td> A <a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> object or <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if one hasn't been set. +<td> A <a href="/usr/share/gtk-doc/html/gtk/GtkMenu.html"><span class="type">GtkMenu</span></a> object or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if one hasn't been set. </td> </tr> </tbody> @@ -799,7 +799,7 @@ Gets the menu being used for this application indicator. <a name="libappindicator-app-indicator.property-details"></a><h2>Property Details</h2> <div class="refsect2" title='The "attention-icon-name" property'> <a name="AppIndicator--attention-icon-name"></a><h3>The <code class="literal">"attention-icon-name"</code> property</h3> -<pre class="programlisting"> "attention-icon-name" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre> +<pre class="programlisting"> "attention-icon-name" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre> <p> If the indicator sets it's status to <a class="link" href="libappindicator-app-indicator.html#APP-INDICATOR-STATUS-ATTENTION:CAPS"><code class="literal">APP_INDICATOR_STATUS_ATTENTION</code></a> then this icon is shown. @@ -809,7 +809,7 @@ If the indicator sets it's status to <a class="link" href="libappindicator-app-i <hr> <div class="refsect2" title='The "category" property'> <a name="AppIndicator--category"></a><h3>The <code class="literal">"category"</code> property</h3> -<pre class="programlisting"> "category" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only</pre> +<pre class="programlisting"> "category" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only</pre> <p> The type of indicator that this represents. Please don't use 'Other'. Defaults to 'ApplicationStatus'. @@ -819,9 +819,9 @@ The type of indicator that this represents. Please don't use 'Other'. <hr> <div class="refsect2" title='The "connected" property'> <a name="AppIndicator--connected"></a><h3>The <code class="literal">"connected"</code> property</h3> -<pre class="programlisting"> "connected" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read</pre> +<pre class="programlisting"> "connected" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read</pre> <p> -Pretty simple, <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if we have a reasonable expectation of being +Pretty simple, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if we have a reasonable expectation of being displayed through this object. You should hide your TrayIcon if so. </p> <p>Default value: FALSE</p> @@ -829,7 +829,7 @@ Pretty simple, <a href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#T <hr> <div class="refsect2" title='The "icon-name" property'> <a name="AppIndicator--icon-name"></a><h3>The <code class="literal">"icon-name"</code> property</h3> -<pre class="programlisting"> "icon-name" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct</pre> +<pre class="programlisting"> "icon-name" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct</pre> <p> The name of the regular icon that is shown for the indicator. </p> @@ -838,7 +838,7 @@ The name of the regular icon that is shown for the indicator. <hr> <div class="refsect2" title='The "icon-theme-path" property'> <a name="AppIndicator--icon-theme-path"></a><h3>The <code class="literal">"icon-theme-path"</code> property</h3> -<pre class="programlisting"> "icon-theme-path" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only</pre> +<pre class="programlisting"> "icon-theme-path" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only</pre> <p> An additional place to look for icon names that may be installed by the application. @@ -848,7 +848,7 @@ An additional place to look for icon names that may be installed by the <hr> <div class="refsect2" title='The "id" property'> <a name="AppIndicator--id"></a><h3>The <code class="literal">"id"</code> property</h3> -<pre class="programlisting"> "id" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only</pre> +<pre class="programlisting"> "id" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write / Construct Only</pre> <p> The ID for this indicator, which should be unique, but used consistently by this program and its indicator. @@ -866,7 +866,7 @@ A method for getting the menu path as a string for DBus. <hr> <div class="refsect2" title='The "status" property'> <a name="AppIndicator--status"></a><h3>The <code class="literal">"status"</code> property</h3> -<pre class="programlisting"> "status" <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre> +<pre class="programlisting"> "status" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write</pre> <p> Whether the indicator is shown or requests attention. Defaults to 'Passive'. @@ -879,8 +879,8 @@ Whether the indicator is shown or requests attention. Defaults to <div class="refsect2" title='The "connection-changed" signal'> <a name="AppIndicator-connection-changed"></a><h3>The <code class="literal">"connection-changed"</code> signal</h3> <pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *arg0, - <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> arg1, - <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre> + <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> arg1, + <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre> <p> Signaled when we connect to a watcher, or when it drops away. </p> @@ -908,7 +908,7 @@ Signaled when we connect to a watcher, or when it drops away. <div class="refsect2" title='The "new-attention-icon" signal'> <a name="AppIndicator-new-attention-icon"></a><h3>The <code class="literal">"new-attention-icon"</code> signal</h3> <pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *arg0, - <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre> + <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre> <p> Emitted when <a class="link" href="libappindicator-app-indicator.html#AppIndicator--attention-icon-name" title='The "attention-icon-name" property'><span class="type">"attention-icon-name"</span></a> is changed </p> @@ -931,7 +931,7 @@ Emitted when <a class="link" href="libappindicator-app-indicator.html#AppIndicat <div class="refsect2" title='The "new-icon" signal'> <a name="AppIndicator-new-icon"></a><h3>The <code class="literal">"new-icon"</code> signal</h3> <pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *arg0, - <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre> + <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre> <p> Emitted when <a class="link" href="libappindicator-app-indicator.html#AppIndicator--icon-name" title='The "icon-name" property'><span class="type">"icon-name"</span></a> is changed </p> @@ -954,8 +954,8 @@ Emitted when <a class="link" href="libappindicator-app-indicator.html#AppIndicat <div class="refsect2" title='The "new-status" signal'> <a name="AppIndicator-new-status"></a><h3>The <code class="literal">"new-status"</code> signal</h3> <pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="libappindicator-app-indicator.html#AppIndicator"><span class="type">AppIndicator</span></a> *arg0, - <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *arg1, - <a href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre> + <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *arg1, + <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : Run Last</pre> <p> Emitted when <a class="link" href="libappindicator-app-indicator.html#AppIndicator--status" title='The "status" property'><span class="type">"status"</span></a> is changed </p> diff --git a/docs/reference/html/object-tree.html b/docs/reference/html/object-tree.html index fbc9bcc..5412b9e 100644 --- a/docs/reference/html/object-tree.html +++ b/docs/reference/html/object-tree.html @@ -23,7 +23,7 @@ <div class="titlepage"><div><div><h2 class="title"> <a name="object-tree"></a>Object Hierarchy</h2></div></div></div> <pre class="screen"> - <a href="/usr/share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html#GObject">GObject</a> + <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> <a class="link" href="libappindicator-app-indicator.html#AppIndicator">AppIndicator</a> </pre> </div> diff --git a/docs/reference/libappindicator-docs.sgml b/docs/reference/libappindicator-docs.sgml index 2f0ebc6..16877c1 100644 --- a/docs/reference/libappindicator-docs.sgml +++ b/docs/reference/libappindicator-docs.sgml @@ -8,7 +8,7 @@ <bookinfo> <title>libappindicator Reference Manual</title> <releaseinfo> - for libappindicator 0.2.0 + for libappindicator 0.2.1 </releaseinfo> </bookinfo> diff --git a/docs/reference/version.xml b/docs/reference/version.xml index 0ea3a94..0c62199 100644 --- a/docs/reference/version.xml +++ b/docs/reference/version.xml @@ -1 +1 @@ -0.2.0 +0.2.1 diff --git a/src/app-indicator.c b/src/app-indicator.c index 6c2a8d9..bc43e58 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: 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 diff --git a/tests/Makefile.am b/tests/Makefile.am index d3b18d8..8d356bc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -142,7 +142,7 @@ XML_REPORT = libappindicator-check-results.xml HTML_REPORT = libappindicator-check-results.html libappindicator-tests: libappindicator-tests-gtester Makefile.am - @echo "#!/bin/sh" > $@ + @echo "#!/bin/bash" > $@ @echo . $(srcdir)/run-xvfb.sh >> $@ @echo $(DBUS_RUNNER) --task ./libappindicator-tests-gtester >> $@ @chmod +x $@ diff --git a/tests/Makefile.in b/tests/Makefile.in index c5cbb10..edc828f 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1015,7 +1015,7 @@ test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libapp @chmod +x $@ libappindicator-tests: libappindicator-tests-gtester Makefile.am - @echo "#!/bin/sh" > $@ + @echo "#!/bin/bash" > $@ @echo . $(srcdir)/run-xvfb.sh >> $@ @echo $(DBUS_RUNNER) --task ./libappindicator-tests-gtester >> $@ @chmod +x $@ diff --git a/tests/test-libappindicator-fallback-item.c b/tests/test-libappindicator-fallback-item.c index 426b6a6..418b779 100644 --- a/tests/test-libappindicator-fallback-item.c +++ b/tests/test-libappindicator-fallback-item.c @@ -138,7 +138,7 @@ main (int argc, char ** argv) GtkWidget * menu = gtk_menu_new(); app_indicator_set_menu(APP_INDICATOR(item), GTK_MENU(menu)); - g_timeout_add_seconds(1, kill_func, NULL); + g_timeout_add_seconds(2, kill_func, NULL); mainloop = g_main_loop_new(NULL, FALSE); g_main_loop_run(mainloop); diff --git a/tests/test-libappindicator-fallback-watcher.c b/tests/test-libappindicator-fallback-watcher.c index 70e01d1..5494082 100644 --- a/tests/test-libappindicator-fallback-watcher.c +++ b/tests/test-libappindicator-fallback-watcher.c @@ -27,6 +27,8 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include "../src/dbus-shared.h" +gboolean kill_func (gpointer userdata); + static GMainLoop * mainloop = NULL; static DBusHandlerResult @@ -36,6 +38,10 @@ dbus_filter (DBusConnection * connection, DBusMessage * message, void * user_dat DBusMessage * reply = dbus_message_new_method_return(message); dbus_connection_send(connection, reply, NULL); dbus_message_unref(reply); + + /* Let the messages get out, but we're done at this point */ + g_timeout_add(50, kill_func, NULL); + return DBUS_HANDLER_RESULT_HANDLED; } @@ -78,7 +84,7 @@ main (int argv, char ** argc) return 1; } - g_usleep(250000); + g_usleep(500000); g_debug("Initing"); @@ -96,8 +102,9 @@ main (int argv, char ** argc) dbus_connection_add_filter(dbus_g_connection_get_connection(session_bus), dbus_filter, NULL, NULL); - /* After we've got the name, let it unfallback, and then we'll drop again */ - g_timeout_add(250, kill_func, NULL); + /* This is the final kill function. It really shouldn't happen + unless we get an error. */ + g_timeout_add(2000, kill_func, NULL); g_debug("Entering Mainloop"); |