Application Indicators

Merge lp:~ken-vandine/indicator-application/gi-build-fixes into lp:indicator-application/0.4

  1. gi-build-fixes
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Merge reported by: Ted Gould
Merged at revision: not available
Proposed branch: lp:~ken-vandine/indicator-application/gi-build-fixes
Merge into: lp:indicator-application/0.4
Diff against target: 78 lines (+13/-8)
4 files modified
bindings/mono/examples/IndicatorExample.cs (+3/-2)
docs/reference/Makefile.am (+1/-1)
src/AppIndicator-0.1.metadata (+1/-0)
src/Makefile.am (+8/-5)
To merge this branch: bzr merge lp:~ken-vandine/indicator-application/gi-build-fixes
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+42697@code.launchpad.net

Description of the change

Build fixes for building with the latest g-ir-scanner and vapigen

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bindings/mono/examples/IndicatorExample.cs'
--- bindings/mono/examples/IndicatorExample.cs 2009-12-17 18:59:19 +0000
+++ bindings/mono/examples/IndicatorExample.cs 2010-12-03 22:17:54 +0000
@@ -34,8 +34,8 @@
3434
35 win.Add (label);35 win.Add (label);
3636
37 ApplicationIndicator indicator = new ApplicationIndicator ("my-id",37 ApplicationIndicator indicator = new ApplicationIndicator ("Example",
38 "my-name",38 "applications-microblogging-panel",
39 Category.ApplicationStatus);39 Category.ApplicationStatus);
4040
41 indicator.Status = Status.Attention;41 indicator.Status = Status.Attention;
@@ -45,6 +45,7 @@
45 menu.Append (new MenuItem ("Bar"));45 menu.Append (new MenuItem ("Bar"));
4646
47 indicator.Menu = menu;47 indicator.Menu = menu;
48 indicator.Menu.ShowAll ();
4849
49 win.ShowAll ();50 win.ShowAll ();
5051
5152
=== modified file 'docs/reference/Makefile.am'
--- docs/reference/Makefile.am 2010-08-10 20:33:09 +0000
+++ docs/reference/Makefile.am 2010-12-03 22:17:54 +0000
@@ -91,7 +91,7 @@
91# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)91# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
92# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)92# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
93GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(INDICATOR_CFLAGS)93GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(INDICATOR_CFLAGS)
94GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la 94GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la $(INDICATOR_LIBS)
9595
96# This includes the standard gtk-doc make rules, copied by gtkdocize.96# This includes the standard gtk-doc make rules, copied by gtkdocize.
97include $(top_srcdir)/gtk-doc.local.make97include $(top_srcdir)/gtk-doc.local.make
9898
=== added file 'src/AppIndicator-0.1.metadata'
--- src/AppIndicator-0.1.metadata 1970-01-01 00:00:00 +0000
+++ src/AppIndicator-0.1.metadata 2010-12-03 22:17:54 +0000
@@ -0,0 +1,1 @@
1AppIndicator name="AppIndicator"
02
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2010-08-10 21:59:25 +0000
+++ src/Makefile.am 2010-12-03 22:17:54 +0000
@@ -1,7 +1,9 @@
1CLEANFILES =1CLEANFILES =
2DISTCLEANFILES =2DISTCLEANFILES =
3BUILT_SOURCES =3BUILT_SOURCES =
4EXTRA_DIST = appindicator-0.1.pc.in4EXTRA_DIST = \
5 appindicator-0.1.pc.in \
6 AppIndicator-0.1.metadata
57
6include $(top_srcdir)/Makefile.am.enum8include $(top_srcdir)/Makefile.am.enum
7include $(top_srcdir)/Makefile.am.marshal9include $(top_srcdir)/Makefile.am.marshal
@@ -156,16 +158,17 @@
156INTROSPECTION_GIRS = 158INTROSPECTION_GIRS =
157INTROSPECTION_SCANNER_ARGS = \159INTROSPECTION_SCANNER_ARGS = \
158 --add-include-path=$(srcdir) \160 --add-include-path=$(srcdir) \
159 $(addprefix --c-include=libappindicator/, $(introspection_sources))161 $(addprefix --c-include=src/, $(introspection_sources)) \
162 --symbol-prefix=app \
163 --identifier-prefix=App
160INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)164INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
161165
162if HAVE_INTROSPECTION166if HAVE_INTROSPECTION
163167
164introspection_sources = \168introspection_sources = \
165 $(addprefix $(srcdir)/,$(libappindicator_headers)) \169 $(addprefix $(srcdir)/,$(libappindicator_headers))
166 $(addprefix $(top_builddir)/src/, $(glib_enum_h))
167170
168AppIndicator-0.1.gir: libappindicator.la $(glib_enum_h)171AppIndicator-0.1.gir: libappindicator.la
169AppIndicator_0_1_gir_INCLUDES = \172AppIndicator_0_1_gir_INCLUDES = \
170 GObject-2.0 \173 GObject-2.0 \
171 Gtk-2.0174 Gtk-2.0

Subscribers

People subscribed via source and target branches