Hello community,
here is the log from the commit of package tomboy
checked in at Fri Oct 24 17:19:27 CEST 2008.
--------
--- GNOME/tomboy/tomboy.changes 2008-09-23 19:28:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/tomboy/tomboy.changes 2008-10-19 03:12:45.000000000 +0200
@@ -1,0 +2,7 @@
+Sun Oct 19 12:09:04 EST 2008 - mboman@suse.de
+
+- Update to version 0.12.1:
+ + Bundle gnome-sharp panel applet code (as we did prior to 0.11.3) if
+ building against gnome-sharp < 2.23.90. See bgo#555318 for details.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
tomboy-0.12.0.tar.bz2
New:
----
tomboy-0.12.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tomboy.spec ++++++
--- /var/tmp/diff_new_pack.j13663/_old 2008-10-24 17:19:08.000000000 +0200
+++ /var/tmp/diff_new_pack.j13663/_new 2008-10-24 17:19:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package tomboy (Version 0.12.0)
+# spec file for package tomboy (Version 0.12.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -49,7 +49,7 @@
License: LGPL v2.1 or later
Group: Productivity/Office/Other
Requires: mono
-Version: 0.12.0
+Version: 0.12.1
Release: 1
Summary: GNOME Note Taking Application
Url: http://www.beatniksoftware.com/tomboy/
@@ -155,6 +155,10 @@
%define __find_provides env sh -c 'filelist=($(grep -v -E "%{_libdir}/%{name}/addins|Mono.Addins")) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort | uniq'
%changelog
+* Sun Oct 19 2008 mboman@suse.de
+- Update to version 0.12.1:
+ + Bundle gnome-sharp panel applet code (as we did prior to 0.11.3) if
+ building against gnome-sharp < 2.23.90. See bgo#555318 for details.
* Tue Sep 23 2008 maw@suse.de
- Update to version 0.12.0:
+ Reverted to the 0.10.x-era printing add-in, as the new one is
++++++ tomboy-0.12.0.tar.bz2 -> tomboy-0.12.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/ChangeLog new/tomboy-0.12.1/ChangeLog
--- old/tomboy-0.12.0/ChangeLog 2008-09-22 14:11:22.000000000 +0200
+++ new/tomboy-0.12.1/ChangeLog 2008-10-07 08:50:12.000000000 +0200
@@ -1,3 +1,20 @@
+2008-10-06 Sandy Armstrong
+
+ * NEWS: Update for 0.12.1.
+
+2008-10-06 Sandy Armstrong
+
+ * configure.in, Tomboy/Applet.cs, Tomboy/panelapplet, Tomboy/Tomboy.cs,
+ Tomboy/Makefile.am: Rebundling gnome-sharp panel applet code if
+ gnome-sharp < 2.23.90 is detected during configure. Earlier
+ versions are generally missing a crucial DllMap in
+ gnome-sharp.dll.config (though some distros patch this). Fix for
+ bug #555318.
+
+2008-09-22 Sandy Armstrong
+
+ * configure.in: Bump version to 0.12.1.
+
2008-09-21 Sandy Armstrong
* NEWS: Update for 0.12.0.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/configure new/tomboy-0.12.1/configure
--- old/tomboy-0.12.0/configure 2008-09-22 14:11:43.000000000 +0200
+++ new/tomboy-0.12.1/configure 2008-10-07 08:51:06.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for tomboy 0.12.0.
+# Generated by GNU Autoconf 2.61 for tomboy 0.12.1.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@
# Identity of this package.
PACKAGE_NAME='tomboy'
PACKAGE_TARNAME='tomboy'
-PACKAGE_VERSION='0.12.0'
-PACKAGE_STRING='tomboy 0.12.0'
+PACKAGE_VERSION='0.12.1'
+PACKAGE_STRING='tomboy 0.12.1'
PACKAGE_BUGREPORT=''
ac_unique_file="Tomboy/Tomboy.cs"
@@ -953,6 +953,8 @@
EXTERNAL_MONO_ADDINS_FALSE
TOMBOY_CFLAGS
TOMBOY_LIBS
+FIXED_PANELAPPLET_TRUE
+FIXED_PANELAPPLET_FALSE
EVOLUTION_CFLAGS
EVOLUTION_LIBS
ENABLE_EVOLUTION_TRUE
@@ -1514,7 +1516,7 @@
# 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 tomboy 0.12.0 to adapt to many kinds of systems.
+\`configure' configures tomboy 0.12.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1588,7 +1590,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tomboy 0.12.0:";;
+ short | recursive ) echo "Configuration of tomboy 0.12.1:";;
esac
cat <<\_ACEOF
@@ -1735,7 +1737,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tomboy configure 0.12.0
+tomboy configure 0.12.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1749,7 +1751,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by tomboy $as_me 0.12.0, which was
+It was created by tomboy $as_me 0.12.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2440,7 +2442,7 @@
# Define the identity of the package.
PACKAGE='tomboy'
- VERSION='0.12.0'
+ VERSION='0.12.1'
cat >>confdefs.h <<_ACEOF
@@ -6586,7 +6588,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6589 "configure"' > conftest.$ac_ext
+ echo '#line 6591 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9233,11 +9235,11 @@
-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:9236: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9238: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9240: \$? = $ac_status" >&5
+ echo "$as_me:9242: \$? = $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.
@@ -9523,11 +9525,11 @@
-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:9526: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9528: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9530: \$? = $ac_status" >&5
+ echo "$as_me:9532: \$? = $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.
@@ -9627,11 +9629,11 @@
-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:9630: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9632: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9634: \$? = $ac_status" >&5
+ echo "$as_me:9636: \$? = $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
@@ -11991,7 +11993,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:14497: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14499: \$? = $ac_status" >&5
+ echo "$as_me:14501: \$? = $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.
@@ -14596,11 +14598,11 @@
-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:14599: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14601: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14603: \$? = $ac_status" >&5
+ echo "$as_me:14605: \$? = $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
@@ -16179,11 +16181,11 @@
-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:16182: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16184: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16186: \$? = $ac_status" >&5
+ echo "$as_me:16188: \$? = $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.
@@ -16283,11 +16285,11 @@
-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:16286: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16288: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16290: \$? = $ac_status" >&5
+ echo "$as_me:16292: \$? = $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
@@ -18490,11 +18492,11 @@
-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:18493: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18495: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18497: \$? = $ac_status" >&5
+ echo "$as_me:18499: \$? = $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.
@@ -18780,11 +18782,11 @@
-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:18783: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18785: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18787: \$? = $ac_status" >&5
+ echo "$as_me:18789: \$? = $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.
@@ -18884,11 +18886,11 @@
-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:18887: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18889: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18891: \$? = $ac_status" >&5
+ echo "$as_me:18893: \$? = $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
@@ -23853,66 +23855,19 @@
# Put the nasty error message in config.log where it belongs
echo "$TOMBOY_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION
- gnome-sharp-2.0
- gconf-sharp-2.0
- gconf-sharp-peditors-2.0
- gnome-panel-sharp-2.24) were not met:
-
-$TOMBOY_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables TOMBOY_CFLAGS
-and TOMBOY_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 (gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION
- gnome-sharp-2.0
- gconf-sharp-2.0
- gconf-sharp-peditors-2.0
- gnome-panel-sharp-2.24) were not met:
-
-$TOMBOY_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables TOMBOY_CFLAGS
-and TOMBOY_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ has_fixed_panelapplet="no"
elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables TOMBOY_CFLAGS
-and TOMBOY_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see http://pkg-config.freedesktop.org/.
-See \`config.log' for more details." >&5
-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables TOMBOY_CFLAGS
-and TOMBOY_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see http://pkg-config.freedesktop.org/.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ has_fixed_panelapplet="no"
else
TOMBOY_CFLAGS=$pkg_cv_TOMBOY_CFLAGS
TOMBOY_LIBS=$pkg_cv_TOMBOY_LIBS
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- :
+ has_fixed_panelapplet="yes"
fi
+
else
if pkg-config --atleast-version=2.16.1 gconf-sharp-2.0; then
@@ -24182,6 +24137,14 @@
fi
fi
fi
+ if test "x$has_fixed_panelapplet" = "xyes"; then
+ FIXED_PANELAPPLET_TRUE=
+ FIXED_PANELAPPLET_FALSE='#'
+else
+ FIXED_PANELAPPLET_TRUE='#'
+ FIXED_PANELAPPLET_FALSE=
+fi
+
#
@@ -26209,6 +26172,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${FIXED_PANELAPPLET_TRUE}" && test -z "${FIXED_PANELAPPLET_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"FIXED_PANELAPPLET\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"FIXED_PANELAPPLET\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${ENABLE_EVOLUTION_TRUE}" && test -z "${ENABLE_EVOLUTION_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"ENABLE_EVOLUTION\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -26537,7 +26507,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by tomboy $as_me 0.12.0, which was
+This file was extended by tomboy $as_me 0.12.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26590,7 +26560,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-tomboy config.status 0.12.0
+tomboy config.status 0.12.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -27033,14 +27003,14 @@
EXTERNAL_MONO_ADDINS_FALSE!$EXTERNAL_MONO_ADDINS_FALSE$ac_delim
TOMBOY_CFLAGS!$TOMBOY_CFLAGS$ac_delim
TOMBOY_LIBS!$TOMBOY_LIBS$ac_delim
+FIXED_PANELAPPLET_TRUE!$FIXED_PANELAPPLET_TRUE$ac_delim
+FIXED_PANELAPPLET_FALSE!$FIXED_PANELAPPLET_FALSE$ac_delim
EVOLUTION_CFLAGS!$EVOLUTION_CFLAGS$ac_delim
EVOLUTION_LIBS!$EVOLUTION_LIBS$ac_delim
ENABLE_EVOLUTION_TRUE!$ENABLE_EVOLUTION_TRUE$ac_delim
ENABLE_EVOLUTION_FALSE!$ENABLE_EVOLUTION_FALSE$ac_delim
ENABLE_SKETCHING_TRUE!$ENABLE_SKETCHING_TRUE$ac_delim
ENABLE_SKETCHING_FALSE!$ENABLE_SKETCHING_FALSE$ac_delim
-GALAGO_CFLAGS!$GALAGO_CFLAGS$ac_delim
-GALAGO_LIBS!$GALAGO_LIBS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -27082,6 +27052,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+GALAGO_CFLAGS!$GALAGO_CFLAGS$ac_delim
+GALAGO_LIBS!$GALAGO_LIBS$ac_delim
ENABLE_GALAGO_TRUE!$ENABLE_GALAGO_TRUE$ac_delim
ENABLE_GALAGO_FALSE!$ENABLE_GALAGO_FALSE$ac_delim
NUNIT_CFLAGS!$NUNIT_CFLAGS$ac_delim
@@ -27101,7 +27073,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/configure.in new/tomboy-0.12.1/configure.in
--- old/tomboy-0.12.0/configure.in 2008-09-22 14:11:22.000000000 +0200
+++ new/tomboy-0.12.1/configure.in 2008-10-07 08:13:04.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT(tomboy, 0.12.0)
+AC_INIT(tomboy, 0.12.1)
AC_CONFIG_SRCDIR(Tomboy/Tomboy.cs)
AM_INIT_AUTOMAKE([tar-pax])
AM_MAINTAINER_MODE
@@ -145,7 +145,10 @@
gnome-sharp-2.0
gconf-sharp-2.0
gconf-sharp-peditors-2.0
- gnome-panel-sharp-2.24)
+ gnome-panel-sharp-2.24,
+ has_fixed_panelapplet="yes",
+ has_fixed_panelapplet="no")
+
else
if pkg-config --atleast-version=2.16.1 gconf-sharp-2.0; then
PKG_CHECK_MODULES(TOMBOY,
@@ -160,6 +163,7 @@
gconf-sharp-2.0)
fi
fi
+AM_CONDITIONAL(FIXED_PANELAPPLET, test "x$has_fixed_panelapplet" = "xyes")
AC_SUBST(TOMBOY_LIBS)
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/NEWS new/tomboy-0.12.1/NEWS
--- old/tomboy-0.12.0/NEWS 2008-09-22 14:11:22.000000000 +0200
+++ new/tomboy-0.12.1/NEWS 2008-10-07 08:49:45.000000000 +0200
@@ -9,6 +9,10 @@
Please report bugs using http://bugzilla.gnome.org/
(http://bugzilla.gnome.org/enter_bug.cgi?product=Tomboy).
+Version 0.12.1
+* Bundle gnome-sharp panel applet code (as we did prior to 0.11.3) if building
+ against gnome-sharp < 2.23.90. See bug #555318 for details.
+
Version 0.12.0
* Reverted to 0.10.x-era printing add-in, as the new one is not ready yet.
* Many fixes to note synchronization (#535279).
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/Applet.cs new/tomboy-0.12.1/Tomboy/Applet.cs
--- old/tomboy-0.12.0/Tomboy/Applet.cs 2008-09-22 14:11:19.000000000 +0200
+++ new/tomboy-0.12.1/Tomboy/Applet.cs 2008-10-07 01:03:24.000000000 +0200
@@ -5,7 +5,12 @@
using System.Reflection;
using System.Runtime.InteropServices;
using Mono.Unix;
+
+#if FIXED_PANELAPPLET
using Gnome;
+#else
+using _Gnome;
+#endif
namespace Tomboy
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/Makefile.am new/tomboy-0.12.1/Tomboy/Makefile.am
--- old/tomboy-0.12.0/Tomboy/Makefile.am 2008-09-22 14:11:19.000000000 +0200
+++ new/tomboy-0.12.1/Tomboy/Makefile.am 2008-10-07 00:54:20.000000000 +0200
@@ -17,12 +17,20 @@
FIXED_GTKSPELL_CSFLAGS = -define:FIXED_GTKSPELL
endif
+if FIXED_PANELAPPLET
+FIXED_PANELAPPLET_CSFLAGS = -define:FIXED_PANELAPPLET
+else
+PANELAPPLET_CSFILES = \
+ $(srcdir)/panelapplet/*.cs
+endif
+
CSFLAGS = \
-debug \
-define:DEBUG \
-unsafe \
-target:exe \
$(DBUS_CSFLAGS) \
+ $(FIXED_PANELAPPLET_CSFLAGS) \
$(FIXED_GTKSPELL_CSFLAGS) \
$(CSC_DEFINES)
@@ -63,6 +71,8 @@
$(srcdir)/Notebooks/*.cs \
$(srcdir)/Synchronization/*.cs \
\
+ $(PANELAPPLET_CSFILES) \
+ \
$(srcdir)/Gnome.Keyring/*.cs \
\
$(DBUS_CSFILES)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/Makefile.in new/tomboy-0.12.1/Tomboy/Makefile.in
--- old/tomboy-0.12.0/Tomboy/Makefile.in 2008-09-22 14:11:45.000000000 +0200
+++ new/tomboy-0.12.1/Tomboy/Makefile.in 2008-10-07 08:51:05.000000000 +0200
@@ -283,12 +283,17 @@
@ENABLE_DBUS_TRUE@ $(srcdir)/RemoteControlProxy.cs
@FIXED_GTKSPELL_TRUE@FIXED_GTKSPELL_CSFLAGS = -define:FIXED_GTKSPELL
+@FIXED_PANELAPPLET_TRUE@FIXED_PANELAPPLET_CSFLAGS = -define:FIXED_PANELAPPLET
+@FIXED_PANELAPPLET_FALSE@PANELAPPLET_CSFILES = \
+@FIXED_PANELAPPLET_FALSE@ $(srcdir)/panelapplet/*.cs
+
CSFLAGS = \
-debug \
-define:DEBUG \
-unsafe \
-target:exe \
$(DBUS_CSFLAGS) \
+ $(FIXED_PANELAPPLET_CSFLAGS) \
$(FIXED_GTKSPELL_CSFLAGS) \
$(CSC_DEFINES)
@@ -329,6 +334,8 @@
$(srcdir)/Notebooks/*.cs \
$(srcdir)/Synchronization/*.cs \
\
+ $(PANELAPPLET_CSFILES) \
+ \
$(srcdir)/Gnome.Keyring/*.cs \
\
$(DBUS_CSFILES)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/panelapplet/BonoboUIVerb.cs new/tomboy-0.12.1/Tomboy/panelapplet/BonoboUIVerb.cs
--- old/tomboy-0.12.0/Tomboy/panelapplet/BonoboUIVerb.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/tomboy-0.12.1/Tomboy/panelapplet/BonoboUIVerb.cs 2008-10-07 00:44:02.000000000 +0200
@@ -0,0 +1,28 @@
+
+#pragma warning disable 169 // Unused private members
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace _Gnome
+{
+
+ public delegate void ContextMenuItemCallback ();
+
+ [StructLayout (LayoutKind.Sequential)]
+ public struct BonoboUIVerb
+ {
+ string verb;
+ ContextMenuItemCallback callback;
+ IntPtr user_data;
+ IntPtr dummy;
+
+ public BonoboUIVerb (string name, ContextMenuItemCallback cb)
+ {
+ verb = name;
+ callback = cb;
+ user_data = IntPtr.Zero;
+ dummy = IntPtr.Zero;
+ }
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/panelapplet/ChangeBackgroundHandler.cs new/tomboy-0.12.1/Tomboy/panelapplet/ChangeBackgroundHandler.cs
--- old/tomboy-0.12.0/Tomboy/panelapplet/ChangeBackgroundHandler.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/tomboy-0.12.1/Tomboy/panelapplet/ChangeBackgroundHandler.cs 2008-10-07 00:44:02.000000000 +0200
@@ -0,0 +1,30 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
+
+namespace _Gnome {
+
+ using System;
+
+ public delegate void ChangeBackgroundHandler(object o, ChangeBackgroundArgs args);
+
+ public class ChangeBackgroundArgs : GLib.SignalArgs {
+ public Gnome.PanelAppletBackgroundType Type{
+ get {
+ return (Gnome.PanelAppletBackgroundType) Args[0];
+ }
+ }
+
+ public Gdk.Color Color{
+ get {
+ return (Gdk.Color) Args[1];
+ }
+ }
+
+ public Gdk.Pixmap Pixmap{
+ get {
+ return (Gdk.Pixmap) Args[2];
+ }
+ }
+
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/panelapplet/ChangeSizeHandler.cs new/tomboy-0.12.1/Tomboy/panelapplet/ChangeSizeHandler.cs
--- old/tomboy-0.12.0/Tomboy/panelapplet/ChangeSizeHandler.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/tomboy-0.12.1/Tomboy/panelapplet/ChangeSizeHandler.cs 2008-10-07 00:44:02.000000000 +0200
@@ -0,0 +1,18 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
+
+namespace _Gnome {
+
+ using System;
+
+ public delegate void ChangeSizeHandler(object o, ChangeSizeArgs args);
+
+ public class ChangeSizeArgs : GLib.SignalArgs {
+ public uint Size{
+ get {
+ return (uint) Args[0];
+ }
+ }
+
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/panelapplet/GnomeSharp.PanelAppletFactoryCallbackNative.cs new/tomboy-0.12.1/Tomboy/panelapplet/GnomeSharp.PanelAppletFactoryCallbackNative.cs
--- old/tomboy-0.12.0/Tomboy/panelapplet/GnomeSharp.PanelAppletFactoryCallbackNative.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/tomboy-0.12.1/Tomboy/panelapplet/GnomeSharp.PanelAppletFactoryCallbackNative.cs 2008-10-07 00:44:02.000000000 +0200
@@ -0,0 +1,42 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
+
+namespace _GnomeSharp {
+
+ using System;
+
+ #region Autogenerated code
+ [GLib.CDeclCallback]
+ internal delegate bool PanelAppletFactoryCallbackNative(IntPtr applet, IntPtr iid, IntPtr user_data);
+
+ internal class PanelAppletFactoryCallbackWrapper {
+
+ public bool NativeCallback (IntPtr applet, IntPtr iid, IntPtr user_data)
+ {
+ _Gnome.PanelApplet _arg0 = GLib.Object.GetObject(applet) as _Gnome.PanelApplet;
+ string _arg1 = GLib.Marshaller.Utf8PtrToString (iid);
+ return (bool) (managed ( _arg0, _arg1));
+ }
+
+ internal PanelAppletFactoryCallbackNative NativeDelegate;
+ _Gnome.PanelAppletFactoryCallback managed;
+
+ public PanelAppletFactoryCallbackWrapper (_Gnome.PanelAppletFactoryCallback managed)
+ {
+ this.managed = managed;
+ if (managed != null)
+ NativeDelegate = new PanelAppletFactoryCallbackNative (NativeCallback);
+ }
+
+ public static _Gnome.PanelAppletFactoryCallback GetManagedDelegate (PanelAppletFactoryCallbackNative native)
+ {
+ if (native == null)
+ return null;
+ PanelAppletFactoryCallbackWrapper wrapper = (PanelAppletFactoryCallbackWrapper) native.Target;
+ if (wrapper == null)
+ return null;
+ return wrapper.managed;
+ }
+ }
+ #endregion
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/panelapplet/MoveFocusOutOfAppletHandler.cs new/tomboy-0.12.1/Tomboy/panelapplet/MoveFocusOutOfAppletHandler.cs
--- old/tomboy-0.12.0/Tomboy/panelapplet/MoveFocusOutOfAppletHandler.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/tomboy-0.12.1/Tomboy/panelapplet/MoveFocusOutOfAppletHandler.cs 2008-10-07 00:44:02.000000000 +0200
@@ -0,0 +1,18 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
+
+namespace _Gnome {
+
+ using System;
+
+ public delegate void MoveFocusOutOfAppletHandler(object o, MoveFocusOutOfAppletArgs args);
+
+ public class MoveFocusOutOfAppletArgs : GLib.SignalArgs {
+ public Gtk.DirectionType Direction{
+ get {
+ return (Gtk.DirectionType) Args[0];
+ }
+ }
+
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/panelapplet/ObjectManager.cs new/tomboy-0.12.1/Tomboy/panelapplet/ObjectManager.cs
--- old/tomboy-0.12.0/Tomboy/panelapplet/ObjectManager.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/tomboy-0.12.1/Tomboy/panelapplet/ObjectManager.cs 2008-10-07 00:44:02.000000000 +0200
@@ -0,0 +1,19 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
+
+namespace _GtkSharp.GnomeSharp {
+
+ public class ObjectManager {
+
+ static bool initialized = false;
+ // Call this method from the appropriate module init function.
+ public static void Initialize ()
+ {
+ if (initialized)
+ return;
+
+ initialized = true;
+ GLib.GType.Register (_Gnome.PanelApplet.GType, typeof (_Gnome.PanelApplet));
+ }
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/panelapplet/PanelAppletBackgroundType.cs new/tomboy-0.12.1/Tomboy/panelapplet/PanelAppletBackgroundType.cs
--- old/tomboy-0.12.0/Tomboy/panelapplet/PanelAppletBackgroundType.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/tomboy-0.12.1/Tomboy/panelapplet/PanelAppletBackgroundType.cs 2008-10-07 00:44:02.000000000 +0200
@@ -0,0 +1,17 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
+
+namespace _Gnome {
+
+ using System;
+ using System.Runtime.InteropServices;
+
+ #region Autogenerated code
+ public enum PanelAppletBackgroundType {
+
+ NoBackground,
+ ColorBackground,
+ PixmapBackground,
+ }
+ #endregion
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/panelapplet/PanelApplet.cs new/tomboy-0.12.1/Tomboy/panelapplet/PanelApplet.cs
--- old/tomboy-0.12.0/Tomboy/panelapplet/PanelApplet.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/tomboy-0.12.1/Tomboy/panelapplet/PanelApplet.cs 2008-10-07 00:44:02.000000000 +0200
@@ -0,0 +1,470 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
+
+#pragma warning disable 169 // Unused private members
+
+namespace _Gnome {
+
+ using System;
+ using System.Collections;
+ using System.Runtime.InteropServices;
+
+ #region Autogenerated code
+ public abstract class PanelApplet : Gtk.EventBox {
+
+ ~PanelApplet()
+ {
+ Dispose();
+ }
+
+ [Obsolete]
+protected PanelApplet(GLib.GType gtype) : base(gtype) {}
+public PanelApplet(IntPtr raw) : base(raw) {}
+
+ [DllImport("panel-applet-2")]
+ static extern IntPtr panel_applet_new();
+
+public PanelApplet () : base (IntPtr.Zero)
+ {
+ if (GetType () != typeof (PanelApplet)) {
+ CreateNativeObject (new string [0], new GLib.Value[0]);
+ return;
+ }
+ Raw = panel_applet_new();
+ }
+
+ [GLib.CDeclCallback]
+ delegate void ChangeBackgroundSignalDelegate (IntPtr arg0, int arg1, ref Gdk.Color arg2, IntPtr arg3, IntPtr gch);
+
+ static void ChangeBackgroundSignalCallback (IntPtr arg0, int arg1, ref Gdk.Color arg2, IntPtr arg3, IntPtr gch)
+ {
+ GLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal;
+ if (sig == null)
+ throw new Exception("Unknown signal GC handle received " + gch);
+
+ _Gnome.ChangeBackgroundArgs args = new _Gnome.ChangeBackgroundArgs ();
+ args.Args = new object[3];
+ args.Args[0] = (_Gnome.PanelAppletBackgroundType) arg1;
+ args.Args[1] = arg2;
+ args.Args[2] = GLib.Object.GetObject(arg3) as Gdk.Pixmap;
+ _Gnome.ChangeBackgroundHandler handler = (_Gnome.ChangeBackgroundHandler) sig.Handler;
+ handler (GLib.Object.GetObject (arg0), args);
+
+ }
+
+ [GLib.CDeclCallback]
+ delegate void ChangeBackgroundVMDelegate (IntPtr applet, int type, ref Gdk.Color color, IntPtr pixmap);
+
+ static ChangeBackgroundVMDelegate ChangeBackgroundVMCallback;
+
+ static void changebackground_cb (IntPtr applet, int type, ref Gdk.Color color, IntPtr pixmap)
+ {
+ PanelApplet applet_managed = GLib.Object.GetObject (applet, false) as PanelApplet;
+ switch ((PanelAppletBackgroundType)type) {
+ case PanelAppletBackgroundType.ColorBackground:
+ applet_managed.OnChangeBackground ((PanelAppletBackgroundType)type, color, null);
+ break;
+ case PanelAppletBackgroundType.PixmapBackground:
+ applet_managed.OnChangeBackground ((PanelAppletBackgroundType)type, Gdk.Color.Zero, (Gdk.Pixmap) GLib.Object.GetObject(pixmap));
+ break;
+ default:
+ applet_managed.OnChangeBackground ((PanelAppletBackgroundType)type, Gdk.Color.Zero, null);
+ break;
+ }
+ }
+
+ private static void OverrideChangeBackground (GLib.GType gtype)
+ {
+ if (ChangeBackgroundVMCallback == null)
+ ChangeBackgroundVMCallback = new ChangeBackgroundVMDelegate (changebackground_cb);
+ OverrideVirtualMethod (gtype, "change_background", ChangeBackgroundVMCallback);
+ }
+
+ [GLib.DefaultSignalHandler(Type=typeof(_Gnome.PanelApplet), ConnectionMethod="OverrideChangeBackground")]
+ protected virtual void OnChangeBackground (_Gnome.PanelAppletBackgroundType type, Gdk.Color color, Gdk.Pixmap pixmap)
+ {
+ GLib.Value ret = GLib.Value.Empty;
+ GLib.ValueArray inst_and_params = new GLib.ValueArray (4);
+ GLib.Value[] vals = new GLib.Value [4];
+ vals [0] = new GLib.Value (this);
+ inst_and_params.Append (vals [0]);
+ vals [1] = new GLib.Value (type);
+ inst_and_params.Append (vals [1]);
+ vals [2] = new GLib.Value (color);
+ inst_and_params.Append (vals [2]);
+ vals [3] = new GLib.Value (pixmap);
+ inst_and_params.Append (vals [3]);
+ g_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);
+ foreach (GLib.Value v in vals)
+ v.Dispose ();
+ }
+
+ [GLib.Signal("change_background")]
+ public event _Gnome.ChangeBackgroundHandler ChangeBackground {
+ add {
+ GLib.Signal sig = GLib.Signal.Lookup (this, "change_background", new ChangeBackgroundSignalDelegate(ChangeBackgroundSignalCallback));
+ sig.AddDelegate (value);
+ }
+ remove {
+ GLib.Signal sig = GLib.Signal.Lookup (this, "change_background", new ChangeBackgroundSignalDelegate(ChangeBackgroundSignalCallback));
+ sig.RemoveDelegate (value);
+ }
+ }
+
+ [GLib.CDeclCallback]
+ delegate void MoveFocusOutOfAppletSignalDelegate (IntPtr arg0, int arg1, IntPtr gch);
+
+ static void MoveFocusOutOfAppletSignalCallback (IntPtr arg0, int arg1, IntPtr gch)
+ {
+ GLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal;
+ if (sig == null)
+ throw new Exception("Unknown signal GC handle received " + gch);
+
+ _Gnome.MoveFocusOutOfAppletArgs args = new _Gnome.MoveFocusOutOfAppletArgs ();
+ args.Args = new object[1];
+ args.Args[0] = (Gtk.DirectionType) arg1;
+ _Gnome.MoveFocusOutOfAppletHandler handler = (_Gnome.MoveFocusOutOfAppletHandler) sig.Handler;
+ handler (GLib.Object.GetObject (arg0), args);
+
+ }
+
+ [GLib.CDeclCallback]
+ delegate void MoveFocusOutOfAppletVMDelegate (IntPtr frame, int direction);
+
+ static MoveFocusOutOfAppletVMDelegate MoveFocusOutOfAppletVMCallback;
+
+ static void movefocusoutofapplet_cb (IntPtr frame, int direction)
+ {
+ PanelApplet frame_managed = GLib.Object.GetObject (frame, false) as PanelApplet;
+ frame_managed.OnMoveFocusOutOfApplet ((Gtk.DirectionType) direction);
+ }
+
+ private static void OverrideMoveFocusOutOfApplet (GLib.GType gtype)
+ {
+ if (MoveFocusOutOfAppletVMCallback == null)
+ MoveFocusOutOfAppletVMCallback = new MoveFocusOutOfAppletVMDelegate (movefocusoutofapplet_cb);
+ OverrideVirtualMethod (gtype, "move_focus_out_of_applet", MoveFocusOutOfAppletVMCallback);
+ }
+
+ [GLib.DefaultSignalHandler(Type=typeof(_Gnome.PanelApplet), ConnectionMethod="OverrideMoveFocusOutOfApplet")]
+ protected virtual void OnMoveFocusOutOfApplet (Gtk.DirectionType direction)
+ {
+ GLib.Value ret = GLib.Value.Empty;
+ GLib.ValueArray inst_and_params = new GLib.ValueArray (2);
+ GLib.Value[] vals = new GLib.Value [2];
+ vals [0] = new GLib.Value (this);
+ inst_and_params.Append (vals [0]);
+ vals [1] = new GLib.Value (direction);
+ inst_and_params.Append (vals [1]);
+ g_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);
+ foreach (GLib.Value v in vals)
+ v.Dispose ();
+ }
+
+ [GLib.Signal("move_focus_out_of_applet")]
+ public event _Gnome.MoveFocusOutOfAppletHandler MoveFocusOutOfApplet {
+ add {
+ GLib.Signal sig = GLib.Signal.Lookup (this, "move_focus_out_of_applet", new MoveFocusOutOfAppletSignalDelegate(MoveFocusOutOfAppletSignalCallback));
+ sig.AddDelegate (value);
+ }
+ remove {
+ GLib.Signal sig = GLib.Signal.Lookup (this, "move_focus_out_of_applet", new MoveFocusOutOfAppletSignalDelegate(MoveFocusOutOfAppletSignalCallback));
+ sig.RemoveDelegate (value);
+ }
+ }
+
+ [GLib.CDeclCallback]
+ delegate void ChangeSizeSignalDelegate (IntPtr arg0, uint arg1, IntPtr gch);
+
+ static void ChangeSizeSignalCallback (IntPtr arg0, uint arg1, IntPtr gch)
+ {
+ GLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal;
+ if (sig == null)
+ throw new Exception("Unknown signal GC handle received " + gch);
+
+ _Gnome.ChangeSizeArgs args = new _Gnome.ChangeSizeArgs ();
+ args.Args = new object[1];
+ args.Args[0] = arg1;
+ _Gnome.ChangeSizeHandler handler = (_Gnome.ChangeSizeHandler) sig.Handler;
+ handler (GLib.Object.GetObject (arg0), args);
+
+ }
+
+ [GLib.CDeclCallback]
+ delegate void ChangeSizeVMDelegate (IntPtr applet, uint size);
+
+ static ChangeSizeVMDelegate ChangeSizeVMCallback;
+
+ static void changesize_cb (IntPtr applet, uint size)
+ {
+ PanelApplet applet_managed = GLib.Object.GetObject (applet, false) as PanelApplet;
+ applet_managed.OnChangeSize (size);
+ }
+
+ private static void OverrideChangeSize (GLib.GType gtype)
+ {
+ if (ChangeSizeVMCallback == null)
+ ChangeSizeVMCallback = new ChangeSizeVMDelegate (changesize_cb);
+ OverrideVirtualMethod (gtype, "change_size", ChangeSizeVMCallback);
+ }
+
+ [GLib.DefaultSignalHandler(Type=typeof(_Gnome.PanelApplet), ConnectionMethod="OverrideChangeSize")]
+ protected virtual void OnChangeSize (uint size)
+ {
+ GLib.Value ret = GLib.Value.Empty;
+ GLib.ValueArray inst_and_params = new GLib.ValueArray (2);
+ GLib.Value[] vals = new GLib.Value [2];
+ vals [0] = new GLib.Value (this);
+ inst_and_params.Append (vals [0]);
+ vals [1] = new GLib.Value (size);
+ inst_and_params.Append (vals [1]);
+ g_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);
+ foreach (GLib.Value v in vals)
+ v.Dispose ();
+ }
+
+ [GLib.Signal("change_size")]
+ public event _Gnome.ChangeSizeHandler ChangeSize {
+ add {
+ GLib.Signal sig = GLib.Signal.Lookup (this, "change_size", new ChangeSizeSignalDelegate(ChangeSizeSignalCallback));
+ sig.AddDelegate (value);
+ }
+ remove {
+ GLib.Signal sig = GLib.Signal.Lookup (this, "change_size", new ChangeSizeSignalDelegate(ChangeSizeSignalCallback));
+ sig.RemoveDelegate (value);
+ }
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern void panel_applet_set_size_hints(IntPtr raw, out int size_hints, int n_elements, int base_size);
+
+ public int SetSizeHints(int n_elements, int base_size) {
+ int size_hints;
+ panel_applet_set_size_hints(Handle, out size_hints, n_elements, base_size);
+ return size_hints;
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern IntPtr panel_applet_get_type();
+
+ public static new GLib.GType GType {
+ get {
+ IntPtr raw_ret = panel_applet_get_type();
+ GLib.GType ret = new GLib.GType(raw_ret);
+ return ret;
+ }
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern unsafe int panel_applet_gconf_get_int(IntPtr raw, IntPtr key, out IntPtr opt_error);
+
+ public unsafe int GconfGetInt(string key) {
+ IntPtr key_as_native = GLib.Marshaller.StringToPtrGStrdup (key);
+ IntPtr error = IntPtr.Zero;
+ int raw_ret = panel_applet_gconf_get_int(Handle, key_as_native, out error);
+ int ret = raw_ret;
+ GLib.Marshaller.Free (key_as_native);
+ if (error != IntPtr.Zero) throw new GLib.GException (error);
+ return ret;
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern unsafe void panel_applet_gconf_set_float(IntPtr raw, IntPtr key, double the_float, out IntPtr opt_error);
+
+ public unsafe void GconfSetFloat(string key, double the_float) {
+ IntPtr key_as_native = GLib.Marshaller.StringToPtrGStrdup (key);
+ IntPtr error = IntPtr.Zero;
+ panel_applet_gconf_set_float(Handle, key_as_native, the_float, out error);
+ GLib.Marshaller.Free (key_as_native);
+ if (error != IntPtr.Zero) throw new GLib.GException (error);
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern bool panel_applet_get_locked_down(IntPtr raw);
+
+ public bool LockedDown {
+ get {
+ bool raw_ret = panel_applet_get_locked_down(Handle);
+ bool ret = raw_ret;
+ return ret;
+ }
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern IntPtr panel_applet_get_preferences_key(IntPtr raw);
+
+ public string PreferencesKey {
+ get {
+ IntPtr raw_ret = panel_applet_get_preferences_key(Handle);
+ string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
+ return ret;
+ }
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern int panel_applet_get_background(IntPtr raw, ref Gdk.Color color, IntPtr pixmap);
+
+ public _Gnome.PanelAppletBackgroundType GetBackground(Gdk.Color color, Gdk.Pixmap pixmap) {
+ int raw_ret = panel_applet_get_background(Handle, ref color, pixmap == null ? IntPtr.Zero : pixmap.Handle);
+ _Gnome.PanelAppletBackgroundType ret = (_Gnome.PanelAppletBackgroundType) raw_ret;
+ return ret;
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern unsafe IntPtr panel_applet_gconf_get_string(IntPtr raw, IntPtr key, out IntPtr opt_error);
+
+ public unsafe string GconfGetString(string key) {
+ IntPtr key_as_native = GLib.Marshaller.StringToPtrGStrdup (key);
+ IntPtr error = IntPtr.Zero;
+ IntPtr raw_ret = panel_applet_gconf_get_string(Handle, key_as_native, out error);
+ string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
+ GLib.Marshaller.Free (key_as_native);
+ if (error != IntPtr.Zero) throw new GLib.GException (error);
+ return ret;
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern unsafe void panel_applet_gconf_set_int(IntPtr raw, IntPtr key, int the_int, out IntPtr opt_error);
+
+ public unsafe void GconfSetInt(string key, int the_int) {
+ IntPtr key_as_native = GLib.Marshaller.StringToPtrGStrdup (key);
+ IntPtr error = IntPtr.Zero;
+ panel_applet_gconf_set_int(Handle, key_as_native, the_int, out error);
+ GLib.Marshaller.Free (key_as_native);
+ if (error != IntPtr.Zero) throw new GLib.GException (error);
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern unsafe void panel_applet_add_preferences(IntPtr raw, IntPtr schema_dir, out IntPtr opt_error);
+
+ public unsafe void AddPreferences(string schema_dir) {
+ IntPtr schema_dir_as_native = GLib.Marshaller.StringToPtrGStrdup (schema_dir);
+ IntPtr error = IntPtr.Zero;
+ panel_applet_add_preferences(Handle, schema_dir_as_native, out error);
+ GLib.Marshaller.Free (schema_dir_as_native);
+ if (error != IntPtr.Zero) throw new GLib.GException (error);
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern uint panel_applet_get_size(IntPtr raw);
+
+ public uint Size {
+ get {
+ uint raw_ret = panel_applet_get_size(Handle);
+ uint ret = raw_ret;
+ return ret;
+ }
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern IntPtr panel_applet_gconf_get_full_key(IntPtr raw, IntPtr key);
+
+ public string GconfGetFullKey(string key) {
+ IntPtr key_as_native = GLib.Marshaller.StringToPtrGStrdup (key);
+ IntPtr raw_ret = panel_applet_gconf_get_full_key(Handle, key_as_native);
+ string ret = GLib.Marshaller.PtrToStringGFree(raw_ret);
+ GLib.Marshaller.Free (key_as_native);
+ return ret;
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern unsafe void panel_applet_gconf_set_string(IntPtr raw, IntPtr key, IntPtr the_string, out IntPtr opt_error);
+
+ public unsafe void GconfSetString(string key, string the_string) {
+ IntPtr key_as_native = GLib.Marshaller.StringToPtrGStrdup (key);
+ IntPtr the_string_as_native = GLib.Marshaller.StringToPtrGStrdup (the_string);
+ IntPtr error = IntPtr.Zero;
+ panel_applet_gconf_set_string(Handle, key_as_native, the_string_as_native, out error);
+ GLib.Marshaller.Free (key_as_native);
+ GLib.Marshaller.Free (the_string_as_native);
+ if (error != IntPtr.Zero) throw new GLib.GException (error);
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern int panel_applet_get_flags(IntPtr raw);
+
+ [DllImport("panel-applet-2")]
+ static extern void panel_applet_set_flags(IntPtr raw, int flags);
+
+ public new _Gnome.PanelAppletFlags Flags {
+ get {
+ int raw_ret = panel_applet_get_flags(Handle);
+ _Gnome.PanelAppletFlags ret = (_Gnome.PanelAppletFlags) raw_ret;
+ return ret;
+ }
+ set {
+ panel_applet_set_flags(Handle, (int) value);
+ }
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern unsafe bool panel_applet_gconf_get_bool(IntPtr raw, IntPtr key, out IntPtr opt_error);
+
+ public unsafe bool GconfGetBool(string key) {
+ IntPtr key_as_native = GLib.Marshaller.StringToPtrGStrdup (key);
+ IntPtr error = IntPtr.Zero;
+ bool raw_ret = panel_applet_gconf_get_bool(Handle, key_as_native, out error);
+ bool ret = raw_ret;
+ GLib.Marshaller.Free (key_as_native);
+ if (error != IntPtr.Zero) throw new GLib.GException (error);
+ return ret;
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern unsafe double panel_applet_gconf_get_float(IntPtr raw, IntPtr key, out IntPtr opt_error);
+
+ public unsafe double GconfGetFloat(string key) {
+ IntPtr key_as_native = GLib.Marshaller.StringToPtrGStrdup (key);
+ IntPtr error = IntPtr.Zero;
+ double raw_ret = panel_applet_gconf_get_float(Handle, key_as_native, out error);
+ double ret = raw_ret;
+ GLib.Marshaller.Free (key_as_native);
+ if (error != IntPtr.Zero) throw new GLib.GException (error);
+ return ret;
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern unsafe void panel_applet_gconf_set_bool(IntPtr raw, IntPtr key, bool the_bool, out IntPtr opt_error);
+
+ public unsafe void GconfSetBool(string key, bool the_bool) {
+ IntPtr key_as_native = GLib.Marshaller.StringToPtrGStrdup (key);
+ IntPtr error = IntPtr.Zero;
+ panel_applet_gconf_set_bool(Handle, key_as_native, the_bool, out error);
+ GLib.Marshaller.Free (key_as_native);
+ if (error != IntPtr.Zero) throw new GLib.GException (error);
+ }
+
+
+ static PanelApplet ()
+ {
+ _GtkSharp.GnomeSharp.ObjectManager.Initialize ();
+ }
+ #endregion
+ #region Customized extensions
+ #line 1 "PanelApplet.custom"
+ [DllImport ("panel-applet-2")]
+ static extern void panel_applet_setup_menu (IntPtr handle, IntPtr xml, BonoboUIVerb[] items, IntPtr user_data);
+
+ public void SetupMenu (string xml, BonoboUIVerb[] items)
+ {
+ BonoboUIVerb[] nulled_items = new BonoboUIVerb[items.Length + 1];
+ Array.Copy (items, nulled_items, items.Length);
+ nulled_items[items.Length] = new BonoboUIVerb (null, null);
+ IntPtr native = GLib.Marshaller.StringToPtrGStrdup (xml);
+ panel_applet_setup_menu (Handle, native, nulled_items, IntPtr.Zero);
+ GLib.Marshaller.Free (native);
+ }
+
+ public abstract void Creation ();
+
+ public abstract string IID {
+ get;
+ }
+
+ public abstract string FactoryIID {
+ get;
+ }
+
+ #endregion
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/panelapplet/PanelAppletFactoryCallback.cs new/tomboy-0.12.1/Tomboy/panelapplet/PanelAppletFactoryCallback.cs
--- old/tomboy-0.12.0/Tomboy/panelapplet/PanelAppletFactoryCallback.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/tomboy-0.12.1/Tomboy/panelapplet/PanelAppletFactoryCallback.cs 2008-10-07 00:44:02.000000000 +0200
@@ -0,0 +1,10 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
+
+namespace _Gnome {
+
+ using System;
+
+ public delegate bool PanelAppletFactoryCallback(_Gnome.PanelApplet applet, string iid);
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/panelapplet/PanelAppletFactory.cs new/tomboy-0.12.1/Tomboy/panelapplet/PanelAppletFactory.cs
--- old/tomboy-0.12.0/Tomboy/panelapplet/PanelAppletFactory.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/tomboy-0.12.1/Tomboy/panelapplet/PanelAppletFactory.cs 2008-10-07 00:44:02.000000000 +0200
@@ -0,0 +1,60 @@
+// Gnome.PanelAppletFactory.cs - PanelAppletFactory class impl
+//
+// Copyright (c) 2004-2005 Novell, Inc.
+//
+// This code is inserted after the automatically generated code.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the Lesser GNU General
+// Public License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+namespace _Gnome
+{
+ public class PanelAppletFactory
+ {
+ private PanelAppletFactory () {}
+
+ private static string _IID;
+ private static string _factoryIID;
+ private static _GnomeSharp.PanelAppletFactoryCallbackWrapper cb_wrapper;
+
+ public static void Register (Type applet_type)
+ {
+ PanelApplet applet = (PanelApplet) Activator.CreateInstance (applet_type, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.CreateInstance, null, new object[] {IntPtr.Zero}, null);
+
+ cb_wrapper = new _GnomeSharp.PanelAppletFactoryCallbackWrapper (new PanelAppletFactoryCallback (Creation));
+ _IID = applet.IID;
+ _factoryIID = applet.FactoryIID;
+ IntPtr native_iid = GLib.Marshaller.StringToPtrGStrdup (_factoryIID);
+ panel_applet_factory_main (native_iid, ((GLib.GType) applet_type).Val, cb_wrapper.NativeDelegate, IntPtr.Zero);
+ GLib.Marshaller.Free (native_iid);
+ }
+
+ private static bool Creation (PanelApplet applet, string iid)
+ {
+ if (_IID != iid)
+ return false;
+ applet.Creation ();
+ return true;
+ }
+
+ [DllImport("panel-applet-2")]
+ static extern int panel_applet_factory_main(IntPtr iid, IntPtr applet_type, _GnomeSharp.PanelAppletFactoryCallbackNative cb, IntPtr data);
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/panelapplet/PanelAppletFlags.cs new/tomboy-0.12.1/Tomboy/panelapplet/PanelAppletFlags.cs
--- old/tomboy-0.12.0/Tomboy/panelapplet/PanelAppletFlags.cs 1970-01-01 01:00:00.000000000 +0100
+++ new/tomboy-0.12.1/Tomboy/panelapplet/PanelAppletFlags.cs 2008-10-07 00:44:02.000000000 +0200
@@ -0,0 +1,19 @@
+// This file was generated by the Gtk# code generator.
+// Any changes made will be lost if regenerated.
+
+namespace _Gnome {
+
+ using System;
+ using System.Runtime.InteropServices;
+
+ #region Autogenerated code
+ [Flags]
+ public enum PanelAppletFlags {
+
+ FlagsNone,
+ ExpandMajor = 1 << 0,
+ ExpandMinor = 1 << 1,
+ HasHandle = 1 << 2,
+ }
+ #endregion
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/Tomboy/Tomboy.cs new/tomboy-0.12.1/Tomboy/Tomboy.cs
--- old/tomboy-0.12.0/Tomboy/Tomboy.cs 2008-09-22 14:11:19.000000000 +0200
+++ new/tomboy-0.12.1/Tomboy/Tomboy.cs 2008-10-07 01:03:40.000000000 +0200
@@ -4,6 +4,12 @@
using System.Xml;
using Mono.Unix;
+#if FIXED_PANELAPPLET
+using Gnome;
+#else
+using _Gnome;
+#endif
+
using Tomboy.Sync;
namespace Tomboy
@@ -105,7 +111,7 @@
static void RegisterPanelAppletFactory ()
{
// This will block if there is no existing instance running
- Gnome.PanelAppletFactory.Register (typeof (TomboyApplet));
+ PanelAppletFactory.Register (typeof (TomboyApplet));
}
static void StartTrayIcon ()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/tomboy-0.12.0/tomboy.spec new/tomboy-0.12.1/tomboy.spec
--- old/tomboy-0.12.0/tomboy.spec 2008-09-22 14:11:58.000000000 +0200
+++ new/tomboy-0.12.1/tomboy.spec 2008-10-07 08:51:18.000000000 +0200
@@ -1,5 +1,5 @@
Name: tomboy
-Version: 0.12.0
+Version: 0.12.1
Release: 1
Epoch: 0
Summary: Tomboy is a desktop note-taking application for Linux and Unix.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org