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
1=== modified file 'bindings/mono/examples/IndicatorExample.cs'
2--- bindings/mono/examples/IndicatorExample.cs 2009-12-17 18:59:19 +0000
3+++ bindings/mono/examples/IndicatorExample.cs 2010-12-03 22:17:54 +0000
4@@ -34,8 +34,8 @@
5
6 win.Add (label);
7
8- ApplicationIndicator indicator = new ApplicationIndicator ("my-id",
9- "my-name",
10+ ApplicationIndicator indicator = new ApplicationIndicator ("Example",
11+ "applications-microblogging-panel",
12 Category.ApplicationStatus);
13
14 indicator.Status = Status.Attention;
15@@ -45,6 +45,7 @@
16 menu.Append (new MenuItem ("Bar"));
17
18 indicator.Menu = menu;
19+ indicator.Menu.ShowAll ();
20
21 win.ShowAll ();
22
23
24=== modified file 'docs/reference/Makefile.am'
25--- docs/reference/Makefile.am 2010-08-10 20:33:09 +0000
26+++ docs/reference/Makefile.am 2010-12-03 22:17:54 +0000
27@@ -91,7 +91,7 @@
28 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
29 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
30 GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src $(INDICATOR_CFLAGS)
31-GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la
32+GTKDOC_LIBS=$(top_builddir)/src/libappindicator.la $(top_builddir)/src/libapplication.la $(INDICATOR_LIBS)
33
34 # This includes the standard gtk-doc make rules, copied by gtkdocize.
35 include $(top_srcdir)/gtk-doc.local.make
36
37=== added file 'src/AppIndicator-0.1.metadata'
38--- src/AppIndicator-0.1.metadata 1970-01-01 00:00:00 +0000
39+++ src/AppIndicator-0.1.metadata 2010-12-03 22:17:54 +0000
40@@ -0,0 +1,1 @@
41+AppIndicator name="AppIndicator"
42
43=== modified file 'src/Makefile.am'
44--- src/Makefile.am 2010-08-10 21:59:25 +0000
45+++ src/Makefile.am 2010-12-03 22:17:54 +0000
46@@ -1,7 +1,9 @@
47 CLEANFILES =
48 DISTCLEANFILES =
49 BUILT_SOURCES =
50-EXTRA_DIST = appindicator-0.1.pc.in
51+EXTRA_DIST = \
52+ appindicator-0.1.pc.in \
53+ AppIndicator-0.1.metadata
54
55 include $(top_srcdir)/Makefile.am.enum
56 include $(top_srcdir)/Makefile.am.marshal
57@@ -156,16 +158,17 @@
58 INTROSPECTION_GIRS =
59 INTROSPECTION_SCANNER_ARGS = \
60 --add-include-path=$(srcdir) \
61- $(addprefix --c-include=libappindicator/, $(introspection_sources))
62+ $(addprefix --c-include=src/, $(introspection_sources)) \
63+ --symbol-prefix=app \
64+ --identifier-prefix=App
65 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
66
67 if HAVE_INTROSPECTION
68
69 introspection_sources = \
70- $(addprefix $(srcdir)/,$(libappindicator_headers)) \
71- $(addprefix $(top_builddir)/src/, $(glib_enum_h))
72+ $(addprefix $(srcdir)/,$(libappindicator_headers))
73
74-AppIndicator-0.1.gir: libappindicator.la $(glib_enum_h)
75+AppIndicator-0.1.gir: libappindicator.la
76 AppIndicator_0_1_gir_INCLUDES = \
77 GObject-2.0 \
78 Gtk-2.0

Subscribers

People subscribed via source and target branches