diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-10-19 09:10:44 (GMT) |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-19 09:10:44 (GMT) |
commit | 1bfe899ea5b88c4527427deae50f4539f3b4b05a (patch) | |
tree | 0944b841ae1ea9d09eac39cc9390f29b803f76bf | |
parent | b93839e07925181d188b2061cb15ba71de7ff004 (diff) | |
parent | fa1745c6111b509eb7e74c4591bf4f3a6990c8d3 (diff) |
Merge commit 'upstream/0.82.11'
-rw-r--r-- | Makefile.in | 6 | ||||
-rw-r--r-- | aclocal.m4 | 1 | ||||
-rwxr-xr-x | configure | 226 | ||||
-rw-r--r-- | src/Makefile.in | 6 | ||||
-rw-r--r-- | src/sugar/Makefile.in | 44 | ||||
-rw-r--r-- | src/sugar/_sugarext.c | 381 | ||||
-rw-r--r-- | src/sugar/activity/Makefile.in | 7 | ||||
-rw-r--r-- | src/sugar/bundle/Makefile.in | 6 | ||||
-rw-r--r-- | src/sugar/clipboard/Makefile.in | 6 | ||||
-rw-r--r-- | src/sugar/datastore/Makefile.in | 6 | ||||
-rw-r--r-- | src/sugar/graphics/Makefile.in | 6 | ||||
-rw-r--r-- | src/sugar/presence/Makefile.in | 6 |
12 files changed, 620 insertions, 81 deletions
diff --git a/Makefile.in b/Makefile.in index 58e75ce..b5bd741 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,8 +37,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ config.guess config.sub depcomp install-sh ltmain.sh missing \ py-compile ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-compiler-flags.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -178,6 +179,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -8187,5 +8187,6 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/gnome-compiler-flags.m4]) m4_include([m4/intltool.m4]) m4_include([m4/python.m4]) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for sugar-toolkit 0.82.0. +# Generated by GNU Autoconf 2.61 for sugar-toolkit 0.82.11. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -726,8 +726,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='sugar-toolkit' PACKAGE_TARNAME='sugar-toolkit' -PACKAGE_VERSION='0.82.0' -PACKAGE_STRING='sugar-toolkit 0.82.0' +PACKAGE_VERSION='0.82.11' +PACKAGE_STRING='sugar-toolkit 0.82.11' PACKAGE_BUGREPORT='' ac_unique_file="configure.ac" @@ -869,6 +869,7 @@ F77 FFLAGS ac_ct_F77 LIBTOOL +WARN_CFLAGS GLIB_GENMARSHAL PYTHON PYTHON_VERSION @@ -1450,7 +1451,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sugar-toolkit 0.82.0 to adapt to many kinds of systems. +\`configure' configures sugar-toolkit 0.82.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1520,7 +1521,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sugar-toolkit 0.82.0:";; + short | recursive ) echo "Configuration of sugar-toolkit 0.82.11:";; esac cat <<\_ACEOF @@ -1534,6 +1535,9 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-libtool-lock avoid locking (might break parallel builds) + --enable-compile-warnings=[no/minimum/yes/maximum/error] + Turn on compiler warnings + --enable-iso-c Try to warn if code is not ISO C Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1624,7 +1628,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sugar-toolkit configure 0.82.0 +sugar-toolkit configure 0.82.11 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1638,7 +1642,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sugar-toolkit $as_me 0.82.0, which was +It was created by sugar-toolkit $as_me 0.82.11, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2334,7 +2338,7 @@ fi # Define the identity of the package. PACKAGE='sugar-toolkit' - VERSION='0.82.0' + VERSION='0.82.11' cat >>confdefs.h <<_ACEOF @@ -4379,7 +4383,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4382 "configure"' > conftest.$ac_ext + echo '#line 4386 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7117,11 +7121,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7120: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7124: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7124: \$? = $ac_status" >&5 + echo "$as_me:7128: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7407,11 +7411,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7410: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7414: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7414: \$? = $ac_status" >&5 + echo "$as_me:7418: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7511,11 +7515,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7514: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7518: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7518: \$? = $ac_status" >&5 + echo "$as_me:7522: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9862,7 +9866,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9865 "configure" +#line 9869 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9962,7 +9966,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9965 "configure" +#line 9969 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12382,11 +12386,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12385: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12389: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12389: \$? = $ac_status" >&5 + echo "$as_me:12393: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12486,11 +12490,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12489: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12493: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12493: \$? = $ac_status" >&5 + echo "$as_me:12497: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14050,11 +14054,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14053: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14057: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14057: \$? = $ac_status" >&5 + echo "$as_me:14061: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14154,11 +14158,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14157: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14161: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14161: \$? = $ac_status" >&5 + echo "$as_me:14165: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16343,11 +16347,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16346: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16350: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16350: \$? = $ac_status" >&5 + echo "$as_me:16354: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16633,11 +16637,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16636: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16640: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16640: \$? = $ac_status" >&5 + echo "$as_me:16644: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16737,11 +16741,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16740: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16744: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16744: \$? = $ac_status" >&5 + echo "$as_me:16748: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19392,6 +19396,139 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + # Check whether --enable-compile-warnings was given. +if test "${enable_compile_warnings+set}" = set; then + enableval=$enable_compile_warnings; +else + enable_compile_warnings="maximum" +fi + + + warnCFLAGS= + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi + + warning_flags= + realsave_CFLAGS="$CFLAGS" + + case "$enable_compile_warnings" in + no) + warning_flags= + ;; + minimum) + warning_flags="-Wall" + ;; + yes) + warning_flags="-Wall -Wmissing-prototypes" + ;; + maximum|error) + warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" + CFLAGS="$warning_flags $CFLAGS" + for option in -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + has_option=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + has_option=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$SAVE_CFLAGS" + { echo "$as_me:$LINENO: result: $has_option" >&5 +echo "${ECHO_T}$has_option" >&6; } + if test $has_option = yes; then + warning_flags="$warning_flags $option" + fi + unset has_option + unset SAVE_CFLAGS + done + unset option + if test "$enable_compile_warnings" = "error" ; then + warning_flags="$warning_flags -Werror" + fi + ;; + *) + { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + CFLAGS="$realsave_CFLAGS" + { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 +echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: result: $warning_flags" >&5 +echo "${ECHO_T}$warning_flags" >&6; } + + # Check whether --enable-iso-c was given. +if test "${enable_iso_c+set}" = set; then + enableval=$enable_iso_c; +else + enable_iso_c=no +fi + + + { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 +echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; } + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *\ \ -ansi\ \ *) ;; + *) complCFLAGS="$complCFLAGS -ansi" ;; + esac + case " $CFLAGS " in + *\ \ -pedantic\ \ *) ;; + *) complCFLAGS="$complCFLAGS -pedantic" ;; + esac + fi + fi + { echo "$as_me:$LINENO: result: $complCFLAGS" >&5 +echo "${ECHO_T}$complCFLAGS" >&6; } + + WARN_CFLAGS="$warning_flags $complCFLAGS" + + + # Extract the first word of "glib-genmarshal", so it can be a program name with args. set dummy glib-genmarshal; ac_word=$2 { echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -19792,12 +19929,12 @@ if test -n "$EXT_CFLAGS"; then pkg_cv_EXT_CFLAGS="$EXT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 gtk+-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "pygtk-2.0 gtk+-2.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 gtk+-2.0 sm ice alsa\"") >&5 + ($PKG_CONFIG --exists --print-errors "pygtk-2.0 gtk+-2.0 sm ice alsa") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EXT_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0 gtk+-2.0" 2>/dev/null` + pkg_cv_EXT_CFLAGS=`$PKG_CONFIG --cflags "pygtk-2.0 gtk+-2.0 sm ice alsa" 2>/dev/null` else pkg_failed=yes fi @@ -19808,12 +19945,12 @@ if test -n "$EXT_LIBS"; then pkg_cv_EXT_LIBS="$EXT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 gtk+-2.0\"") >&5 - ($PKG_CONFIG --exists --print-errors "pygtk-2.0 gtk+-2.0") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pygtk-2.0 gtk+-2.0 sm ice alsa\"") >&5 + ($PKG_CONFIG --exists --print-errors "pygtk-2.0 gtk+-2.0 sm ice alsa") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_EXT_LIBS=`$PKG_CONFIG --libs "pygtk-2.0 gtk+-2.0" 2>/dev/null` + pkg_cv_EXT_LIBS=`$PKG_CONFIG --libs "pygtk-2.0 gtk+-2.0 sm ice alsa" 2>/dev/null` else pkg_failed=yes fi @@ -19831,14 +19968,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - EXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pygtk-2.0 gtk+-2.0" 2>&1` + EXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pygtk-2.0 gtk+-2.0 sm ice alsa" 2>&1` else - EXT_PKG_ERRORS=`$PKG_CONFIG --print-errors "pygtk-2.0 gtk+-2.0" 2>&1` + EXT_PKG_ERRORS=`$PKG_CONFIG --print-errors "pygtk-2.0 gtk+-2.0 sm ice alsa" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$EXT_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (pygtk-2.0 gtk+-2.0) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (pygtk-2.0 gtk+-2.0 sm ice alsa) were not met: $EXT_PKG_ERRORS @@ -19849,7 +19986,7 @@ Alternatively, you may set the environment variables EXT_CFLAGS and EXT_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (pygtk-2.0 gtk+-2.0) were not met: +echo "$as_me: error: Package requirements (pygtk-2.0 gtk+-2.0 sm ice alsa) were not met: $EXT_PKG_ERRORS @@ -22300,7 +22437,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sugar-toolkit $as_me 0.82.0, which was +This file was extended by sugar-toolkit $as_me 0.82.11, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22347,7 +22484,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -sugar-toolkit config.status 0.82.0 +sugar-toolkit config.status 0.82.11 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -22674,6 +22811,7 @@ F77!$F77$ac_delim FFLAGS!$FFLAGS$ac_delim ac_ct_F77!$ac_ct_F77$ac_delim LIBTOOL!$LIBTOOL$ac_delim +WARN_CFLAGS!$WARN_CFLAGS$ac_delim GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim PYTHON!$PYTHON$ac_delim PYTHON_VERSION!$PYTHON_VERSION$ac_delim @@ -22736,7 +22874,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/src/Makefile.in b/src/Makefile.in index 2ac3fde..eb020c6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -34,8 +34,9 @@ host_triplet = @host@ subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-compiler-flags.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -163,6 +164,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/sugar/Makefile.in b/src/sugar/Makefile.in index 605103d..e250654 100644 --- a/src/sugar/Makefile.in +++ b/src/sugar/Makefile.in @@ -36,8 +36,9 @@ subdir = src/sugar DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(sugar_PYTHON) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-compiler-flags.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -56,13 +57,14 @@ _sugarext_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am__objects_1 = _sugarext_la-_sugarext.lo \ _sugarext_la-sugar-marshal.lo am__sugarext_la_OBJECTS = $(am__objects_1) \ - _sugarext_la-_sugarextmodule.lo _sugarext_la-gsm-app.lo \ + _sugarext_la-_sugarextmodule.lo _sugarext_la-acme-volume.lo \ + _sugarext_la-acme-volume-alsa.lo _sugarext_la-gsm-app.lo \ _sugarext_la-gsm-client.lo _sugarext_la-gsm-client-xsmp.lo \ _sugarext_la-gsm-xsmp.lo _sugarext_la-gsm-session.lo \ _sugarext_la-eggaccelerators.lo _sugarext_la-eggdesktopfile.lo \ _sugarext_la-eggsmclient.lo _sugarext_la-eggsmclient-xsmp.lo \ _sugarext_la-sexy-icon-entry.lo \ - _sugarext_la-sugar-address-entry.lo \ + _sugarext_la-sugar-address-entry.lo _sugarext_la-sugar-grid.lo \ _sugarext_la-sugar-key-grabber.lo _sugarext_la-sugar-menu.lo \ _sugarext_la-sugar-preview.lo _sugarext_la_OBJECTS = $(am__sugarext_la_OBJECTS) @@ -206,6 +208,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -274,6 +277,8 @@ sugar_PYTHON = \ pkgpyexec_LTLIBRARIES = _sugarext.la _sugarext_la_CFLAGS = \ + -DHAVE_ALSA \ + $(WARN_CFLAGS) \ $(EXT_CFLAGS) \ $(PYTHON_INCLUDES) @@ -282,6 +287,10 @@ _sugarext_la_LIBADD = $(EXT_LIBS) -lSM -lICE _sugarext_la_SOURCES = \ $(BUILT_SOURCES) \ _sugarextmodule.c \ + acme-volume.h \ + acme-volume.c \ + acme-volume-alsa.h \ + acme-volume-alsa.c \ gsm-app.h \ gsm-app.c \ gsm-client.h \ @@ -304,6 +313,8 @@ _sugarext_la_SOURCES = \ sexy-icon-entry.c \ sugar-address-entry.c \ sugar-address-entry.h \ + sugar-grid.c \ + sugar-grid.h \ sugar-key-grabber.c \ sugar-key-grabber.h \ sugar-menu.h \ @@ -390,6 +401,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-_sugarext.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-_sugarextmodule.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-acme-volume-alsa.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-acme-volume.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-eggaccelerators.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-eggdesktopfile.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-eggsmclient-xsmp.Plo@am__quote@ @@ -401,6 +414,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-gsm-xsmp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-sexy-icon-entry.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-sugar-address-entry.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-sugar-grid.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-sugar-key-grabber.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-sugar-marshal.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/_sugarext_la-sugar-menu.Plo@am__quote@ @@ -448,6 +462,20 @@ _sugarext_la-_sugarextmodule.lo: _sugarextmodule.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-_sugarextmodule.lo `test -f '_sugarextmodule.c' || echo '$(srcdir)/'`_sugarextmodule.c +_sugarext_la-acme-volume.lo: acme-volume.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-acme-volume.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-acme-volume.Tpo -c -o _sugarext_la-acme-volume.lo `test -f 'acme-volume.c' || echo '$(srcdir)/'`acme-volume.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/_sugarext_la-acme-volume.Tpo $(DEPDIR)/_sugarext_la-acme-volume.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='acme-volume.c' object='_sugarext_la-acme-volume.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-acme-volume.lo `test -f 'acme-volume.c' || echo '$(srcdir)/'`acme-volume.c + +_sugarext_la-acme-volume-alsa.lo: acme-volume-alsa.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-acme-volume-alsa.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-acme-volume-alsa.Tpo -c -o _sugarext_la-acme-volume-alsa.lo `test -f 'acme-volume-alsa.c' || echo '$(srcdir)/'`acme-volume-alsa.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/_sugarext_la-acme-volume-alsa.Tpo $(DEPDIR)/_sugarext_la-acme-volume-alsa.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='acme-volume-alsa.c' object='_sugarext_la-acme-volume-alsa.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-acme-volume-alsa.lo `test -f 'acme-volume-alsa.c' || echo '$(srcdir)/'`acme-volume-alsa.c + _sugarext_la-gsm-app.lo: gsm-app.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-gsm-app.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-gsm-app.Tpo -c -o _sugarext_la-gsm-app.lo `test -f 'gsm-app.c' || echo '$(srcdir)/'`gsm-app.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/_sugarext_la-gsm-app.Tpo $(DEPDIR)/_sugarext_la-gsm-app.Plo @@ -525,6 +553,13 @@ _sugarext_la-sugar-address-entry.lo: sugar-address-entry.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-sugar-address-entry.lo `test -f 'sugar-address-entry.c' || echo '$(srcdir)/'`sugar-address-entry.c +_sugarext_la-sugar-grid.lo: sugar-grid.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-sugar-grid.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-sugar-grid.Tpo -c -o _sugarext_la-sugar-grid.lo `test -f 'sugar-grid.c' || echo '$(srcdir)/'`sugar-grid.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/_sugarext_la-sugar-grid.Tpo $(DEPDIR)/_sugarext_la-sugar-grid.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sugar-grid.c' object='_sugarext_la-sugar-grid.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -c -o _sugarext_la-sugar-grid.lo `test -f 'sugar-grid.c' || echo '$(srcdir)/'`sugar-grid.c + _sugarext_la-sugar-key-grabber.lo: sugar-key-grabber.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(_sugarext_la_CFLAGS) $(CFLAGS) -MT _sugarext_la-sugar-key-grabber.lo -MD -MP -MF $(DEPDIR)/_sugarext_la-sugar-key-grabber.Tpo -c -o _sugarext_la-sugar-key-grabber.lo `test -f 'sugar-key-grabber.c' || echo '$(srcdir)/'`sugar-key-grabber.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/_sugarext_la-sugar-key-grabber.Tpo $(DEPDIR)/_sugarext_la-sugar-key-grabber.Plo @@ -874,7 +909,6 @@ _sugarext.c: _sugarext.defs _sugarext.override (cd $(srcdir)\ && $(PYGTK_CODEGEN) \ --register $(PYGTK_DEFSDIR)/gdk-types.defs \ - --register $(PYGTK_DEFSDIR)/gdk-types.defs \ --register $(PYGTK_DEFSDIR)/gtk-types.defs \ --override $*.override \ --prefix py$* $*.defs) > gen-$*.c \ diff --git a/src/sugar/_sugarext.c b/src/sugar/_sugarext.c index d464992..f7aecbc 100644 --- a/src/sugar/_sugarext.c +++ b/src/sugar/_sugarext.c @@ -9,25 +9,29 @@ #include "pygobject.h" #include "sugar-address-entry.h" +#include "sugar-grid.h" #include "sugar-key-grabber.h" #include "sugar-menu.h" #include "sugar-preview.h" #include "sexy-icon-entry.h" #include "gsm-session.h" +#include "gsm-xsmp.h" +#include "acme-volume-alsa.h" -#define EGG_SM_CLIENT_BACKEND_XSMP #include "eggsmclient.h" #include "eggsmclient-private.h" #include <pygtk/pygtk.h> #include <glib.h> -#line 26 "_sugarext.c" +#line 28 "_sugarext.c" /* ---------- types from other modules ---------- */ static PyTypeObject *_PyGObject_Type; #define PyGObject_Type (*_PyGObject_Type) +static PyTypeObject *_PyGtkWidget_Type; +#define PyGtkWidget_Type (*_PyGtkWidget_Type) static PyTypeObject *_PyGtkEntry_Type; #define PyGtkEntry_Type (*_PyGtkEntry_Type) static PyTypeObject *_PyGtkMenu_Type; @@ -36,8 +40,6 @@ static PyTypeObject *_PyGtkContainer_Type; #define PyGtkContainer_Type (*_PyGtkContainer_Type) static PyTypeObject *_PyGdkWindow_Type; #define PyGdkWindow_Type (*_PyGdkWindow_Type) -static PyTypeObject *_PyGdkDrawable_Type; -#define PyGdkDrawable_Type (*_PyGdkDrawable_Type) static PyTypeObject *_PyGtkImage_Type; #define PyGtkImage_Type (*_PyGtkImage_Type) @@ -46,13 +48,16 @@ static PyTypeObject *_PyGtkImage_Type; PyTypeObject G_GNUC_INTERNAL PySugarAddressEntry_Type; PyTypeObject G_GNUC_INTERNAL PySugarKeyGrabber_Type; PyTypeObject G_GNUC_INTERNAL PySugarMenu_Type; +PyTypeObject G_GNUC_INTERNAL PySugarGrid_Type; PyTypeObject G_GNUC_INTERNAL PySugarPreview_Type; PyTypeObject G_GNUC_INTERNAL PySexyIconEntry_Type; PyTypeObject G_GNUC_INTERNAL PyEggSMClientXSMP_Type; PyTypeObject G_GNUC_INTERNAL PyEggSMClient_Type; PyTypeObject G_GNUC_INTERNAL PyGsmSession_Type; +PyTypeObject G_GNUC_INTERNAL PyAcmeVolume_Type; +PyTypeObject G_GNUC_INTERNAL PyAcmeVolumeAlsa_Type; -#line 56 "_sugarext.c" +#line 61 "_sugarext.c" @@ -357,18 +362,148 @@ PyTypeObject G_GNUC_INTERNAL PySugarMenu_Type = { +/* ----------- SugarGrid ----------- */ + +static PyObject * +_wrap_sugar_grid_setup(PyGObject *self, PyObject *args, PyObject *kwargs) +{ + static char *kwlist[] = { "width", "height", NULL }; + int width, height; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ii:SugarGrid.setup", kwlist, &width, &height)) + return NULL; + + sugar_grid_setup(SUGAR_GRID(self->obj), width, height); + + Py_INCREF(Py_None); + return Py_None; +} + +static PyObject * +_wrap_sugar_grid_add_weight(PyGObject *self, PyObject *args, PyObject *kwargs) +{ + static char *kwlist[] = { "rect", NULL }; + PyObject *py_rect; + GdkRectangle rect = { 0, 0, 0, 0 }; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:SugarGrid.add_weight", kwlist, &py_rect)) + return NULL; + if (!pygdk_rectangle_from_pyobject(py_rect, &rect)) + return NULL; + + sugar_grid_add_weight(SUGAR_GRID(self->obj), &rect); + + Py_INCREF(Py_None); + return Py_None; +} + +static PyObject * +_wrap_sugar_grid_remove_weight(PyGObject *self, PyObject *args, PyObject *kwargs) +{ + static char *kwlist[] = { "rect", NULL }; + PyObject *py_rect; + GdkRectangle rect = { 0, 0, 0, 0 }; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:SugarGrid.remove_weight", kwlist, &py_rect)) + return NULL; + if (!pygdk_rectangle_from_pyobject(py_rect, &rect)) + return NULL; + + sugar_grid_remove_weight(SUGAR_GRID(self->obj), &rect); + + Py_INCREF(Py_None); + return Py_None; +} + +static PyObject * +_wrap_sugar_grid_compute_weight(PyGObject *self, PyObject *args, PyObject *kwargs) +{ + static char *kwlist[] = { "rect", NULL }; + PyObject *py_rect; + GdkRectangle rect = { 0, 0, 0, 0 }; + guint ret; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:SugarGrid.compute_weight", kwlist, &py_rect)) + return NULL; + if (!pygdk_rectangle_from_pyobject(py_rect, &rect)) + return NULL; + + ret = sugar_grid_compute_weight(SUGAR_GRID(self->obj), &rect); + + return PyLong_FromUnsignedLong(ret); +} + +static const PyMethodDef _PySugarGrid_methods[] = { + { "setup", (PyCFunction)_wrap_sugar_grid_setup, METH_VARARGS|METH_KEYWORDS, + NULL }, + { "add_weight", (PyCFunction)_wrap_sugar_grid_add_weight, METH_VARARGS|METH_KEYWORDS, + NULL }, + { "remove_weight", (PyCFunction)_wrap_sugar_grid_remove_weight, METH_VARARGS|METH_KEYWORDS, + NULL }, + { "compute_weight", (PyCFunction)_wrap_sugar_grid_compute_weight, METH_VARARGS|METH_KEYWORDS, + NULL }, + { NULL, NULL, 0, NULL } +}; + +PyTypeObject G_GNUC_INTERNAL PySugarGrid_Type = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "sugar._sugarext.Grid", /* tp_name */ + sizeof(PyGObject), /* tp_basicsize */ + 0, /* tp_itemsize */ + /* methods */ + (destructor)0, /* tp_dealloc */ + (printfunc)0, /* tp_print */ + (getattrfunc)0, /* tp_getattr */ + (setattrfunc)0, /* tp_setattr */ + (cmpfunc)0, /* tp_compare */ + (reprfunc)0, /* tp_repr */ + (PyNumberMethods*)0, /* tp_as_number */ + (PySequenceMethods*)0, /* tp_as_sequence */ + (PyMappingMethods*)0, /* tp_as_mapping */ + (hashfunc)0, /* tp_hash */ + (ternaryfunc)0, /* tp_call */ + (reprfunc)0, /* tp_str */ + (getattrofunc)0, /* tp_getattro */ + (setattrofunc)0, /* tp_setattro */ + (PyBufferProcs*)0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + NULL, /* Documentation string */ + (traverseproc)0, /* tp_traverse */ + (inquiry)0, /* tp_clear */ + (richcmpfunc)0, /* tp_richcompare */ + offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */ + (getiterfunc)0, /* tp_iter */ + (iternextfunc)0, /* tp_iternext */ + (struct PyMethodDef*)_PySugarGrid_methods, /* tp_methods */ + (struct PyMemberDef*)0, /* tp_members */ + (struct PyGetSetDef*)0, /* tp_getset */ + NULL, /* tp_base */ + NULL, /* tp_dict */ + (descrgetfunc)0, /* tp_descr_get */ + (descrsetfunc)0, /* tp_descr_set */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)0, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0 /* tp_is_gc */ +}; + + + /* ----------- SugarPreview ----------- */ static PyObject * _wrap_sugar_preview_take_screenshot(PyGObject *self, PyObject *args, PyObject *kwargs) { - static char *kwlist[] = { "drawable", NULL }; - PyGObject *drawable; + static char *kwlist[] = { "widget", NULL }; + PyGObject *widget; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:SugarPreview.take_screenshot", kwlist, &PyGdkDrawable_Type, &drawable)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:SugarPreview.take_screenshot", kwlist, &PyGtkWidget_Type, &widget)) return NULL; - sugar_preview_take_screenshot(SUGAR_PREVIEW(self->obj), GDK_DRAWABLE(drawable->obj)); + sugar_preview_take_screenshot(SUGAR_PREVIEW(self->obj), GTK_WIDGET(widget->obj)); Py_INCREF(Py_None); return Py_None; @@ -885,6 +1020,214 @@ PyTypeObject G_GNUC_INTERNAL PyGsmSession_Type = { +/* ----------- AcmeVolume ----------- */ + +static int +_wrap_acme_volume_new(PyGObject *self, PyObject *args, PyObject *kwargs) +{ + static char* kwlist[] = { NULL }; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, + ":sugar._sugarext.Volume.__init__", + kwlist)) + return -1; + + pygobject_constructv(self, 0, NULL); + if (!self->obj) { + PyErr_SetString( + PyExc_RuntimeError, + "could not create sugar._sugarext.Volume object"); + return -1; + } + return 0; +} + +static PyObject * +_wrap_acme_volume_get_volume(PyGObject *self) +{ + int ret; + + + ret = acme_volume_get_volume(ACME_VOLUME(self->obj)); + + return PyInt_FromLong(ret); +} + +static PyObject * +_wrap_acme_volume_set_volume(PyGObject *self, PyObject *args, PyObject *kwargs) +{ + static char *kwlist[] = { "val", NULL }; + int val; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:AcmeVolume.set_volume", kwlist, &val)) + return NULL; + + acme_volume_set_volume(ACME_VOLUME(self->obj), val); + + Py_INCREF(Py_None); + return Py_None; +} + +static PyObject * +_wrap_acme_volume_get_mute(PyGObject *self) +{ + int ret; + + + ret = acme_volume_get_mute(ACME_VOLUME(self->obj)); + + return PyBool_FromLong(ret); + +} + +static PyObject * +_wrap_acme_volume_set_mute(PyGObject *self, PyObject *args, PyObject *kwargs) +{ + static char *kwlist[] = { "val", NULL }; + int val; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:AcmeVolume.set_mute", kwlist, &val)) + return NULL; + + acme_volume_set_mute(ACME_VOLUME(self->obj), val); + + Py_INCREF(Py_None); + return Py_None; +} + +static PyObject * +_wrap_acme_volume_mute_toggle(PyGObject *self) +{ + + acme_volume_mute_toggle(ACME_VOLUME(self->obj)); + + Py_INCREF(Py_None); + return Py_None; +} + +static PyObject * +_wrap_acme_volume_get_threshold(PyGObject *self) +{ + int ret; + + + ret = acme_volume_get_threshold(ACME_VOLUME(self->obj)); + + return PyInt_FromLong(ret); +} + +static const PyMethodDef _PyAcmeVolume_methods[] = { + { "get_volume", (PyCFunction)_wrap_acme_volume_get_volume, METH_NOARGS, + NULL }, + { "set_volume", (PyCFunction)_wrap_acme_volume_set_volume, METH_VARARGS|METH_KEYWORDS, + NULL }, + { "get_mute", (PyCFunction)_wrap_acme_volume_get_mute, METH_NOARGS, + NULL }, + { "set_mute", (PyCFunction)_wrap_acme_volume_set_mute, METH_VARARGS|METH_KEYWORDS, + NULL }, + { "mute_toggle", (PyCFunction)_wrap_acme_volume_mute_toggle, METH_NOARGS, + NULL }, + { "get_threshold", (PyCFunction)_wrap_acme_volume_get_threshold, METH_NOARGS, + NULL }, + { NULL, NULL, 0, NULL } +}; + +PyTypeObject G_GNUC_INTERNAL PyAcmeVolume_Type = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "sugar._sugarext.Volume", /* tp_name */ + sizeof(PyGObject), /* tp_basicsize */ + 0, /* tp_itemsize */ + /* methods */ + (destructor)0, /* tp_dealloc */ + (printfunc)0, /* tp_print */ + (getattrfunc)0, /* tp_getattr */ + (setattrfunc)0, /* tp_setattr */ + (cmpfunc)0, /* tp_compare */ + (reprfunc)0, /* tp_repr */ + (PyNumberMethods*)0, /* tp_as_number */ + (PySequenceMethods*)0, /* tp_as_sequence */ + (PyMappingMethods*)0, /* tp_as_mapping */ + (hashfunc)0, /* tp_hash */ + (ternaryfunc)0, /* tp_call */ + (reprfunc)0, /* tp_str */ + (getattrofunc)0, /* tp_getattro */ + (setattrofunc)0, /* tp_setattro */ + (PyBufferProcs*)0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + NULL, /* Documentation string */ + (traverseproc)0, /* tp_traverse */ + (inquiry)0, /* tp_clear */ + (richcmpfunc)0, /* tp_richcompare */ + offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */ + (getiterfunc)0, /* tp_iter */ + (iternextfunc)0, /* tp_iternext */ + (struct PyMethodDef*)_PyAcmeVolume_methods, /* tp_methods */ + (struct PyMemberDef*)0, /* tp_members */ + (struct PyGetSetDef*)0, /* tp_getset */ + NULL, /* tp_base */ + NULL, /* tp_dict */ + (descrgetfunc)0, /* tp_descr_get */ + (descrsetfunc)0, /* tp_descr_set */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)_wrap_acme_volume_new, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0 /* tp_is_gc */ +}; + + + +/* ----------- AcmeVolumeAlsa ----------- */ + +PyTypeObject G_GNUC_INTERNAL PyAcmeVolumeAlsa_Type = { + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ + "sugar._sugarext.VolumeAlsa", /* tp_name */ + sizeof(PyGObject), /* tp_basicsize */ + 0, /* tp_itemsize */ + /* methods */ + (destructor)0, /* tp_dealloc */ + (printfunc)0, /* tp_print */ + (getattrfunc)0, /* tp_getattr */ + (setattrfunc)0, /* tp_setattr */ + (cmpfunc)0, /* tp_compare */ + (reprfunc)0, /* tp_repr */ + (PyNumberMethods*)0, /* tp_as_number */ + (PySequenceMethods*)0, /* tp_as_sequence */ + (PyMappingMethods*)0, /* tp_as_mapping */ + (hashfunc)0, /* tp_hash */ + (ternaryfunc)0, /* tp_call */ + (reprfunc)0, /* tp_str */ + (getattrofunc)0, /* tp_getattro */ + (setattrofunc)0, /* tp_setattro */ + (PyBufferProcs*)0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + NULL, /* Documentation string */ + (traverseproc)0, /* tp_traverse */ + (inquiry)0, /* tp_clear */ + (richcmpfunc)0, /* tp_richcompare */ + offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */ + (getiterfunc)0, /* tp_iter */ + (iternextfunc)0, /* tp_iternext */ + (struct PyMethodDef*)NULL, /* tp_methods */ + (struct PyMemberDef*)0, /* tp_members */ + (struct PyGetSetDef*)0, /* tp_getset */ + NULL, /* tp_base */ + NULL, /* tp_dict */ + (descrgetfunc)0, /* tp_descr_get */ + (descrsetfunc)0, /* tp_descr_set */ + offsetof(PyGObject, inst_dict), /* tp_dictoffset */ + (initproc)0, /* tp_init */ + (allocfunc)0, /* tp_alloc */ + (newfunc)0, /* tp_new */ + (freefunc)0, /* tp_free */ + (inquiry)0 /* tp_is_gc */ +}; + + + /* ----------- functions ----------- */ static PyObject * @@ -982,6 +1325,12 @@ py_sugarext_register_classes(PyObject *d) return ; } if ((module = PyImport_ImportModule("gtk")) != NULL) { + _PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget"); + if (_PyGtkWidget_Type == NULL) { + PyErr_SetString(PyExc_ImportError, + "cannot import name Widget from gtk"); + return ; + } _PyGtkEntry_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Entry"); if (_PyGtkEntry_Type == NULL) { PyErr_SetString(PyExc_ImportError, @@ -1018,12 +1367,6 @@ py_sugarext_register_classes(PyObject *d) "cannot import name Window from gtk.gdk"); return ; } - _PyGdkDrawable_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Drawable"); - if (_PyGdkDrawable_Type == NULL) { - PyErr_SetString(PyExc_ImportError, - "cannot import name Drawable from gtk.gdk"); - return ; - } } else { PyErr_SetString(PyExc_ImportError, "could not import gtk.gdk"); @@ -1031,11 +1374,13 @@ py_sugarext_register_classes(PyObject *d) } -#line 1035 "_sugarext.c" +#line 1378 "_sugarext.c" pygobject_register_class(d, "SugarAddressEntry", SUGAR_TYPE_ADDRESS_ENTRY, &PySugarAddressEntry_Type, Py_BuildValue("(O)", &PyGtkEntry_Type)); pygobject_register_class(d, "SugarKeyGrabber", SUGAR_TYPE_KEY_GRABBER, &PySugarKeyGrabber_Type, Py_BuildValue("(O)", &PyGObject_Type)); pyg_set_object_has_new_constructor(SUGAR_TYPE_KEY_GRABBER); pygobject_register_class(d, "SugarMenu", SUGAR_TYPE_MENU, &PySugarMenu_Type, Py_BuildValue("(O)", &PyGtkMenu_Type)); + pygobject_register_class(d, "SugarGrid", SUGAR_TYPE_GRID, &PySugarGrid_Type, Py_BuildValue("(O)", &PyGObject_Type)); + pyg_set_object_has_new_constructor(SUGAR_TYPE_GRID); pygobject_register_class(d, "SugarPreview", SUGAR_TYPE_PREVIEW, &PySugarPreview_Type, Py_BuildValue("(O)", &PyGObject_Type)); pyg_set_object_has_new_constructor(SUGAR_TYPE_PREVIEW); pygobject_register_class(d, "SexyIconEntry", SEXY_TYPE_ICON_ENTRY, &PySexyIconEntry_Type, Py_BuildValue("(O)", &PyGtkEntry_Type)); @@ -1046,4 +1391,8 @@ py_sugarext_register_classes(PyObject *d) pyg_set_object_has_new_constructor(EGG_TYPE_SM_CLIENT_XSMP); pygobject_register_class(d, "GsmSession", GSM_TYPE_SESSION, &PyGsmSession_Type, Py_BuildValue("(O)", &PyGObject_Type)); pyg_set_object_has_new_constructor(GSM_TYPE_SESSION); + pygobject_register_class(d, "AcmeVolume", ACME_TYPE_VOLUME, &PyAcmeVolume_Type, Py_BuildValue("(O)", &PyGObject_Type)); + pyg_set_object_has_new_constructor(ACME_TYPE_VOLUME); + pygobject_register_class(d, "AcmeVolumeAlsa", ACME_TYPE_VOLUME_ALSA, &PyAcmeVolumeAlsa_Type, Py_BuildValue("(O)", &PyAcmeVolume_Type)); + pyg_set_object_has_new_constructor(ACME_TYPE_VOLUME_ALSA); } diff --git a/src/sugar/activity/Makefile.in b/src/sugar/activity/Makefile.in index b8040f3..b8e5359 100644 --- a/src/sugar/activity/Makefile.in +++ b/src/sugar/activity/Makefile.in @@ -35,8 +35,9 @@ subdir = src/sugar/activity DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(sugar_PYTHON) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-compiler-flags.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -161,6 +162,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -225,6 +227,7 @@ sugar_PYTHON = \ activityhandle.py \ activityservice.py \ bundlebuilder.py \ + main.py \ registry.py all: all-am diff --git a/src/sugar/bundle/Makefile.in b/src/sugar/bundle/Makefile.in index 7e57b8d..3033c1f 100644 --- a/src/sugar/bundle/Makefile.in +++ b/src/sugar/bundle/Makefile.in @@ -35,8 +35,9 @@ subdir = src/sugar/bundle DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(sugar_PYTHON) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-compiler-flags.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -161,6 +162,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/sugar/clipboard/Makefile.in b/src/sugar/clipboard/Makefile.in index 16a35f9..764d431 100644 --- a/src/sugar/clipboard/Makefile.in +++ b/src/sugar/clipboard/Makefile.in @@ -35,8 +35,9 @@ subdir = src/sugar/clipboard DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(sugar_PYTHON) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-compiler-flags.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -161,6 +162,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/sugar/datastore/Makefile.in b/src/sugar/datastore/Makefile.in index 6c094bc..a236af5 100644 --- a/src/sugar/datastore/Makefile.in +++ b/src/sugar/datastore/Makefile.in @@ -35,8 +35,9 @@ subdir = src/sugar/datastore DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(sugar_PYTHON) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-compiler-flags.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -161,6 +162,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/sugar/graphics/Makefile.in b/src/sugar/graphics/Makefile.in index d0b6ea2..77ef52d 100644 --- a/src/sugar/graphics/Makefile.in +++ b/src/sugar/graphics/Makefile.in @@ -35,8 +35,9 @@ subdir = src/sugar/graphics DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(sugar_PYTHON) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-compiler-flags.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -161,6 +162,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/src/sugar/presence/Makefile.in b/src/sugar/presence/Makefile.in index 2fa0693..37204d3 100644 --- a/src/sugar/presence/Makefile.in +++ b/src/sugar/presence/Makefile.in @@ -35,8 +35,9 @@ subdir = src/sugar/presence DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(sugar_PYTHON) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/python.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-compiler-flags.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/python.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -161,6 +162,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ |