aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/AppIndicator3-0.1.metadata.in2
-rw-r--r--src/Makefile.am10
-rw-r--r--src/app-indicator.h2
-rw-r--r--src/appindicator3-0.1.pc.in2
4 files changed, 10 insertions, 6 deletions
diff --git a/src/AppIndicator3-0.1.metadata.in b/src/AppIndicator3-0.1.metadata.in
index 5790ddb..8d094fd 100644
--- a/src/AppIndicator3-0.1.metadata.in
+++ b/src/AppIndicator3-0.1.metadata.in
@@ -1,3 +1,3 @@
-AppIndicator name="AppIndicator"
+AppIndicator3 name="AppIndicator"
Indicator.priv hidden="1"
IndicatorPrivate hidden="1"
diff --git a/src/Makefile.am b/src/Makefile.am
index f83a6c4..8a74d66 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,8 @@ BUILT_SOURCES =
EXTRA_DIST = \
appindicator-0.1.pc.in \
appindicator3-0.1.pc.in \
- AppIndicator$(VER)-0.1.metadata.in
+ AppIndicator-0.1.metadata.in \
+ AppIndicator3-0.1.metadata.in
include $(top_srcdir)/Makefile.am.enum
include $(top_srcdir)/Makefile.am.marshal
@@ -44,7 +45,7 @@ glib_enum_headers = $(addprefix $(srcdir)/, $(libappindicator_headers))
DISTCLEANFILES += app-indicator-enum-types.c
libappindicatorincludefolder=libappindicator
-libappindicatorincludedir=$(includedir)/libappindicator-0.1/$(libappindicatorincludefolder)
+libappindicatorincludedir=$(includedir)/libappindicator$(VER)-0.1/$(libappindicatorincludefolder)
libappindicator_headers = \
app-indicator.h
@@ -134,7 +135,8 @@ INTROSPECTION_SCANNER_ARGS = \
--add-include-path=$(srcdir) \
$(addprefix --c-include=$(libappindicatorincludefolder)/, $(libappindicator_headers)) \
--symbol-prefix=app \
- --identifier-prefix=App
+ --identifier-prefix=App \
+ --warn-all
else
INTROSPECTION_SCANNER_ARGS = \
--add-include-path=$(srcdir) \
@@ -156,11 +158,13 @@ AppIndicator_0_1_gir_INCLUDES = \
AppIndicator_0_1_gir_CFLAGS = $(LIBRARY_CFLAGS) -I$(srcdir) -I$(top_builddir)/src
AppIndicator_0_1_gir_LIBS = libappindicator$(VER).la
AppIndicator_0_1_gir_FILES = $(introspection_sources)
+# AppIndicator_0_1_gir_NAMESPACE = AppIndicator
AppIndicator3_0_1_gir_INCLUDES = $(AppIndicator_0_1_gir_INCLUDES)
AppIndicator3_0_1_gir_CFLAGS = $(AppIndicator_0_1_gir_CFLAGS)
AppIndicator3_0_1_gir_LIBS = $(AppIndicator_0_1_gir_LIBS)
AppIndicator3_0_1_gir_FILES = $(AppIndicator_0_1_gir_FILES)
+# AppIndicator3_0_1_gir_NAMESPACE = AppIndicator
INTROSPECTION_GIRS += AppIndicator$(VER)-0.1.gir
diff --git a/src/app-indicator.h b/src/app-indicator.h
index 0e693bd..9e53447 100644
--- a/src/app-indicator.h
+++ b/src/app-indicator.h
@@ -176,7 +176,7 @@ typedef struct _AppIndicatorPrivate AppIndicatorPrivate;
@new_label: Slot for #AppIndicator::new-label.
@new_accessible_desc: Slot for #AppIndicator::new-accessible-desc.
@connection_changed: Slot for #AppIndicator::connection-changed.
- @scroll-event: Slot for #AppIndicator::scroll-event
+ @scroll_event: Slot for #AppIndicator::scroll-event
@app_indicator_reserved_ats: Reserved for future use.
@fallback: Function that gets called to make a #GtkStatusIcon when
there is no Application Indicator area available.
diff --git a/src/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in
index 0ffe409..f59ac70 100644
--- a/src/appindicator3-0.1.pc.in
+++ b/src/appindicator3-0.1.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
bindir=@bindir@
includedir=@includedir@
-Cflags: -I${includedir}/libappindicator-0.1
+Cflags: -I${includedir}/libappindicator3-0.1
Requires: dbusmenu-glib-0.4 gtk+-3.0
Libs: -L${libdir} -lappindicator3