[f-spot: 1/8] a lot of changes to allow building on gtk#2.12, gio# (from gitorious) and gtk#beans (from gitorious)
- From: Stephane Delcroix <sdelcroix src gnome org>
- To: svn-commits-list gnome org
- Subject: [f-spot: 1/8] a lot of changes to allow building on gtk#2.12, gio# (from gitorious) and gtk#beans (from gitorious)
- Date: Tue, 26 May 2009 07:13:24 -0400 (EDT)
commit adf28810ef2fd6ff6788014ff890802c23a10680
Author: Stephane Delcroix <stephane delcroix org>
Date: Mon May 25 17:13:29 2009 +0200
a lot of changes to allow building on gtk#2.12, gio# (from gitorious) and gtk#beans (from gitorious)
---
autogen.sh | 26 +-
configure.ac | 359 ++++++++++++++++++++++
extensions/Exporters/PicasaWebExport/Makefile.am | 1 +
src/Bling/Animation.cs | 5 +-
src/Imaging/ImageFile.cs | 7 +-
src/Makefile.am | 2 +
src/UI.Dialog/BuilderDialog.cs | 2 +-
src/UI.Dialog/DateRangeDialog.cs | 10 +-
src/Widgets/DateEdit.cs | 6 +-
src/Widgets/OpenWithMenu.cs | 2 +-
10 files changed, 391 insertions(+), 29 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index c5af53f..3da2d0d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -36,7 +36,7 @@ ACLOCAL=aclocal-1.9
DIE=1
}
-(grep "^AM_PROG_LIBTOOL" configure.in >/dev/null) && {
+(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
(libtool --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`libtool' installed to compile $PROJECT."
@@ -46,8 +46,8 @@ ACLOCAL=aclocal-1.9
}
}
-grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null && {
- grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
+grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null && {
+ grep "sed.*POTFILES" $srcdir/configure.ac >/dev/null || \
(glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`glib-devel' (or glib2-devel) installed to compile $PROJECT."
@@ -78,7 +78,7 @@ case $CC in
*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
esac
-for coin in `find $srcdir -name configure.in -print`
+for coin in `find $srcdir -name configure.ac -print`
do
dr=`dirname $coin`
if test -f $dr/NO-AUTO-GEN; then
@@ -95,9 +95,9 @@ do
## echo "**Warning**: No such directory \`$k'. Ignored."
fi
done
- if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
- if grep "sed.*POTFILES" configure.in >/dev/null; then
- : do nothing -- we still have an old unmodified configure.in
+ if grep "^AM_GNU_GETTEXT" configure.ac >/dev/null; then
+ if grep "sed.*POTFILES" configure.ac >/dev/null; then
+ : do nothing -- we still have an old unmodified configure.ac
else
echo "Creating $dr/aclocal.m4 ..."
test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
@@ -107,7 +107,7 @@ do
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi
fi
- if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then
+ if grep "^AM_GNOME_GETTEXT" configure.ac >/dev/null; then
echo "Creating $dr/aclocal.m4 ..."
test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
echo "Running gettextize... Ignore non-fatal messages."
@@ -115,7 +115,7 @@ do
echo "Making $dr/aclocal.m4 writable ..."
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi
- if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
+ if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
echo "Creating $dr/aclocal.m4 ..."
test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
echo "Running gettextize... Ignore non-fatal messages."
@@ -123,18 +123,18 @@ do
echo "Making $dr/aclocal.m4 writable ..."
test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
fi
- if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null ||
- grep "^IT_PROG_INTLTOOL" configure.in >/dev/null; then
+ if grep "^AC_PROG_INTLTOOL" configure.ac >/dev/null ||
+ grep "^IT_PROG_INTLTOOL" configure.ac >/dev/null; then
echo "Running intltoolize..."
intltoolize --copy --force --automake
fi
- if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+ if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
echo "Running libtoolize..."
libtoolize --force --copy
fi
echo "Running $ACLOCAL $aclocalinclude ..."
$ACLOCAL $aclocalinclude
- if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+ if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
echo "Running autoheader..."
autoheader
fi
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..a44b900
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,359 @@
+AC_INIT(F-Spot, 0.5.0.3)
+AC_CONFIG_SRCDIR(src/main.cs)
+
+AM_CONFIG_HEADER(config.h)
+
+AM_INIT_AUTOMAKE([tar-ustar])
+
+AM_MAINTAINER_MODE
+
+IT_PROG_INTLTOOL([0.35.0])
+
+AC_PROG_CC
+AC_ISC_POSIX
+AC_HEADER_STDC
+AM_PROG_LIBTOOL
+
+GNOME_COMPILE_WARNINGS
+AM_PATH_GLIB_2_0
+
+dnl --- Check for mono and gmcs
+
+AC_PATH_PROG(MONO, mono)
+AC_PATH_PROG(MCS, gmcs)
+
+CS="C#"
+if test ! -x "$MCS"; then
+ AC_MSG_ERROR([No $CS compiler found])
+fi
+
+dnl -- Initialize docs
+
+GNOME_DOC_INIT
+
+dnl -- Check for mono pc file
+
+AC_MSG_CHECKING([for mono.pc])
+if test -z `$PKG_CONFIG --variable=prefix mono`; then
+ AC_MSG_ERROR([missing the mono.pc file, usually found in the mono-devel package])
+else
+ AC_MSG_RESULT([found])
+fi
+
+dnl -- check for various mono DLLs that we need.
+
+needed_dlls="Mono.Data.SqliteClient Mono.Posix System.Runtime.Remoting System.Web System.Web.Services Mono.Cairo"
+for i in $needed_dlls; do
+ AC_MSG_CHECKING([for $i.dll])
+ if test ! \( -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll -o -e `$PKG_CONFIG --variable=prefix mono`/lib64/mono/2.0//$i.dll \); then
+ AC_MSG_ERROR([missing required mono 2.0 DLL: $i.dll])
+ else
+ AC_MSG_RESULT([found])
+ fi
+done
+
+dnl --- Required libraries
+
+LIBGNOME_REQUIRED=2.2
+LIBGNOMEUI_REQUIRED=2.2
+LIBEXIF_REQUIRED_MIN=0.5.7
+LIBEXIF_REQUIRED_MAX=0.7.0
+GIO_REQUIRED=2.16.0
+GIOSHARP_REQUIRED=2.13.92
+GTKSHARPBEANS_REQUIRED=2.13.92
+GTKSHARP_REQUIRED=2.12.0
+MONO_REQUIRED=2.0.0
+GTK_REQUIRED=2.14
+BEAGLE_REQUIRED=0.3.0
+NDESK_DBUS_REQUIRED=0.4.2
+NDESK_DBUS_GLIB_REQUIRED=0.3.0
+MONO_CAIRO_REQUIRED=1.2.4
+dnl -- this check is
+LCMS_REQUIRED=1.12
+dnl -- LIBGPHOTO2_REQUIRED=2.1.4
+
+PKG_CHECK_MODULES(F, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libexif >= $LIBEXIF_REQUIRED_MIN libexif < $LIBEXIF_REQUIRED_MAX gtk-sharp-2.0 >= $GTKSHARP_REQUIRED glib-sharp-2.0 >= $GTKSHARP_REQUIRED gio-sharp-2.0 >= $GIOSHARP_REQUIRED glade-sharp-2.0 >= $GTKSHARP_REQUIRED gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED gtk+-2.0 >= $GTK_REQUIRED mono >= $MONO_REQUIRED mono-cairo >= $MONO_CAIRO_REQUIRED gtk-sharp-beans-2.0 >= $GTKSHARPBEANS_REQUIRED)
+AC_SUBST(F_CFLAGS)
+AC_SUBST(F_LIBS)
+
+PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED)
+AC_SUBST(GIO_CFLAGS)
+AC_SUBST(GIO_LIBS)
+
+CSC_DEFINES=""
+PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= 2.8)
+
+if pkg-config --atleast-version=1.2.5 mono-cairo; then
+ CSC_DEFINES="$CSC_DEFINES -d:CAIRO_1_2_5"
+fi
+
+dnl - Choose PreferenceBackend (default to gconf)
+AC_ARG_ENABLE([gconf],[AC_HELP_STRING([--disable-gconf], [build without gconf preference backend])],,)
+
+AM_CONDITIONAL(NOGCONF, test "x$enable_gconf" = "xno")
+
+if test "x$enable_gconf" = "xno"; then
+ CSC_DEFINES="$CSC_DEFINES -d:NOGCONF"
+else
+ PKG_CHECK_MODULES(GCONF_SHARP, gconf-sharp-2.0 >= $GTKSHARP_REQUIRED)
+ if pkg-config --atleast-version=2.18 gconf-sharp-2.0; then
+ CSC_DEFINES="$CSC_DEFINES -d:GCONF_SHARP_2_18"
+ fi
+ if pkg-config --atleast-version=2.20.2 gconf-sharp-2.0; then
+ CSC_DEFINES="$CSC_DEFINES -d:GCONF_SHARP_2_20_2"
+ fi
+fi
+
+
+PKG_CHECK_MODULES(BEAGLE, beagle-0.0 >= $BEAGLE_REQUIRED,
+[
+ dnl this is a work around to avoid linking against beagles Util.dll
+ BEAGLE_DIR=`$PKG_CONFIG --variable=dlldir beagle-0.0`
+ LINK_BEAGLE="-r:$BEAGLE_DIR/Beagle"
+ CSC_DEFINES="$CSC_DEFINES -d:ENABLE_BEAGLE"
+],
+[
+ AC_MSG_RESULT([beagle not found])
+])
+AC_SUBST(BEAGLE_DIR)
+AC_SUBST(LINK_BEAGLE)
+
+AC_SUBST(CSC_DEFINES)
+
+dnl -- dbus-sharp: link or bundle ?
+PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
+[
+ LINK_DBUS="-pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0"
+ DIR_DBUS=""
+ DIR_DBUS_GLIB=""
+ PATH_DBUS=""
+],
+[
+ LINK_DBUS='-r:$(top_builddir)/dbus-sharp/NDesk.DBus.dll -r:$(top_builddir)/dbus-sharp-glib/NDesk.DBus.GLib.dll'
+ DIR_DBUS="dbus-sharp"
+ DIR_DBUS_GLIB="dbus-sharp-glib"
+ PATH_DBUS='../dbus-sharp:../dbus-sharp-glib:'
+])
+AC_SUBST(DIR_DBUS)
+AC_SUBST(DIR_DBUS_GLIB)
+AC_SUBST(LINK_DBUS)
+AC_SUBST(PATH_DBUS)
+
+dnl -- nunit
+AC_ARG_ENABLE([nunit],[AC_HELP_STRING([--disable-unit], [build without unit tests])],,)
+AM_CONDITIONAL(DISABLE_NUNIT, test "x$enable_nunit" = "xno")
+
+if test "x$enable_nunit" = "xno"; then
+ NUNIT_DEFINES=''
+ NUNIT_PKG=''
+
+else
+NUNIT_DEFINES='-d:ENABLE_NUNIT'
+PKG_CHECK_MODULES(MONO_NUNIT, mono-nunit >= $MONO_REQUIRED,
+[
+ NUNIT_LIBS=$MONO_NUNIT_LIBS
+ NUNIT_PKG='-pkg:mono-nunit'
+],
+[
+ PKG_CHECK_MODULES(NUNIT22, nunit-2.2 >= $MONO_REQUIRED,
+ [
+ NUNIT_LIBS=$NUNIT22_LIBS
+ NUNIT_PKG='-pkg:nunit-2.2'
+ ],
+ [
+ PKG_CHECK_MODULES(NUNIT, nunit >= $MONO_REQUIRED,
+ [
+ NUNIT_LIBS=$NUNIT_LIBS
+ NUNIT_PKG='-pkg:nunit'
+ ],
+ [
+ NUNIT_DEFINES=''
+ NUNIT_PKG=''
+ ])
+ ])
+])
+fi
+
+AC_SUBST(NUNIT_PKG)
+AC_SUBST(NUNIT_DEFINES)
+
+
+dnl --- GConf
+
+AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+AM_GCONF_SOURCE_2
+
+
+dnl --- libjpeg
+
+AC_CHECK_LIB(jpeg, jpeg_start_decompress, [],
+ [AC_MSG_ERROR([libjpeg not found])], -lm)
+AC_CHECK_HEADER(jpeglib.h, , [AC_MSG_ERROR([libjpeg not found])])
+LIBJPEG='-ljpeg'
+
+dnl --- lcms
+
+PKG_CHECK_MODULES(LCMS, lcms >= $LCMS_REQUIRED, [],
+ [AC_CHECK_LIB(lcms, cmsCreateBCHSWabstractProfile, [],
+ [AC_MSG_ERROR([liblcms not found])], -lm)
+ AC_CHECK_HEADER(lcms.h, , [AC_MSG_ERROR([liblcms not found])])
+ LCMS_LIBS='-llcms'
+ LCMS_CFLAGS=''])
+
+
+dnl --- libgphoto2-sharp
+
+PKG_CHECK_MODULES(LIBGPHOTO2, libgphoto2 >= 2.1.4)
+
+dnl --- libexif version check
+
+LIBEXIF_API_CHANGE=0.6.0
+PKG_CHECK_MODULES(EXIF, libexif >= $LIBEXIF_API_CHANGE)
+AC_SUBST(EXIF_CFLAGS)
+AC_SUBST(EXIF_LIBS)
+
+
+PKG_CHECK_MODULES(LIBEXIF_VERSION_CHECK, libexif >= 0.6.12, EXIF_SOVERSION=12, EXIF_SOVERSION=10)
+AC_SUBST(EXIF_SOVERSION)
+
+dnl --- Set up paths
+
+AC_ARG_WITH(turtle, [ --with-turtle=DIR set path to source directory for turtle])
+AM_CONDITIONAL(WITH_TURTLE, test "x$with_turtle" != "xno")
+if test "x$with_turtle" != "xno"; then
+ TURTLEDIR=$with_turtle
+
+ AC_SUBST(TURTLEDIR)
+fi
+
+AC_ARG_WITH(gnome-screensaver,[ --with-gnome-screensaver=PREFIX set gnome gnome-screensaver prefix])
+
+if test "x$with_gnome_screensaver" != "x"; then
+ gnome_screensaver_prefix=$with_gnome_screensaver
+else
+ gnome_screensaver_prefix=$prefix
+fi
+
+PKG_CHECK_EXISTS(gnome-screensaver, have_gs_pkgconfig=yes, have_gs_pkgconfig=no)
+if test "$have_gs_pkgconfig" = "yes"; then
+ gs_pc_prefix=`$PKG_CONFIG --variable=prefix gnome-screensaver`
+ gs_pc_saverdir=`$PKG_CONFIG --variable=privlibexecdir gnome-screensaver`
+ gs_pc_themesdir=`$PKG_CONFIG --variable=themesdir gnome-screensaver`
+fi
+
+if test "$have_gs_pkgconfig" = "yes" && test "x$gs_pc_prefix" = "x$gnome_screensaver_prefix"; then
+ GNOME_SCREENSAVER_SAVERDIR=$gs_pc_saverdir
+elif test -d $gnome_screensaver_prefix/lib/gnome-screensaver; then
+ GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/lib/gnome-screensaver/gnome-screensaver
+else
+ GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/libexec/gnome-screensaver
+fi
+
+if test "$have_gs_pkgconfig" = "yes" && test "x$gs_pc_prefix" = "x$gnome_screensaver_prefix"; then
+ GNOME_SCREENSAVER_THEMESDIR=$gs_pc_themesdir
+else
+ GNOME_SCREENSAVER_THEMESDIR=$gnome_screensaver_prefix/share/applications/screensavers
+fi
+
+AC_SUBST(GNOME_SCREENSAVER_SAVERDIR)
+AC_SUBST(GNOME_SCREENSAVER_THEMESDIR)
+
+ICONS_DIRECTORY=${datadir}/${PACKAGE}-${VERSION}
+
+AC_SUBST(ICONS_DIRECTORY)
+
+dnl -- Intl
+
+GETTEXT_PACKAGE=f-spot
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
+AM_GLIB_GNU_GETTEXT
+
+dnl --- Prologue
+
+AC_SUBST(LIBJPEG)
+AC_SUBST(LCMS_LIBS)
+AC_SUBST(LCMS_CFLAGS)
+AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
+
+expanded_libdir=`( case $prefix in NONE) prefix=$ac_default_prefix ;; *) ;; esac
+ case $exec_prefix in NONE) exec_prefix=$prefix ;; *) ;; esac
+ eval echo $libdir )`
+AC_SUBST(expanded_libdir)
+
+AC_CONFIG_FILES([src/f-spot],[chmod +x src/f-spot])
+
+GNOME_ICON_THEME_PREFIX=`$PKG_CONFIG --variable=prefix gnome-icon-theme`
+AC_SUBST(GNOME_ICON_THEME_PREFIX)
+
+AC_OUTPUT(
+Makefile
+dbus-sharp/Makefile
+dbus-sharp-glib/Makefile
+dpap-sharp/Makefile
+dpap-sharp/lib/Makefile
+dpap-sharp/dpap-client/Makefile
+dpap-sharp/dpap-server/Makefile
+dpap-sharp/DPAPService/Makefile
+dpap-sharp/DPAPBrowser/Makefile
+docs/Makefile
+gnome-keyring-sharp/Makefile
+icons/Makefile
+libeog/Makefile
+libeog/cursors/Makefile
+libjpegtran/Makefile
+libfspot/Makefile
+libgphoto2-sharp/Makefile
+mono-addins/Makefile
+mono-addins/Mono.Addins/Makefile
+mono-addins/Mono.Addins.Gui/Makefile
+mono-addins/Mono.Addins.Setup/Makefile
+semweb/Makefile
+tools/Makefile
+po/Makefile.in
+src/Core/Defines.cs
+src/AssemblyInfo.cs
+src/f-spot.exe.config
+src/Cms.dll.config
+src/Makefile
+GKeyFile/Makefile
+glitz-sharp/Makefile
+glitz-sharp/src/Makefile
+Tao/Makefile
+Tao/Tao.OpenGl/Makefile
+Tao/Tao.OpenGl.Glu/Makefile
+Tao/Tao.GlPostProcess/Makefile
+Tao/Tao.OpenGl.ExtensionLoader/Makefile
+extensions/Makefile
+extensions/Exporters/Makefile
+extensions/Exporters/CDExport/Makefile
+extensions/Exporters/DefaultExporters/Makefile
+extensions/Exporters/FlickrExport/Makefile
+extensions/Exporters/FlickrExport/FlickrNet/Makefile
+extensions/Exporters/GalleryExport/Makefile
+extensions/Exporters/FacebookExport/Makefile
+extensions/Exporters/FolderExport/Makefile
+extensions/Exporters/SmugMugExport/SmugMugNet/Makefile
+extensions/Exporters/SmugMugExport/Makefile
+extensions/Exporters/TabbloExport/Makefile
+extensions/Exporters/TabbloExport/Tabblo/Makefile
+extensions/Exporters/PicasaWebExport/Makefile
+extensions/Exporters/PicasaWebExport/google-sharp/Makefile
+extensions/Exporters/ZipExport/Makefile
+extensions/Services/Makefile
+extensions/Services/BeagleService/Makefile
+extensions/Services/DBusService/Makefile
+extensions/Tools/Makefile
+extensions/Tools/RawPlusJpeg/Makefile
+extensions/Tools/ChangePhotoPath/Makefile
+extensions/Tools/HashJob/Makefile
+extensions/Tools/DevelopInUFraw/Makefile
+extensions/Tools/MergeDb/Makefile
+f-spot.pc
+f-spot.spec
+f-spot.desktop.in
+f-spot-view.desktop.in
+f-spot-import.desktop.in
+)
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index 53dfc21..25fa7f2 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -21,6 +21,7 @@ REFS = \
PKGS = \
-pkg:gnome-vfs-sharp-2.0 \
+ -pkg:gtk-sharp-beans-2.0 \
-pkg:gtk-sharp-2.0 \
-pkg:glade-sharp-2.0
diff --git a/src/Bling/Animation.cs b/src/Bling/Animation.cs
index 6cdab87..2aef972 100644
--- a/src/Bling/Animation.cs
+++ b/src/Bling/Animation.cs
@@ -11,6 +11,7 @@
using System;
using System.ComponentModel;
+using GLibBeans;
namespace FSpot.Bling
{
@@ -68,7 +69,7 @@ namespace FSpot.Bling
throw new InvalidOperationException ("Can't Resume () a non running animation.");
starttime = DateTimeOffset.Now - pausedafter;
state = AnimationState.Running;
- GLib.Timeout.Add (40, Handler, GLib.Priority.DefaultIdle);
+ Sources.SetPriority (GLib.Timeout.Add (40, Handler), GLib.Priority.DefaultIdle);
}
public void Start ()
@@ -77,7 +78,7 @@ namespace FSpot.Bling
throw new InvalidOperationException ("Can't Start () a running or paused animation.");
starttime = DateTimeOffset.Now;
state = AnimationState.Running;
- GLib.Timeout.Add (40, Handler, GLib.Priority.DefaultIdle);
+ Sources.SetPriority (GLib.Timeout.Add (40, Handler), GLib.Priority.DefaultIdle);
}
public void Stop ()
diff --git a/src/Imaging/ImageFile.cs b/src/Imaging/ImageFile.cs
index 64e7a8b..d9095ef 100644
--- a/src/Imaging/ImageFile.cs
+++ b/src/Imaging/ImageFile.cs
@@ -2,6 +2,7 @@ using System;
using System.IO;
using FSpot.Utils;
using Mono.Unix;
+using Gdk;
namespace FSpot {
public class ImageFormatException : ApplicationException {
@@ -66,8 +67,8 @@ namespace FSpot {
//and enable it if needed.
foreach (Gdk.PixbufFormat format in Gdk.Pixbuf.Formats)
if (format.Name == "xcf") {
- if (format.Disabled)
- format.Disabled = false;
+ if (format.IsDisabled)
+ format.SetDisabled (false);
name_table [".xcf"] = typeof (ImageFile);
}
}
@@ -213,7 +214,7 @@ namespace FSpot {
public void Dispose ()
{
Close ();
- GC.SuppressFinalize (this);
+ System.GC.SuppressFinalize (this);
}
protected virtual void Close ()
diff --git a/src/Makefile.am b/src/Makefile.am
index ebe61ca..96b46ee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -328,6 +328,7 @@ WIDGETS_ASSEMBLIES = \
-pkg:gio-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-pkg:gnome-sharp-2.0 \
+ -pkg:gtk-sharp-beans-2.0 \
-r:Mono.Posix \
-r:FSpot.Core.dll \
-r:FSpot.Utils.dll
@@ -370,6 +371,7 @@ F_SPOT_ASSEMBLIES = \
$(NUNIT_PKG) \
$(GCONF_PKG) \
$(GTKHTML_SHARP_PKG) \
+ -pkg:gtk-sharp-beans-2.0 \
-pkg:gio-sharp-2.0 \
-pkg:glade-sharp-2.0 \
-pkg:gnome-sharp-2.0 \
diff --git a/src/UI.Dialog/BuilderDialog.cs b/src/UI.Dialog/BuilderDialog.cs
index 7a2fd79..7b4d5da 100644
--- a/src/UI.Dialog/BuilderDialog.cs
+++ b/src/UI.Dialog/BuilderDialog.cs
@@ -10,7 +10,7 @@
//
using System;
-using Gtk;
+using GtkBeans;
namespace FSpot.UI.Dialog
{
diff --git a/src/UI.Dialog/DateRangeDialog.cs b/src/UI.Dialog/DateRangeDialog.cs
index 60b2c83..386e1b7 100644
--- a/src/UI.Dialog/DateRangeDialog.cs
+++ b/src/UI.Dialog/DateRangeDialog.cs
@@ -19,13 +19,12 @@ using FSpot.Widgets;
namespace FSpot.UI.Dialog
{
public class DateRangeDialog : BuilderDialog {
- FSpot.PhotoQuery query;
Gtk.Window parent_window;
- [Builder.Object] Button ok_button;
- [Builder.Object] Frame startframe;
- [Builder.Object] Frame endframe;
- [Builder.Object] ComboBox period_combobox;
+ [GtkBeans.Builder.Object] Button ok_button;
+ [GtkBeans.Builder.Object] Frame startframe;
+ [GtkBeans.Builder.Object] Frame endframe;
+ [GtkBeans.Builder.Object] ComboBox period_combobox;
DateEdit start_dateedit;
DateEdit end_dateedit;
@@ -51,7 +50,6 @@ namespace FSpot.UI.Dialog
public DateRangeDialog (DateRange query_range, Gtk.Window parent_window) : base ("DateRangeDialog.ui", "date_range_dialog")
{
- this.query = query;
this.parent_window = parent_window;
TransientFor = parent_window;
DefaultResponse = ResponseType.Ok;
diff --git a/src/Widgets/DateEdit.cs b/src/Widgets/DateEdit.cs
index 3253cf8..e67e952 100644
--- a/src/Widgets/DateEdit.cs
+++ b/src/Widgets/DateEdit.cs
@@ -178,7 +178,7 @@ namespace FSpot.Widgets
{
var requisition = calendar_popup.SizeRequest ();
int x, y;
- date_button.Window.GetOrigin (out x, out y);
+ date_button.GetWindow().GetOrigin (out x, out y);
x += date_button.Allocation.X;
y += date_button.Allocation.Y;
x += date_button.Allocation.Width - requisition.Width;
@@ -194,7 +194,7 @@ namespace FSpot.Widgets
void HandleCalendarButtonClicked (object sender, EventArgs e)
{
//Temporarily grab pointer and keyboard
- if (!GrabPointerAndKeyboard (this.Window, Gtk.Global.CurrentEventTime))
+ if (!GrabPointerAndKeyboard (this.GetWindow(), Gtk.Global.CurrentEventTime))
return;
//select the day on the calendar
@@ -206,7 +206,7 @@ namespace FSpot.Widgets
calendar.GrabFocus ();
//transfer the grabs to the popup
- GrabPointerAndKeyboard (calendar_popup.Window, Gtk.Global.CurrentEventTime);
+ GrabPointerAndKeyboard (calendar_popup.GetWindow(), Gtk.Global.CurrentEventTime);
}
void HandleDateEntryActivated (object sender, EventArgs e)
diff --git a/src/Widgets/OpenWithMenu.cs b/src/Widgets/OpenWithMenu.cs
index a3c3ba4..77576fc 100644
--- a/src/Widgets/OpenWithMenu.cs
+++ b/src/Widgets/OpenWithMenu.cs
@@ -114,7 +114,7 @@ namespace FSpot.Widgets {
if (!show_icon)
return;
- Image = new Gtk.Image (app.Icon, IconSize.Menu);
+ Image = GtkBeans.Image.NewFromIcon (app.Icon, IconSize.Menu);
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]