Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2011-10-30 11:14:46 (GMT)
committer Simon Schampijer <simon@schampijer.de>2011-10-30 11:17:00 (GMT)
commit31b8d49ce4d66057eb05c2a531dfe75d75bbe187 (patch)
treef984fc47e5d12132be83bf6d8838b9e085df56bd
parentfe2ec4378a515f5ac01c1c09f9b83d1b22057c17 (diff)
More introspection fixes for SugarExt
- only giving the source files we are interested in to the scanner - add VolumeAlsa (used in the shell)
-rw-r--r--src/sugar3/Makefile.am18
-rw-r--r--src/sugar3/session.py4
2 files changed, 18 insertions, 4 deletions
diff --git a/src/sugar3/Makefile.am b/src/sugar3/Makefile.am
index 2848714..edafe6a 100644
--- a/src/sugar3/Makefile.am
+++ b/src/sugar3/Makefile.am
@@ -108,9 +108,23 @@ EXTRA_DIST = sugar-marshal.list _sugarbaseext.override _sugarbaseext.defs
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS = SugarExt-1.0.gir
INTROSPECTION_SCANNER_ARGS = --identifier-prefix=Sugar --symbol-prefix=sugar \
- --identifier-prefix=EggSM --symbol-prefix=egg_sm
+ --identifier-prefix=EggSM --symbol-prefix=egg_sm \
+ --identifier-prefix=Gsm --symbol-prefix=gsm \
+ --identifier-prefix=Acme --symbol-prefix=acme
SugarExt_1_0_gir_LIBS = libsugarext.la
-SugarExt_1_0_gir_FILES = $(libsugarext_la_SOURCES)
+SugarExt_1_0_gir_FILES = \
+ acme-volume.c \
+ acme-volume.h \
+ acme-volume-alsa.c \
+ acme-volume-alsa.h \
+ eggsmclient.c \
+ eggsmclient.h \
+ gsm-session.c \
+ gsm-session.h \
+ gsm-xsmp.c \
+ gsm-xsmp.h \
+ sugar-key-grabber.c \
+ sugar-key-grabber.h
SugarExt_1_0_gir_INCLUDES = Gtk-3.0 Gdk-3.0
SugarExt_1_0_gir_PACKAGES = gtk+-3.0 gdk-3.0
SugarExt_1_0_gir_EXPORT_PACKAGES = SugarExt-1.0
diff --git a/src/sugar3/session.py b/src/sugar3/session.py
index cbf8696..589fc11 100644
--- a/src/sugar3/session.py
+++ b/src/sugar3/session.py
@@ -24,10 +24,10 @@ import os
from gi.repository import SugarExt
-class XSMPClient(SugarExt.ClientXSMP):
+class XSMPClient(SugarExt.Client):
def __init__(self):
- SugarExt.ClientXSMP.__init__(self)
+ SugarExt.Client.__init__(self)
class SessionManager(object):