diff options
| author | Ted Gould <ted@gould.cx> | 2010-12-07 16:55:03 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-12-07 16:55:03 -0600 |
| commit | eef3316d7af6189f54022b1159331175cae900c4 (patch) | |
| tree | ea465f3e74da81adc35322b5cef4e0544d17b628 | |
| parent | 5ffa1850a8aefb9591309c6f884411543dd1fe04 (diff) | |
| parent | 0a09bca306de781117fb92b1084dfafc6c267679 (diff) | |
| download | ayatana-indicator-application-eef3316d7af6189f54022b1159331175cae900c4.tar.gz ayatana-indicator-application-eef3316d7af6189f54022b1159331175cae900c4.tar.bz2 ayatana-indicator-application-eef3316d7af6189f54022b1159331175cae900c4.zip | |
Update to newest g-ir-scanner and vapigen
| -rw-r--r-- | bindings/mono/examples/IndicatorExample.cs | 5 | ||||
| -rw-r--r-- | docs/reference/Makefile.am | 2 | ||||
| -rw-r--r-- | src/AppIndicator-0.1.metadata | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 14 |
4 files changed, 14 insertions, 8 deletions
diff --git a/bindings/mono/examples/IndicatorExample.cs b/bindings/mono/examples/IndicatorExample.cs index c34e020..c18a665 100644 --- a/bindings/mono/examples/IndicatorExample.cs +++ b/bindings/mono/examples/IndicatorExample.cs @@ -34,8 +34,8 @@ public class IndicatorExample win.Add (label); - ApplicationIndicator indicator = new ApplicationIndicator ("my-id", - "my-name", + ApplicationIndicator indicator = new ApplicationIndicator ("Example", + "applications-microblogging-panel", Category.ApplicationStatus); indicator.Status = Status.Attention; @@ -45,6 +45,7 @@ public class IndicatorExample menu.Append (new MenuItem ("Bar")); indicator.Menu = menu; + indicator.Menu.ShowAll (); win.ShowAll (); diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index d2ef3bb..63606f9 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -91,7 +91,7 @@ expand_content_files= # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(INDICATOR_CFLAGS) -GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la +GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la $(INDICATOR_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.local.make diff --git a/src/AppIndicator-0.1.metadata b/src/AppIndicator-0.1.metadata new file mode 100644 index 0000000..e4d068e --- /dev/null +++ b/src/AppIndicator-0.1.metadata @@ -0,0 +1 @@ +AppIndicator name="AppIndicator" diff --git a/src/Makefile.am b/src/Makefile.am index fed0318..9e58943 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,10 @@ endif CLEANFILES = DISTCLEANFILES = BUILT_SOURCES = -EXTRA_DIST = appindicator-0.1.pc.in appindicator3-0.1.pc.in +EXTRA_DIST = \ + appindicator-0.1.pc.in \ + appindicator3-0.1.pc.in \ + AppIndicator-0.1.metadata include $(top_srcdir)/Makefile.am.enum include $(top_srcdir)/Makefile.am.marshal @@ -176,16 +179,17 @@ EXTRA_DIST += $(DBUS_SPECS) INTROSPECTION_GIRS = INTROSPECTION_SCANNER_ARGS = \ --add-include-path=$(srcdir) \ - $(addprefix --c-include=libappindicator/, $(introspection_sources)) + $(addprefix --c-include=src/, $(introspection_sources)) \ + --symbol-prefix=app \ + --identifier-prefix=App INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) if HAVE_INTROSPECTION introspection_sources = \ - $(addprefix $(srcdir)/,$(libappindicator_headers)) \ - $(addprefix $(top_builddir)/src/, $(glib_enum_h)) + $(addprefix $(srcdir)/,$(libappindicator_headers)) -AppIndicator$(VER)-0.1.gir: libappindicator$(VER).la $(glib_enum_h) +AppIndicator$(VER)-0.1.gir: libappindicator$(VER).la AppIndicator_0_1_gir_INCLUDES = \ GObject-2.0 \ $(GTKGIR) |