mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-08-24 18:25:50 +00:00
cut-n-paste-code now compiles, and we are a hair's breadth away from
* Lots of files: cut-n-paste-code now compiles, and we are a hair's breadth away from linking -- so far from running, though
This commit is contained in:
Darin Adler
parent
19dcc4ea40
commit
74e78f43fe
|
|
@ -1,3 +1,9 @@
|
|||
2001-10-30 Darin Adler <darin@bentspoon.com>
|
||||
|
||||
* Lots of files:
|
||||
cut-n-paste-code now compiles, and we are a hair's breadth
|
||||
away from linking -- so far from running, though
|
||||
|
||||
2001-10-30 Darin Adler <darin@bentspoon.com>
|
||||
|
||||
* Lots of files:
|
||||
|
|
|
|||
|
|
@ -10,17 +10,17 @@ APPLETS_SUBDIRS = applets
|
|||
endif
|
||||
|
||||
SUBDIRS = \
|
||||
data \
|
||||
icons \
|
||||
libnautilus \
|
||||
libnautilus-adapter \
|
||||
libnautilus-private \
|
||||
libnautilus-adapter \
|
||||
cut-n-paste-code \
|
||||
src \
|
||||
po \
|
||||
data \
|
||||
icons \
|
||||
$(NULL)
|
||||
|
||||
XXX = \
|
||||
cut-n-paste-code \
|
||||
components \
|
||||
helper-utilities \
|
||||
helper-scripts \
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <libnautilus/nautilus-bonobo-workarounds.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@
|
|||
#include <libnautilus-adapter/nautilus-adapter-factory.h>
|
||||
#include <eel/eel-gtk-macros.h>
|
||||
#include <libnautilus/nautilus-bonobo-ui.h>
|
||||
#include <libnautilus/nautilus-bonobo-workarounds.h>
|
||||
|
||||
typedef struct {
|
||||
POA_Nautilus_ComponentAdapterFactory servant;
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@
|
|||
#include <eel/eel-gtk-macros.h>
|
||||
#include <libnautilus-private/nautilus-icon-factory.h>
|
||||
#include <libnautilus-private/nautilus-theme.h>
|
||||
#include <libnautilus/nautilus-bonobo-workarounds.h>
|
||||
#include <math.h>
|
||||
|
||||
#define THROBBER_DEFAULT_TIMEOUT 100 /* Milliseconds Per Frame */
|
||||
|
|
|
|||
411
configure.in
411
configure.in
|
|
@ -53,7 +53,6 @@ AC_ISC_POSIX
|
|||
AC_PROG_CC
|
||||
AC_PROG_CPP
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_INTLTOOL
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_MAKE_SET
|
||||
AM_DISABLE_STATIC
|
||||
|
|
@ -79,82 +78,20 @@ PKG_CHECK_MODULES(ALL, \
|
|||
librsvg-2.0 >= $RSVG_REQUIRED \
|
||||
libxml-2.0 >= $XML_REQUIRED)
|
||||
|
||||
dnl libnautilus
|
||||
dnl ==========================================================================
|
||||
|
||||
LIBNAUTILUS_MODULES="\
|
||||
bonobo-activation-2.0 \
|
||||
eel-2.0 \
|
||||
glib-2.0 \
|
||||
gnome-vfs-2.0 \
|
||||
gtk+-2.0 \
|
||||
libgnomecanvas-2.0 \
|
||||
libbonobo-2.0 \
|
||||
libbonoboui-2.0"
|
||||
LIBNAUTILUS_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_MODULES`"
|
||||
AC_SUBST(LIBNAUTILUS_CFLAGS)
|
||||
LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
|
||||
AC_SUBST(LIBNAUTILUS_LIBS)
|
||||
LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`"
|
||||
AC_SUBST(LIBNAUTILUS_IDL_INCLUDES)
|
||||
ALL_LINGUAS="az ca cs da de el en_GB es fi fr ga gl hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sv ta tr uk zh_TW"
|
||||
|
||||
dnl libnautilus-adapter
|
||||
LIBNAUTILUS_ADAPTER_MODULES="\
|
||||
bonobo-activation-2.0 \
|
||||
eel-2.0 \
|
||||
glib-2.0 \
|
||||
gnome-vfs-2.0 \
|
||||
gtk+-2.0 \
|
||||
libgnomecanvas-2.0 \
|
||||
libbonobo-2.0 \
|
||||
libbonoboui-2.0"
|
||||
LIBNAUTILUS_ADAPTER_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_ADAPTER_MODULES`"
|
||||
AC_SUBST(LIBNAUTILUS_ADAPTER_CFLAGS)
|
||||
LIBNAUTILUS_ADAPTER_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_ADAPTER_MODULES`"
|
||||
AC_SUBST(LIBNAUTILUS_ADAPTER_LIBS)
|
||||
LIBNAUTILUS_ADAPTER_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_ADAPTER_MODULES | $srcdir/add-include-prefix`"
|
||||
AC_SUBST(LIBNAUTILUS_ADAPTER_IDL_INCLUDES)
|
||||
AM_GNOME2_GETTEXT
|
||||
# AM_GNOME2_GETTEXT above substs $DATADIRNAME
|
||||
# this is the directory where the *.{mo,gmo} files are installed
|
||||
gnomelocaledir='${prefix}/${DATADIRNAME}/locale'
|
||||
AC_SUBST(gnomelocaledir)
|
||||
|
||||
dnl libnautilus-private
|
||||
LIBNAUTILUS_PRIVATE_MODULES="\
|
||||
bonobo-activation-2.0 \
|
||||
eel-2.0 \
|
||||
glib-2.0 \
|
||||
gnome-vfs-2.0 \
|
||||
gtk+-2.0 \
|
||||
libgnomecanvas-2.0 \
|
||||
libbonobo-2.0 \
|
||||
libbonoboui-2.0 \
|
||||
librsvg-2.0"
|
||||
LIBNAUTILUS_PRIVATE_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_PRIVATE_MODULES`"
|
||||
AC_SUBST(LIBNAUTILUS_PRIVATE_CFLAGS)
|
||||
LIBNAUTILUS_PRIVATE_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_PRIVATE_MODULES`"
|
||||
AC_SUBST(LIBNAUTILUS_PRIVATE_LIBS)
|
||||
LIBNAUTILUS_PRIVATE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_PRIVATE_MODULES | $srcdir/add-include-prefix`"
|
||||
AC_SUBST(LIBNAUTILUS_PRIVATE_IDL_INCLUDES)
|
||||
AC_PROG_INTLTOOL
|
||||
|
||||
dnl nautilus-src
|
||||
NAUTILUS_SRC_MODULES="\
|
||||
bonobo-activation-2.0 \
|
||||
eel-2.0 \
|
||||
glib-2.0 \
|
||||
gnome-vfs-2.0 \
|
||||
gtk+-2.0 \
|
||||
libgnomecanvas-2.0 \
|
||||
libbonobo-2.0 \
|
||||
libbonoboui-2.0 \
|
||||
librsvg-2.0"
|
||||
NAUTILUS_SRC_CFLAGS="`$PKG_CONFIG --cflags $NAUTILUS_SRC_MODULES`"
|
||||
AC_SUBST(NAUTILUS_SRC_CFLAGS)
|
||||
NAUTILUS_SRC_LIBS="`$PKG_CONFIG --libs $NAUTILUS_SRC_MODULES`"
|
||||
AC_SUBST(NAUTILUS_SRC_LIBS)
|
||||
NAUTILUS_SRC_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $NAUTILUS_SRC_MODULES | $srcdir/add-include-prefix`"
|
||||
AC_SUBST(NAUTILUS_SRC_IDL_INCLUDES)
|
||||
dnl ==========================================================================
|
||||
|
||||
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
|
||||
|
||||
dnl ====================================
|
||||
dnl = Begin profiling support
|
||||
dnl ====================================
|
||||
ENABLE_PROFILER=
|
||||
AC_ARG_ENABLE(profiler,
|
||||
[ --enable-profiler Enable profiler],
|
||||
|
|
@ -169,24 +106,24 @@ fi
|
|||
|
||||
AC_SUBST(ENABLE_PROFILER)
|
||||
AM_CONDITIONAL(ENABLE_PROFILER, test "x$ENABLE_PROFILER" = "x1")
|
||||
dnl ====================================
|
||||
dnl = End profiling support
|
||||
dnl ====================================
|
||||
|
||||
dnl ====================================
|
||||
dnl = Check for different mount systems
|
||||
dnl ====================================
|
||||
dnl ==========================================================================
|
||||
|
||||
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
|
||||
|
||||
dnl ==========================================================================
|
||||
|
||||
AC_CHECK_FUNCS(setmntent endmntent hasmntopt)
|
||||
AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h)
|
||||
|
||||
dnl ====================================
|
||||
dnl = Method for changing environment
|
||||
dnl ====================================
|
||||
dnl ==========================================================================
|
||||
|
||||
AC_CHECK_FUNCS(setenv unsetenv putenv)
|
||||
|
||||
dnl =============
|
||||
dnl Check for FAM
|
||||
dnl =============
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl FAM
|
||||
|
||||
FAM_MISSING_WARNING="Nautilus depends on FAM to provide notification when files are altered (either through filesystem polling, or a kernel notification mechanism). If Nautilus is built without FAM support, directories viewed with Nautilus will not remain in synch with the actual filesystem when they are altered by external processes. Particularly if you are a distributor please compile Nautilus with FAM support. FAM is available from http://oss.sgi.com/projects/fam/. A patch to add Linux Kernel 2.4 directory notify support to FAM (highly desirable) is available from http://people.redhat.com/alexl/files/"
|
||||
FAM_LIBS=
|
||||
AC_CHECK_LIB(fam, FAMOpen,
|
||||
|
|
@ -197,13 +134,45 @@ AC_CHECK_LIB(fam, FAMOpen,
|
|||
AC_MSG_WARN(*** FAM support will not be built (FAM library not found) $FAM_MISSING_WARNING ***))
|
||||
AC_SUBST(FAM_LIBS)
|
||||
|
||||
dnl ====================================
|
||||
dnl = Use x86 optimized music routines?
|
||||
dnl ====================================
|
||||
dnl ==========================================================================
|
||||
|
||||
AC_ARG_WITH(libiconv, [ --with-libiconv Use the libiconv library ],,with_libiconv=maybe)
|
||||
|
||||
found_iconv=no
|
||||
|
||||
if test "x$with_libiconv" != "xyes" ; then
|
||||
#
|
||||
# Check in the C library
|
||||
#
|
||||
AC_CHECK_FUNC(iconv_open, with_libiconv=no; found_iconv=yes)
|
||||
fi
|
||||
|
||||
if test "x$with_libiconv" != "xno" ; then
|
||||
#
|
||||
# Check for libiconv
|
||||
#
|
||||
AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=yes; found_iconv=yes)
|
||||
fi
|
||||
|
||||
if test "x$found_iconv" = "xno" ; then
|
||||
AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
|
||||
fi
|
||||
|
||||
if test "x$with_libiconv" = "xyes" ; then
|
||||
ICONV_LIBS="-liconv"
|
||||
fi
|
||||
AC_SUBST(ICONV_LIBS)
|
||||
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl x86 checks (used by audio routines in music component)
|
||||
|
||||
_system_is_x86="no"
|
||||
AC_CHECK_HEADER( asm/vm86.h, _system_is_x86="yes" )
|
||||
AM_CONDITIONAL(X86_OPTIMIZED, test "x$_system_is_x86" = "xyes")
|
||||
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl ====================================
|
||||
dnl = mozilla embedded component support
|
||||
dnl =
|
||||
|
|
@ -216,6 +185,7 @@ dnl = --disable-mozilla-component can be used to disable building of the
|
|||
dnl = mozilla component even if the mozilla development libraries are
|
||||
dnl = detected.
|
||||
dnl ====================================
|
||||
|
||||
mozilla_component_enabled="yes"
|
||||
|
||||
AC_ARG_ENABLE(mozilla-component,
|
||||
|
|
@ -339,9 +309,9 @@ fi
|
|||
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(BUILD_MOZILLA_COMPONENT, test "x$found_mozilla" = "xtrue")
|
||||
AM_CONDITIONAL(BUILD_MOZILLA_COMPONENT, test "$found_mozilla" = "true")
|
||||
|
||||
if test "x$found_mozilla" = "xtrue"
|
||||
if test "$found_mozilla" = "true"
|
||||
then
|
||||
grep -w gtk_moz_embed_set_profile_path $_mozilla_include_place/gtkembedmoz/gtkmozembed.h > /dev/null 2>&1
|
||||
if test $? -eq 0
|
||||
|
|
@ -385,13 +355,10 @@ dnl if the debug flag DEBUG is set a certain way.
|
|||
AC_SUBST(MOZILLA_COMPONENT_DEBUG_FLAGS)
|
||||
fi
|
||||
|
||||
dnl ====================================
|
||||
dnl = End mozilla hacks
|
||||
dnl ====================================
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl bz2 (used only by the help converters)
|
||||
|
||||
dnl ====================================
|
||||
dnl = Bzip2, for the help converters
|
||||
dnl ====================================
|
||||
BZ_LIBS=
|
||||
AC_CHECK_LIB(bz2, bzread, [AC_DEFINE(HAVE_LIBBZ2)
|
||||
BZ_LIBS="-lbz2"])
|
||||
|
|
@ -414,32 +381,29 @@ dnl <= Check for bzip2 > 1.0.0
|
|||
dnl =>
|
||||
AC_SUBST(BZ_LIBS)
|
||||
|
||||
dnl ====================================
|
||||
dnl = cdda module support
|
||||
dnl ====================================
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl cdda
|
||||
|
||||
AM_CONDITIONAL(HAVE_CDDA, false);
|
||||
AC_CHECK_HEADERS(cdda_interface.h cdda_paranoia.h, [
|
||||
CDDA_LIBS="$CDDA_LIBS -lcdda_paranoia, -lcdda_interface";
|
||||
AM_CONDITIONAL(HAVE_CDDA, true);
|
||||
CDDA_LIBS="-lcdda_paranoia -lcdda_interface";
|
||||
AM_CONDITIONAL(HAVE_CDDA, true);
|
||||
])
|
||||
|
||||
dnl ====================================
|
||||
dnl = Begin tests for scrollkeeper
|
||||
dnl ====================================
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl scrollkeeper
|
||||
|
||||
AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
|
||||
if test x$SCROLLKEEPER_CONFIG = xno; then
|
||||
AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper packaga)
|
||||
fi
|
||||
|
||||
dnl =======================
|
||||
dnl = End tests for scrollkeeper
|
||||
dnl =======================
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl jw (for doc build)
|
||||
|
||||
dnl ====================================
|
||||
dnl = Test whether jw is installed for doc build
|
||||
dnl ====================================
|
||||
AC_PATH_PROG(JW,jw,no)
|
||||
if test x$JW = xno; then
|
||||
HAVE_JW="no"
|
||||
|
|
@ -448,19 +412,16 @@ else
|
|||
fi
|
||||
AM_CONDITIONAL(HAVE_JW, test "x$HAVE_JW" = "xyes")
|
||||
AC_SUBST(HAVE_JW)
|
||||
dnl ====================================
|
||||
dnl = End tests for jw
|
||||
dnl ====================================
|
||||
|
||||
dnl ====================================
|
||||
dnl = zlib for help converters
|
||||
dnl ====================================
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl zlib (used only by help converters)
|
||||
|
||||
AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz
|
||||
AC_SUBST(Z_LIBS)], AC_MSG_ERROR([*** zlib is required]))
|
||||
|
||||
dnl ====================================
|
||||
dnl = Begin tests for medusa
|
||||
dnl ====================================
|
||||
dnl ==========================================================================
|
||||
|
||||
AC_MSG_CHECKING(for Medusa)
|
||||
|
||||
case "`medusa-config --libs 2>/dev/null | cut -d ' ' -f1`" in
|
||||
|
|
@ -480,13 +441,11 @@ esac
|
|||
|
||||
AC_SUBST(MEDUSA_CFLAGS)
|
||||
AC_SUBST(MEDUSA_LIBS)
|
||||
dnl =======================
|
||||
dnl = End tests for medusa
|
||||
dnl =======================
|
||||
|
||||
dnl ====================================
|
||||
dnl = Begin tests for libpng
|
||||
dnl ====================================
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl libpng
|
||||
|
||||
if test -z "$LIBPNG"; then
|
||||
AC_CHECK_LIB(png, png_read_info,
|
||||
AC_CHECK_HEADER(png.h,
|
||||
|
|
@ -511,13 +470,11 @@ dnl ====================================
|
|||
fi
|
||||
|
||||
AC_SUBST(LIBPNG)
|
||||
dnl =======================
|
||||
dnl = End tests for libpng
|
||||
dnl =======================
|
||||
|
||||
dnl ====================================
|
||||
dnl = Begin tests for libjpeg
|
||||
dnl ====================================
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl libjpeg
|
||||
|
||||
if test -z "$LIBJPEG"; then
|
||||
AC_CHECK_LIB(jpeg, jpeg_start_decompress,
|
||||
AC_CHECK_HEADER(jpeglib.h,
|
||||
|
|
@ -533,23 +490,10 @@ dnl ====================================
|
|||
fi
|
||||
|
||||
AC_SUBST(LIBJPEG)
|
||||
dnl =======================
|
||||
dnl = End tests for libjpeg
|
||||
dnl =======================
|
||||
|
||||
dnl Checks for i18n
|
||||
ALL_LINGUAS="az ca cs da de el en_GB es fi fr ga gl hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sv ta tr uk zh_TW"
|
||||
AM_GNOME2_GETTEXT
|
||||
# AM_GNOME2_GETTEXT above substs $DATADIRNAME
|
||||
# this is the directory where the *.{mo,gmo} files are installed
|
||||
gnomelocaledir='${prefix}/${DATADIRNAME}/locale'
|
||||
AC_SUBST(gnomelocaledir)
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
|
||||
dnl
|
||||
dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
|
||||
dnl
|
||||
|
||||
AC_ARG_ENABLE(more-warnings,
|
||||
[ --enable-more-warnings Maximum compiler warnings],
|
||||
|
|
@ -591,47 +535,65 @@ else
|
|||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl libnautilus
|
||||
LIBNAUTILUS_MODULES="eel-2.0 libbonoboui-2.0"
|
||||
LIBNAUTILUS_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_MODULES`"
|
||||
AC_SUBST(LIBNAUTILUS_CFLAGS)
|
||||
LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
|
||||
AC_SUBST(LIBNAUTILUS_LIBS)
|
||||
LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`"
|
||||
AC_SUBST(LIBNAUTILUS_IDL_INCLUDES)
|
||||
|
||||
dnl e-paned
|
||||
E_PANED_MODULES="gtk+-2.0"
|
||||
E_PANED_CFLAGS="`$PKG_CONFIG --cflags $E_PANED_MODULES`"
|
||||
AC_SUBST(E_PANED_CFLAGS)
|
||||
|
||||
dnl gimphwrapbox
|
||||
GIMPHWRAPBOX_MODULES="gtk+-2.0"
|
||||
GIMPHWRAPBOX_CFLAGS="`$PKG_CONFIG --cflags $GIMPHWRAPBOX_MODULES`"
|
||||
AC_SUBST(GIMPHWRAPBOX_CFLAGS)
|
||||
|
||||
dnl libnautilus-private
|
||||
LIBNAUTILUS_PRIVATE_MODULES="eel-2.0 libbonoboui-2.0"
|
||||
LIBNAUTILUS_PRIVATE_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_PRIVATE_MODULES`"
|
||||
AC_SUBST(LIBNAUTILUS_PRIVATE_CFLAGS)
|
||||
LIBNAUTILUS_PRIVATE_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_PRIVATE_MODULES` $CDDA_LIBS $ESD_LIBS $FAM_LIBS $ICONV_LIBS $LIBJPEG $MEDUSA_LIBS"
|
||||
AC_SUBST(LIBNAUTILUS_PRIVATE_LIBS)
|
||||
LIBNAUTILUS_PRIVATE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_PRIVATE_MODULES | $srcdir/add-include-prefix`"
|
||||
AC_SUBST(LIBNAUTILUS_PRIVATE_IDL_INCLUDES)
|
||||
|
||||
dnl libnautilus-adapter
|
||||
LIBNAUTILUS_ADAPTER_MODULES="eel-2.0 libbonoboui-2.0"
|
||||
LIBNAUTILUS_ADAPTER_CFLAGS="`$PKG_CONFIG --cflags $LIBNAUTILUS_ADAPTER_MODULES`"
|
||||
AC_SUBST(LIBNAUTILUS_ADAPTER_CFLAGS)
|
||||
LIBNAUTILUS_ADAPTER_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_ADAPTER_MODULES`"
|
||||
AC_SUBST(LIBNAUTILUS_ADAPTER_LIBS)
|
||||
LIBNAUTILUS_ADAPTER_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_ADAPTER_MODULES | $srcdir/add-include-prefix`"
|
||||
AC_SUBST(LIBNAUTILUS_ADAPTER_IDL_INCLUDES)
|
||||
|
||||
dnl nautilus-src
|
||||
NAUTILUS_SRC_MODULES="eel-2.0 libbonoboui-2.0"
|
||||
NAUTILUS_SRC_CFLAGS="`$PKG_CONFIG --cflags $NAUTILUS_SRC_MODULES`"
|
||||
AC_SUBST(NAUTILUS_SRC_CFLAGS)
|
||||
NAUTILUS_SRC_LIBS="`$PKG_CONFIG --libs $NAUTILUS_SRC_MODULES`"
|
||||
AC_SUBST(NAUTILUS_SRC_LIBS)
|
||||
NAUTILUS_SRC_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $NAUTILUS_SRC_MODULES | $srcdir/add-include-prefix`"
|
||||
AC_SUBST(NAUTILUS_SRC_IDL_INCLUDES)
|
||||
|
||||
dnl ==========================================================================
|
||||
|
||||
AC_OUTPUT([
|
||||
nautilus.spec
|
||||
Makefile
|
||||
helper-utilities/Makefile
|
||||
helper-utilities/error-dialog/Makefile
|
||||
helper-utilities/xml-migrate/Makefile
|
||||
helper-scripts/Makefile
|
||||
icons/Makefile
|
||||
icons/crux_eggplant/Makefile
|
||||
icons/crux_eggplant/backgrounds/Makefile
|
||||
icons/crux_eggplant/sidebar_tab_pieces/Makefile
|
||||
icons/crux_eggplant/throbber/Makefile
|
||||
icons/crux_teal/Makefile
|
||||
icons/crux_teal/backgrounds/Makefile
|
||||
icons/crux_teal/sidebar_tab_pieces/Makefile
|
||||
icons/crux_teal/throbber/Makefile
|
||||
icons/gnome/Makefile
|
||||
icons/gnome/throbber/Makefile
|
||||
icons/gnome/sidebar_tab_pieces/Makefile
|
||||
icons/sidebar_tab_pieces/Makefile
|
||||
icons/sierra/Makefile
|
||||
icons/tahoe/Makefile
|
||||
icons/throbber/Makefile
|
||||
data/Makefile
|
||||
data/patterns/Makefile
|
||||
data/emblems/Makefile
|
||||
data/linksets/Makefile
|
||||
cut-n-paste-code/Makefile
|
||||
cut-n-paste-code/widgets/Makefile
|
||||
cut-n-paste-code/widgets/e-paned/Makefile
|
||||
cut-n-paste-code/widgets/gimphwrapbox/Makefile
|
||||
libnautilus/Makefile
|
||||
libnautilus-adapter/Makefile
|
||||
libnautilus-private/Makefile
|
||||
src/Makefile
|
||||
src/file-manager/Makefile
|
||||
applets/Makefile
|
||||
applets/launcher/Makefile
|
||||
applets/preferences-applet/Makefile
|
||||
components/Makefile
|
||||
components/adapter/Makefile
|
||||
components/hardware/Makefile
|
||||
components/hardware/icons/Makefile
|
||||
components/history/Makefile
|
||||
components/help/Makefile
|
||||
components/help/converters/Makefile
|
||||
components/help/converters/gnome-db2html2/Makefile
|
||||
|
|
@ -643,56 +605,92 @@ components/help/converters/gnome-db2html3/docbook/lib/Makefile
|
|||
components/help/converters/gnome-db2html3/gnome-customization/Makefile
|
||||
components/help/converters/gnome-info2html2/Makefile
|
||||
components/help/converters/gnome-man2html2/Makefile
|
||||
components/history/Makefile
|
||||
components/image-viewer/Makefile
|
||||
components/loser/Makefile
|
||||
components/loser/content/Makefile
|
||||
components/loser/sidebar/Makefile
|
||||
components/mozilla/Makefile
|
||||
components/music/Makefile
|
||||
components/news/Makefile
|
||||
components/notes/Makefile
|
||||
components/sample/Makefile
|
||||
components/mozilla/Makefile
|
||||
components/text/Makefile
|
||||
components/text/services/Makefile
|
||||
components/throbber/Makefile
|
||||
components/loser/Makefile
|
||||
components/loser/content/Makefile
|
||||
components/loser/sidebar/Makefile
|
||||
components/tree/Makefile
|
||||
cut-n-paste-code/Makefile
|
||||
cut-n-paste-code/widgets/Makefile
|
||||
cut-n-paste-code/widgets/e-paned/Makefile
|
||||
cut-n-paste-code/widgets/gimphwrapbox/Makefile
|
||||
data/Makefile
|
||||
data/emblems/Makefile
|
||||
data/linksets/Makefile
|
||||
data/patterns/Makefile
|
||||
help/Makefile
|
||||
help/nautilus-quick-reference/C/Makefile
|
||||
help/nautilus-quick-reference/Makefile
|
||||
help/nautilus-quick-reference/es/Makefile
|
||||
help/nautilus-quick-reference/ko/Makefile
|
||||
help/nautilus-quick-reference/no/Makefile
|
||||
help/nautilus-quick-reference/sv/Makefile
|
||||
help/nautilus-release-notes/C/Makefile
|
||||
help/nautilus-release-notes/Makefile
|
||||
help/nautilus-screenshot-guidelines/C/Makefile
|
||||
help/nautilus-screenshot-guidelines/Makefile
|
||||
help/nautilus-user-manual/C/Makefile
|
||||
help/nautilus-user-manual/Makefile
|
||||
help/nautilus-user-manual/es/Makefile
|
||||
help/nautilus-user-manual/ko/Makefile
|
||||
helper-scripts/Makefile
|
||||
helper-utilities/Makefile
|
||||
helper-utilities/error-dialog/Makefile
|
||||
helper-utilities/xml-migrate/Makefile
|
||||
icons/Makefile
|
||||
icons/crux_eggplant/Makefile
|
||||
icons/crux_eggplant/backgrounds/Makefile
|
||||
icons/crux_eggplant/sidebar_tab_pieces/Makefile
|
||||
icons/crux_eggplant/throbber/Makefile
|
||||
icons/crux_teal/Makefile
|
||||
icons/crux_teal/backgrounds/Makefile
|
||||
icons/crux_teal/sidebar_tab_pieces/Makefile
|
||||
icons/crux_teal/throbber/Makefile
|
||||
icons/gnome/Makefile
|
||||
icons/gnome/sidebar_tab_pieces/Makefile
|
||||
icons/gnome/throbber/Makefile
|
||||
icons/sidebar_tab_pieces/Makefile
|
||||
icons/sierra/Makefile
|
||||
icons/tahoe/Makefile
|
||||
icons/throbber/Makefile
|
||||
libnautilus-adapter/Makefile
|
||||
libnautilus-private/Makefile
|
||||
libnautilus/Makefile
|
||||
nautilus.spec
|
||||
omf-install/Makefile
|
||||
po/Makefile.in
|
||||
src/Makefile
|
||||
src/file-manager/Makefile
|
||||
test/Makefile
|
||||
user-guide/Makefile
|
||||
user-guide/gnufdl/Makefile
|
||||
user-guide/gnugpl/Makefile
|
||||
help/Makefile
|
||||
help/nautilus-user-manual/Makefile
|
||||
help/nautilus-user-manual/C/Makefile
|
||||
help/nautilus-user-manual/es/Makefile
|
||||
help/nautilus-user-manual/ko/Makefile
|
||||
help/nautilus-quick-reference/Makefile
|
||||
help/nautilus-quick-reference/C/Makefile
|
||||
help/nautilus-quick-reference/no/Makefile
|
||||
help/nautilus-quick-reference/es/Makefile
|
||||
help/nautilus-quick-reference/sv/Makefile
|
||||
help/nautilus-quick-reference/ko/Makefile
|
||||
help/nautilus-release-notes/Makefile
|
||||
help/nautilus-release-notes/C/Makefile
|
||||
help/nautilus-screenshot-guidelines/Makefile
|
||||
help/nautilus-screenshot-guidelines/C/Makefile
|
||||
applets/Makefile
|
||||
applets/launcher/Makefile
|
||||
applets/preferences-applet/Makefile
|
||||
omf-install/Makefile
|
||||
])
|
||||
|
||||
dnl ==========================================================================
|
||||
|
||||
dnl <= Configuration summary =>
|
||||
|
||||
echo "Nautilus configuration summary:"
|
||||
echo ""
|
||||
|
||||
dnl <= CFLAGS and LDFLAGS =>
|
||||
|
||||
echo "CFLAGS : $CFLAGS"
|
||||
echo "LDFLAGS : $LDFLAGS"
|
||||
echo ""
|
||||
|
||||
dnl <= Mozilla component integrated? =>
|
||||
|
||||
case $found_mozilla in
|
||||
t*)
|
||||
echo "Mozilla component : YES"
|
||||
|
|
@ -708,6 +706,7 @@ case $found_mozilla in
|
|||
esac
|
||||
|
||||
dnl <= Profile support? =>
|
||||
|
||||
case "X$ENABLE_PROFILER" in
|
||||
X1)
|
||||
echo "Enable profiler : YES"
|
||||
|
|
@ -718,14 +717,8 @@ case "X$ENABLE_PROFILER" in
|
|||
esac
|
||||
|
||||
dnl <= Snapshot things =>
|
||||
echo "EAZEL_BUILD_TIMESTAMP : $EAZEL_BUILD_TIMESTAMP"
|
||||
echo "NAUTILUS_BUILD_MESSAGE : $NAUTILUS_BUILD_MESSAGE"
|
||||
|
||||
echo "NAUTILUS_SOURCE_DIRECTORY : $NAUTILUS_SOURCE_DIRECTORY"
|
||||
echo "HAVE_APPLETS : $HAVE_APPLETS"
|
||||
|
||||
dnl <= Nautilus =>
|
||||
echo "NAUTILUS_LIBDIR : $NAUTILUS_LIBDIR"
|
||||
echo "NAUTILUS_INCLUDEDIR : $NAUTILUS_INCLUDEDIR"
|
||||
echo "NAUTILUS_LIBS : $NAUTILUS_LIBS"
|
||||
|
||||
dnl <= End of configuration summary =>
|
||||
|
|
|
|||
|
|
@ -2,9 +2,7 @@ NULL=
|
|||
|
||||
noinst_LTLIBRARIES = libe-paned.la
|
||||
|
||||
INCLUDES = \
|
||||
$(GNOMEUI_CFLAGS) \
|
||||
$(NULL)
|
||||
INCLUDES = $(E_PANED_CFLAGS)
|
||||
|
||||
libe_paned_la_SOURCES = \
|
||||
e-hpaned.c \
|
||||
|
|
|
|||
|
|
@ -40,8 +40,6 @@ static void e_hpaned_size_request (GtkWidget *widget,
|
|||
GtkRequisition *requisition);
|
||||
static void e_hpaned_size_allocate (GtkWidget *widget,
|
||||
GtkAllocation *allocation);
|
||||
static void e_hpaned_draw (GtkWidget *widget,
|
||||
GdkRectangle *area);
|
||||
static void e_hpaned_xor_line (EPaned *paned);
|
||||
static gboolean e_hpaned_button_press (GtkWidget *widget,
|
||||
GdkEventButton *event);
|
||||
|
|
@ -87,7 +85,6 @@ e_hpaned_class_init (EHPanedClass *klass)
|
|||
|
||||
widget_class->size_request = e_hpaned_size_request;
|
||||
widget_class->size_allocate = e_hpaned_size_allocate;
|
||||
widget_class->draw = e_hpaned_draw;
|
||||
widget_class->button_press_event = e_hpaned_button_press;
|
||||
widget_class->button_release_event = e_hpaned_button_release;
|
||||
widget_class->motion_notify_event = e_hpaned_motion;
|
||||
|
|
@ -251,59 +248,6 @@ e_hpaned_size_allocate (GtkWidget *widget,
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
e_hpaned_draw (GtkWidget *widget,
|
||||
GdkRectangle *area)
|
||||
{
|
||||
EPaned *paned;
|
||||
GdkRectangle handle_area, child_area;
|
||||
guint16 border_width;
|
||||
|
||||
g_return_if_fail (widget != NULL);
|
||||
g_return_if_fail (E_IS_PANED (widget));
|
||||
|
||||
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
|
||||
{
|
||||
paned = E_PANED (widget);
|
||||
border_width = GTK_CONTAINER (paned)->border_width;
|
||||
|
||||
gdk_window_clear_area (widget->window,
|
||||
area->x, area->y, area->width,
|
||||
area->height);
|
||||
|
||||
if (e_paned_handle_shown(paned))
|
||||
{
|
||||
handle_area.x = paned->handle_xpos;
|
||||
handle_area.y = paned->handle_ypos;
|
||||
handle_area.width = paned->handle_size;
|
||||
handle_area.height = paned->handle_height;
|
||||
|
||||
if (gdk_rectangle_intersect (&handle_area, area, &child_area))
|
||||
{
|
||||
child_area.x -= paned->handle_xpos;
|
||||
child_area.y -= paned->handle_ypos;
|
||||
|
||||
gtk_paint_handle (widget->style,
|
||||
paned->handle,
|
||||
GTK_STATE_NORMAL,
|
||||
GTK_SHADOW_NONE,
|
||||
&child_area,
|
||||
widget,
|
||||
"paned",
|
||||
0, 0, -1, -1,
|
||||
GTK_ORIENTATION_VERTICAL);
|
||||
|
||||
}
|
||||
}
|
||||
/* Redraw the children
|
||||
*/
|
||||
if (paned->child1 && gtk_widget_intersect (paned->child1, area, &child_area))
|
||||
gtk_widget_draw(paned->child1, &child_area);
|
||||
if (paned->child2 && gtk_widget_intersect(paned->child2, area, &child_area))
|
||||
gtk_widget_draw(paned->child2, &child_area);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
e_hpaned_xor_line (EPaned *paned)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -616,7 +616,7 @@ e_paned_compute_position(EPaned *paned,
|
|||
gboolean
|
||||
e_paned_handle_shown(EPaned *paned)
|
||||
{
|
||||
EPanedClass *klass = E_PANED_CLASS(GTK_OBJECT(paned)->klass);
|
||||
EPanedClass *klass = E_PANED_CLASS(G_OBJECT_CLASS(paned));
|
||||
if (klass->handle_shown)
|
||||
return (*klass->handle_shown)(paned);
|
||||
else
|
||||
|
|
|
|||
|
|
@ -40,8 +40,6 @@ static void e_vpaned_size_request (GtkWidget *widget,
|
|||
GtkRequisition *requisition);
|
||||
static void e_vpaned_size_allocate (GtkWidget *widget,
|
||||
GtkAllocation *allocation);
|
||||
static void e_vpaned_draw (GtkWidget *widget,
|
||||
GdkRectangle *area);
|
||||
static void e_vpaned_xor_line (EPaned *paned);
|
||||
static gboolean e_vpaned_button_press (GtkWidget *widget,
|
||||
GdkEventButton *event);
|
||||
|
|
@ -87,7 +85,6 @@ e_vpaned_class_init (EVPanedClass *klass)
|
|||
|
||||
widget_class->size_request = e_vpaned_size_request;
|
||||
widget_class->size_allocate = e_vpaned_size_allocate;
|
||||
widget_class->draw = e_vpaned_draw;
|
||||
widget_class->button_press_event = e_vpaned_button_press;
|
||||
widget_class->button_release_event = e_vpaned_button_release;
|
||||
widget_class->motion_notify_event = e_vpaned_motion;
|
||||
|
|
@ -250,59 +247,6 @@ e_vpaned_size_allocate (GtkWidget *widget,
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
e_vpaned_draw (GtkWidget *widget,
|
||||
GdkRectangle *area)
|
||||
{
|
||||
EPaned *paned;
|
||||
GdkRectangle handle_area, child_area;
|
||||
guint16 border_width;
|
||||
|
||||
g_return_if_fail (widget != NULL);
|
||||
g_return_if_fail (E_IS_PANED (widget));
|
||||
|
||||
if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget))
|
||||
{
|
||||
paned = E_PANED (widget);
|
||||
border_width = GTK_CONTAINER (paned)->border_width;
|
||||
|
||||
gdk_window_clear_area (widget->window,
|
||||
area->x, area->y, area->width,
|
||||
area->height);
|
||||
|
||||
if (e_paned_handle_shown(paned))
|
||||
{
|
||||
handle_area.x = paned->handle_xpos;
|
||||
handle_area.y = paned->handle_ypos;
|
||||
handle_area.width = paned->handle_width;
|
||||
handle_area.height = paned->handle_size;
|
||||
|
||||
if (gdk_rectangle_intersect (&handle_area, area, &child_area))
|
||||
{
|
||||
child_area.x -= paned->handle_xpos;
|
||||
child_area.y -= paned->handle_ypos;
|
||||
|
||||
gtk_paint_handle (widget->style,
|
||||
paned->handle,
|
||||
GTK_STATE_NORMAL,
|
||||
GTK_SHADOW_NONE,
|
||||
&child_area,
|
||||
widget,
|
||||
"paned",
|
||||
0, 0, -1, -1,
|
||||
GTK_ORIENTATION_HORIZONTAL);
|
||||
|
||||
}
|
||||
}
|
||||
/* Redraw the children
|
||||
*/
|
||||
if (paned->child1 && gtk_widget_intersect (paned->child1, area, &child_area))
|
||||
gtk_widget_draw (paned->child1, &child_area);
|
||||
if (paned->child2 && gtk_widget_intersect (paned->child2, area, &child_area))
|
||||
gtk_widget_draw (paned->child2, &child_area);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
e_vpaned_xor_line (EPaned *paned)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,9 +2,7 @@ NULL=
|
|||
|
||||
noinst_LTLIBRARIES = libgtkhwrapbox.la
|
||||
|
||||
INCLUDES = \
|
||||
$(GNOMEUI_CFLAGS) \
|
||||
$(NULL)
|
||||
INCLUDES = $(GIMPHWRAPBOX_CFLAGS)
|
||||
|
||||
libgtkhwrapbox_la_SOURCES = \
|
||||
gtkhwrapbox.c \
|
||||
|
|
|
|||
|
|
@ -505,7 +505,8 @@ layout_rows (GtkWrapBox *wbox,
|
|||
gfloat shrink_height;
|
||||
guint children_per_line;
|
||||
Line *line_list = NULL;
|
||||
guint total_height = 0, n_expand_lines = 0, n_lines = 0;
|
||||
int total_height = 0;
|
||||
guint n_expand_lines = 0, n_lines = 0;
|
||||
|
||||
next_child = wbox->children;
|
||||
slist = GTK_WRAP_BOX_GET_CLASS (wbox)->rlist_line_children (wbox,
|
||||
|
|
|
|||
|
|
@ -63,18 +63,8 @@ static void gtk_wrap_box_get_arg (GtkObject *object,
|
|||
static void gtk_wrap_box_set_arg (GtkObject *object,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void gtk_wrap_box_set_child_arg (GtkContainer *container,
|
||||
GtkWidget *child,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void gtk_wrap_box_get_child_arg (GtkContainer *container,
|
||||
GtkWidget *child,
|
||||
GtkArg *arg,
|
||||
guint arg_id);
|
||||
static void gtk_wrap_box_map (GtkWidget *widget);
|
||||
static void gtk_wrap_box_unmap (GtkWidget *widget);
|
||||
static void gtk_wrap_box_draw (GtkWidget *widget,
|
||||
GdkRectangle *area);
|
||||
static gint gtk_wrap_box_expose (GtkWidget *widget,
|
||||
GdkEventExpose *event);
|
||||
static void gtk_wrap_box_add (GtkContainer *container,
|
||||
|
|
@ -136,15 +126,12 @@ gtk_wrap_box_class_init (GtkWrapBoxClass *class)
|
|||
|
||||
widget_class->map = gtk_wrap_box_map;
|
||||
widget_class->unmap = gtk_wrap_box_unmap;
|
||||
widget_class->draw = gtk_wrap_box_draw;
|
||||
widget_class->expose_event = gtk_wrap_box_expose;
|
||||
|
||||
container_class->add = gtk_wrap_box_add;
|
||||
container_class->remove = gtk_wrap_box_remove;
|
||||
container_class->forall = gtk_wrap_box_forall;
|
||||
container_class->child_type = gtk_wrap_box_child_type;
|
||||
container_class->set_child_arg = gtk_wrap_box_set_child_arg;
|
||||
container_class->get_child_arg = gtk_wrap_box_get_child_arg;
|
||||
|
||||
class->rlist_line_children = NULL;
|
||||
|
||||
|
|
@ -164,18 +151,6 @@ gtk_wrap_box_class_init (GtkWrapBoxClass *class)
|
|||
GTK_TYPE_FLOAT, GTK_ARG_READABLE, ARG_CURRENT_RATIO);
|
||||
gtk_object_add_arg_type ("GtkWrapBox::max_children_per_line",
|
||||
GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_CHILD_LIMIT);
|
||||
gtk_container_add_child_arg_type ("GtkWrapBox::position",
|
||||
GTK_TYPE_INT, GTK_ARG_READWRITE, CHILD_ARG_POSITION);
|
||||
gtk_container_add_child_arg_type ("GtkWrapBox::hexpand",
|
||||
GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_HEXPAND);
|
||||
gtk_container_add_child_arg_type ("GtkWrapBox::hfill",
|
||||
GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_HFILL);
|
||||
gtk_container_add_child_arg_type ("GtkWrapBox::vexpand",
|
||||
GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_VEXPAND);
|
||||
gtk_container_add_child_arg_type ("GtkWrapBox::vfill",
|
||||
GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_VFILL);
|
||||
gtk_container_add_child_arg_type ("GtkWrapBox::forcebreak",
|
||||
GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_FORCED_BREAK);
|
||||
|
||||
signals[NEED_REALLOCATION] = g_signal_new
|
||||
("need_reallocation",
|
||||
|
|
@ -282,96 +257,6 @@ gtk_wrap_box_get_arg (GtkObject *object,
|
|||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_wrap_box_set_child_arg (GtkContainer *container,
|
||||
GtkWidget *child,
|
||||
GtkArg *arg,
|
||||
guint arg_id)
|
||||
{
|
||||
GtkWrapBox *wbox = GTK_WRAP_BOX (container);
|
||||
gboolean hexpand = FALSE, hfill = FALSE, vexpand = FALSE, vfill = FALSE;
|
||||
|
||||
if (arg_id != CHILD_ARG_POSITION)
|
||||
gtk_wrap_box_query_child_packing (wbox, child, &hexpand, &hfill, &vexpand, &vfill);
|
||||
|
||||
switch (arg_id)
|
||||
{
|
||||
case CHILD_ARG_POSITION:
|
||||
gtk_wrap_box_reorder_child (wbox, child, GTK_VALUE_INT (*arg));
|
||||
break;
|
||||
case CHILD_ARG_HEXPAND:
|
||||
gtk_wrap_box_set_child_packing (wbox, child,
|
||||
GTK_VALUE_BOOL (*arg), hfill,
|
||||
vexpand, vfill);
|
||||
break;
|
||||
case CHILD_ARG_HFILL:
|
||||
gtk_wrap_box_set_child_packing (wbox, child,
|
||||
hexpand, GTK_VALUE_BOOL (*arg),
|
||||
vexpand, vfill);
|
||||
break;
|
||||
case CHILD_ARG_VEXPAND:
|
||||
gtk_wrap_box_set_child_packing (wbox, child,
|
||||
hexpand, hfill,
|
||||
GTK_VALUE_BOOL (*arg), vfill);
|
||||
break;
|
||||
case CHILD_ARG_VFILL:
|
||||
gtk_wrap_box_set_child_packing (wbox, child,
|
||||
hexpand, hfill,
|
||||
vexpand, GTK_VALUE_BOOL (*arg));
|
||||
break;
|
||||
case CHILD_ARG_FORCED_BREAK:
|
||||
gtk_wrap_box_set_child_forced_break (wbox, child,
|
||||
GTK_VALUE_BOOL (*arg));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_wrap_box_get_child_arg (GtkContainer *container,
|
||||
GtkWidget *child,
|
||||
GtkArg *arg,
|
||||
guint arg_id)
|
||||
{
|
||||
GtkWrapBox *wbox = GTK_WRAP_BOX (container);
|
||||
gboolean hexpand = FALSE, hfill = FALSE, vexpand = FALSE, vfill = FALSE;
|
||||
|
||||
if (arg_id != CHILD_ARG_POSITION)
|
||||
gtk_wrap_box_query_child_packing (wbox, child, &hexpand, &hfill, &vexpand, &vfill);
|
||||
|
||||
switch (arg_id)
|
||||
{
|
||||
GtkWrapBoxChild *child_info;
|
||||
case CHILD_ARG_POSITION:
|
||||
GTK_VALUE_INT (*arg) = 0;
|
||||
for (child_info = wbox->children; child_info; child_info = child_info->next)
|
||||
{
|
||||
if (child_info->widget == child)
|
||||
break;
|
||||
GTK_VALUE_INT (*arg)++;
|
||||
}
|
||||
if (!child_info)
|
||||
GTK_VALUE_INT (*arg) = -1;
|
||||
break;
|
||||
case CHILD_ARG_HEXPAND:
|
||||
GTK_VALUE_BOOL (*arg) = hexpand;
|
||||
break;
|
||||
case CHILD_ARG_HFILL:
|
||||
GTK_VALUE_BOOL (*arg) = hfill;
|
||||
break;
|
||||
case CHILD_ARG_VEXPAND:
|
||||
GTK_VALUE_BOOL (*arg) = vexpand;
|
||||
break;
|
||||
case CHILD_ARG_VFILL:
|
||||
GTK_VALUE_BOOL (*arg) = vfill;
|
||||
break;
|
||||
default:
|
||||
arg->type = GTK_TYPE_INVALID;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static GtkType
|
||||
gtk_wrap_box_child_type (GtkContainer *container)
|
||||
{
|
||||
|
|
@ -749,21 +634,6 @@ gtk_wrap_box_unmap (GtkWidget *widget)
|
|||
gtk_widget_unmap (child->widget);
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_wrap_box_draw (GtkWidget *widget,
|
||||
GdkRectangle *area)
|
||||
{
|
||||
GtkWrapBox *wbox = GTK_WRAP_BOX (widget);
|
||||
GtkWrapBoxChild *child;
|
||||
GdkRectangle child_area;
|
||||
|
||||
if (GTK_WIDGET_DRAWABLE (widget))
|
||||
for (child = wbox->children; child; child = child->next)
|
||||
if (GTK_WIDGET_DRAWABLE (child->widget) &&
|
||||
gtk_widget_intersect (child->widget, area, &child_area))
|
||||
gtk_widget_draw (child->widget, &child_area);
|
||||
}
|
||||
|
||||
static gint
|
||||
gtk_wrap_box_expose (GtkWidget *widget,
|
||||
GdkEventExpose *event)
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
#define __GTK_WRAP_BOX_H__
|
||||
|
||||
|
||||
#include <gdk/gdk.h>
|
||||
#include <gtk/gtkcontainer.h>
|
||||
|
||||
|
||||
|
|
@ -38,7 +37,7 @@ extern "C" {
|
|||
#define GTK_WRAP_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_WRAP_BOX, GtkWrapBoxClass))
|
||||
#define GTK_IS_WRAP_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_WRAP_BOX))
|
||||
#define GTK_IS_WRAP_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WRAP_BOX))
|
||||
#define GTK_WRAP_BOX_GET_CLASS(obj) (GTK_WRAP_BOX_CLASS (((GtkObject*) (obj))->klass))
|
||||
#define GTK_WRAP_BOX_GET_CLASS(obj) (GTK_WRAP_BOX_CLASS (G_OBJECT_GET_CLASS (obj)))
|
||||
|
||||
|
||||
/* --- typedefs --- */
|
||||
|
|
|
|||
|
|
@ -9,5 +9,5 @@ nautilus-metafile-server-skels.c
|
|||
nautilus-metafile-server-stubs.c
|
||||
nautilus-metafile-server.h
|
||||
nautilus_metafile_server_idl_stamp
|
||||
nautilus-marshal.c
|
||||
nautilus-marshal.h
|
||||
nautilus-marshal-guts.c
|
||||
nautilus-marshal-guts.h
|
||||
|
|
|
|||
|
|
@ -16,15 +16,9 @@ dependency_static_libs = \
|
|||
$(top_builddir)/cut-n-paste-code/widgets/gimphwrapbox/libgtkhwrapbox.la \
|
||||
$(NULL)
|
||||
|
||||
if HAVE_CDDA
|
||||
CDDALIBADD = -lcdda_paranoia -lcdda_interface
|
||||
else
|
||||
CDDALIBADD =
|
||||
endif
|
||||
|
||||
libnautilus_private_la_LDFLAGS = \
|
||||
$(dependency_static_libs) \
|
||||
$(LIBNAUTILUS_PRIVATE_LIBS) \
|
||||
$(CDDALIBADD) \
|
||||
$(NULL)
|
||||
|
||||
nautilus_metafile_server_idl_sources = \
|
||||
|
|
@ -35,8 +29,8 @@ nautilus_metafile_server_idl_sources = \
|
|||
$(NULL)
|
||||
|
||||
marshal_sources = \
|
||||
nautilus-marshal.h \
|
||||
nautilus-marshal.c \
|
||||
nautilus-marshal-guts.h \
|
||||
nautilus-marshal-guts.c \
|
||||
$(NULL)
|
||||
|
||||
libnautilus_private_la_SOURCES = \
|
||||
|
|
@ -122,6 +116,8 @@ libnautilus_private_la_SOURCES = \
|
|||
nautilus-link-set.h \
|
||||
nautilus-link.c \
|
||||
nautilus-link.h \
|
||||
nautilus-marshal-guts.h \
|
||||
nautilus-marshal.c \
|
||||
nautilus-marshal.h \
|
||||
nautilus-medusa-support.c \
|
||||
nautilus-medusa-support.h \
|
||||
|
|
@ -184,9 +180,9 @@ nautilus_metafile_server_idl_stamp: nautilus-metafile-server.idl $(ORBIT_IDL)
|
|||
$(ORBIT_IDL) -I$(top_srcdir) $(LIBNAUTILUS_PRIVATE_IDL_INCLUDES) $<
|
||||
touch $@
|
||||
|
||||
nautilus-marshal.h: nautilus-marshal.list $(GLIB_GENMARSHAL)
|
||||
nautilus-marshal-guts.h: nautilus-marshal.list $(GLIB_GENMARSHAL)
|
||||
$(GLIB_GENMARSHAL) $< --header --prefix=nautilus_marshal > $@
|
||||
nautilus-marshal.c: nautilus-marshal.list $(GLIB_GENMARSHAL)
|
||||
nautilus-marshal-guts.c: nautilus-marshal.list $(GLIB_GENMARSHAL)
|
||||
$(GLIB_GENMARSHAL) $< --body --prefix=nautilus_marshal > $@
|
||||
|
||||
$(libnautilus_private_la_OBJECTS): nautilus_metafile_server_idl_stamp $(marshal_sources)
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#include <eel/eel-gtk-macros.h>
|
||||
#include <eel/eel-glib-extensions.h>
|
||||
#include "nautilus-bonobo-extensions.h"
|
||||
#include <libnautilus/nautilus-bonobo-workarounds.h>
|
||||
|
||||
struct NautilusMetafileMonitorDetails {
|
||||
NautilusDirectory *directory;
|
||||
|
|
|
|||
|
|
@ -3368,6 +3368,7 @@ nautilus_icon_container_init (NautilusIconContainer *container)
|
|||
/* FIXME bugzilla.gnome.org 45093: Font name is hard-coded here. */
|
||||
/* FIXME bugzilla.gnome.org 45101: Font size is hard-coded here. */
|
||||
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
details->label_font[NAUTILUS_ZOOM_LEVEL_SMALLEST] = nautilus_font_factory_get_font_by_family ("helvetica", 8);
|
||||
details->label_font[NAUTILUS_ZOOM_LEVEL_SMALLER] = nautilus_font_factory_get_font_by_family ("helvetica", 8);
|
||||
details->label_font[NAUTILUS_ZOOM_LEVEL_SMALL] = nautilus_font_factory_get_font_by_family ("helvetica", 10);
|
||||
|
|
@ -3375,6 +3376,7 @@ nautilus_icon_container_init (NautilusIconContainer *container)
|
|||
details->label_font[NAUTILUS_ZOOM_LEVEL_LARGE] = nautilus_font_factory_get_font_by_family ("helvetica", 14);
|
||||
details->label_font[NAUTILUS_ZOOM_LEVEL_LARGER] = nautilus_font_factory_get_font_by_family ("helvetica", 18);
|
||||
details->label_font[NAUTILUS_ZOOM_LEVEL_LARGEST] = nautilus_font_factory_get_font_by_family ("helvetica", 18);
|
||||
#endif
|
||||
|
||||
details->smooth_label_font = eel_scalable_font_get_default_font ();
|
||||
|
||||
|
|
@ -4847,7 +4849,9 @@ nautilus_icon_container_start_renaming_selected_item (NautilusIconContainer *con
|
|||
{
|
||||
NautilusIconContainerDetails *details;
|
||||
NautilusIcon *icon;
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
ArtDRect icon_rect;
|
||||
#endif
|
||||
const char *editable_text;
|
||||
|
||||
/* Check if it already in renaming mode. */
|
||||
|
|
@ -4882,6 +4886,7 @@ nautilus_icon_container_start_renaming_selected_item (NautilusIconContainer *con
|
|||
|
||||
details->original_text = g_strdup (editable_text);
|
||||
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
/* Create text renaming widget, if it hasn't been created already.
|
||||
* We deal with the broken icon text item widget by keeping it around
|
||||
* so its contents can still be cut and pasted as part of the clipboard
|
||||
|
|
@ -4913,6 +4918,7 @@ nautilus_icon_container_start_renaming_selected_item (NautilusIconContainer *con
|
|||
gtk_signal_emit (GTK_OBJECT (container),
|
||||
signals[RENAMING_ICON],
|
||||
nautilus_icon_text_item_get_renaming_editable (details->rename_widget));
|
||||
#endif
|
||||
|
||||
nautilus_icon_container_update_icon (container, icon);
|
||||
|
||||
|
|
@ -4925,7 +4931,9 @@ static void
|
|||
end_renaming_mode (NautilusIconContainer *container, gboolean commit)
|
||||
{
|
||||
NautilusIcon *icon;
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
const char *changed_text;
|
||||
#endif
|
||||
|
||||
set_pending_icon_to_rename (container, NULL);
|
||||
|
||||
|
|
@ -4934,7 +4942,8 @@ end_renaming_mode (NautilusIconContainer *container, gboolean commit)
|
|||
return;
|
||||
}
|
||||
|
||||
if (commit) {
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
if (commit) {
|
||||
/* Verify that text has been modified before signalling change. */
|
||||
changed_text = nautilus_icon_text_item_get_text (container->details->rename_widget);
|
||||
if (strcmp (container->details->original_text, changed_text) != 0) {
|
||||
|
|
@ -4946,6 +4955,7 @@ end_renaming_mode (NautilusIconContainer *container, gboolean commit)
|
|||
}
|
||||
|
||||
nautilus_icon_text_item_stop_editing (container->details->rename_widget, TRUE);
|
||||
#endif
|
||||
|
||||
gnome_canvas_item_hide (GNOME_CANVAS_ITEM (container->details->rename_widget));
|
||||
|
||||
|
|
|
|||
2
libnautilus-private/nautilus-marshal.c
Normal file
2
libnautilus-private/nautilus-marshal.c
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
#include "nautilus-marshal.h"
|
||||
#include "nautilus-marshal-guts.c"
|
||||
3
libnautilus-private/nautilus-marshal.h
Normal file
3
libnautilus-private/nautilus-marshal.h
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
#include <gobject/gclosure.h>
|
||||
#include <gobject/gvaluetypes.h>
|
||||
#include "nautilus-marshal-guts.h"
|
||||
|
|
@ -26,7 +26,6 @@
|
|||
|
||||
#include <eel/eel-gtk-macros.h>
|
||||
#include "nautilus-bonobo-extensions.h"
|
||||
#include <libnautilus/nautilus-bonobo-workarounds.h>
|
||||
|
||||
struct NautilusMetafileFactoryDetails {
|
||||
char dummy; /* ANSI C does not allow empty structs */
|
||||
|
|
|
|||
|
|
@ -43,7 +43,6 @@
|
|||
#include <libgnomevfs/gnome-vfs-types.h>
|
||||
#include <libgnomevfs/gnome-vfs-uri.h>
|
||||
#include <libgnomevfs/gnome-vfs.h>
|
||||
#include <libnautilus/nautilus-bonobo-workarounds.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#define METAFILE_XML_VERSION "1.0"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#include <eel/eel-gtk-macros.h>
|
||||
#include <bonobo/bonobo-main.h>
|
||||
#include <gtk/gtksignal.h>
|
||||
#include <libnautilus/nautilus-bonobo-workarounds.h>
|
||||
|
||||
typedef struct {
|
||||
POA_Nautilus_Undo_Context servant;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@
|
|||
#include <eel/eel-gtk-extensions.h>
|
||||
#include <gtk/gtksignal.h>
|
||||
#include <bonobo/bonobo-main.h>
|
||||
#include <libnautilus/nautilus-bonobo-workarounds.h>
|
||||
#include <libnautilus/nautilus-undo-private.h>
|
||||
#include "nautilus-undo-context.h"
|
||||
|
||||
|
|
@ -72,30 +71,7 @@ static void nautilus_undo_manager_class_init (NautilusUndoManagerClass *class);
|
|||
static void nautilus_undo_manager_init (NautilusUndoManager *item);
|
||||
static void destroy (GtkObject *object);
|
||||
|
||||
/* CORBA/Bonobo */
|
||||
static void corba_append (PortableServer_Servant servant,
|
||||
Nautilus_Undo_Transaction transaction,
|
||||
CORBA_Environment *ev);
|
||||
static void corba_forget (PortableServer_Servant servant,
|
||||
Nautilus_Undo_Transaction transaction,
|
||||
CORBA_Environment *ev);
|
||||
static void corba_undo (PortableServer_Servant servant,
|
||||
CORBA_Environment *ev);
|
||||
|
||||
EEL_DEFINE_CLASS_BOILERPLATE (NautilusUndoManager, nautilus_undo_manager, BONOBO_OBJECT_TYPE)
|
||||
|
||||
static PortableServer_ServantBase__epv base_epv;
|
||||
static POA_Nautilus_Undo_Manager__epv epv = {
|
||||
NULL,
|
||||
&corba_append,
|
||||
&corba_forget,
|
||||
&corba_undo,
|
||||
};
|
||||
static POA_Nautilus_Undo_Manager__vepv vepv = {
|
||||
&base_epv,
|
||||
NULL,
|
||||
&epv
|
||||
};
|
||||
EEL_DEFINE_BONOBO_BOILERPLATE (NautilusUndoManager, nautilus_undo_manager, BONOBO_OBJECT_TYPE)
|
||||
|
||||
static void
|
||||
release_transaction (NautilusUndoManager *manager)
|
||||
|
|
@ -198,28 +174,6 @@ nautilus_undo_manager_init (NautilusUndoManager *manager)
|
|||
manager->details = g_new0 (NautilusUndoManagerDetails, 1);
|
||||
}
|
||||
|
||||
static void
|
||||
nautilus_undo_manager_class_init (NautilusUndoManagerClass *klass)
|
||||
{
|
||||
GtkObjectClass *object_class;
|
||||
|
||||
vepv.Bonobo_Unknown_epv = nautilus_bonobo_object_get_epv ();
|
||||
|
||||
object_class = GTK_OBJECT_CLASS (klass);
|
||||
|
||||
object_class->destroy = destroy;
|
||||
|
||||
signals[CHANGED] = g_signal_new
|
||||
("changed",
|
||||
G_TYPE_FROM_CLASS (object_class),
|
||||
G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (NautilusUndoManagerClass,
|
||||
changed),
|
||||
NULL, NULL,
|
||||
gtk_marshal_NONE__NONE,
|
||||
G_TYPE_NONE, 0);
|
||||
}
|
||||
|
||||
void
|
||||
nautilus_undo_manager_undo (NautilusUndoManager *manager)
|
||||
{
|
||||
|
|
@ -388,3 +342,27 @@ nautilus_undo_manager_set_up_bonobo_ui_handler_undo_item (NautilusUndoManager *m
|
|||
GTK_OBJECT (handler));
|
||||
}
|
||||
#endif /* UIH */
|
||||
|
||||
static void
|
||||
nautilus_undo_manager_class_init (NautilusUndoManagerClass *klass)
|
||||
{
|
||||
GtkObjectClass *object_class;
|
||||
|
||||
object_class = GTK_OBJECT_CLASS (klass);
|
||||
|
||||
object_class->destroy = destroy;
|
||||
|
||||
signals[CHANGED] = g_signal_new
|
||||
("changed",
|
||||
G_TYPE_FROM_CLASS (object_class),
|
||||
G_SIGNAL_RUN_LAST,
|
||||
G_STRUCT_OFFSET (NautilusUndoManagerClass,
|
||||
changed),
|
||||
NULL, NULL,
|
||||
gtk_marshal_NONE__NONE,
|
||||
G_TYPE_NONE, 0);
|
||||
|
||||
klass->epv.append = corba_append;
|
||||
klass->epv.forget = corba_forget;
|
||||
klass->epv.undo = corba_undo;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,368 +0,0 @@
|
|||
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
|
||||
|
||||
/*
|
||||
* libnautilus: A library for nautilus view implementations.
|
||||
*
|
||||
* Copyright (C) 2000, 2001 Eazel, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; if not, write to the Free
|
||||
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* Author: Darin Adler <darin@bentspoon.com>
|
||||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include "nautilus-bonobo-workarounds.h"
|
||||
|
||||
#include <bonobo/bonobo-stream.h>
|
||||
#include <gtk/gtkmain.h>
|
||||
#include <gtk/gtksignal.h>
|
||||
|
||||
#define RELY_ON_BONOBO_INTERNALS
|
||||
|
||||
#ifdef RELY_ON_BONOBO_INTERNALS
|
||||
|
||||
/* This is incredibly unsafe and relies on details of the Bonobo
|
||||
* internals. I should be shot and killed for even thinking of doing
|
||||
* this.
|
||||
*/
|
||||
typedef struct {
|
||||
int ref_count;
|
||||
GList *objs;
|
||||
} StartOfBonoboAggregateObject;
|
||||
|
||||
typedef struct {
|
||||
StartOfBonoboAggregateObject *ao;
|
||||
int destroy_id;
|
||||
} StartOfBonoboObjectPrivate;
|
||||
|
||||
#endif
|
||||
|
||||
/* By waiting a minute before self-destructing, we minimize the race
|
||||
* conditions that can occur if we self-destruct right when we notice
|
||||
* an X window going away.
|
||||
*/
|
||||
#define MINIMIZE_RACE_CONDITIONS_DELAY 60000
|
||||
|
||||
/* FIXME bugzilla.gnome.org 42456: Is a hard-coded 20 seconds wait to
|
||||
* detect that a remote object's process is hung acceptable? Can a
|
||||
* component that is working still take 20 seconds to respond?
|
||||
*/
|
||||
/* in milliseconds */
|
||||
#define REMOTE_CHECK_TIME_INTERVAL 20000
|
||||
#define REMOTE_CHECK_DATA_KEY "nautilus-bonobo-workarounds/RemoteCheckData"
|
||||
|
||||
typedef struct {
|
||||
BonoboObject *object;
|
||||
Bonobo_Unknown remote_object;
|
||||
guint timeout_id;
|
||||
guint destroy_handler_id;
|
||||
NautilusBonoboObjectCallback function;
|
||||
gpointer callback_data;
|
||||
} RemoteCheckData;
|
||||
|
||||
typedef struct {
|
||||
BonoboObject *object;
|
||||
guint timeout_id;
|
||||
guint destroy_handler_id;
|
||||
} DestroyLaterData;
|
||||
|
||||
/* The following is the most evil function in the world. But on the
|
||||
* other hand, it works and prevents us from having tons of lingering
|
||||
* processes when Nautilus crashes. It's unsafe to call it if there
|
||||
* are any direct references to the bonobo object, but it's OK to have
|
||||
* any number of references to it through CORBA.
|
||||
*/
|
||||
|
||||
#ifndef RELY_ON_BONOBO_INTERNALS
|
||||
|
||||
/* This version of the function doesn't rely on Bonobo internals as
|
||||
* much as the other one does, but it gets screwed up by incoming
|
||||
* unref calls while the object is being destroyed. This was actually
|
||||
* happening, which is why I had to write the other version.
|
||||
*/
|
||||
|
||||
static void
|
||||
set_gone_flag (GtkObject *object,
|
||||
gpointer callback_data)
|
||||
{
|
||||
gboolean *gone_flag;
|
||||
|
||||
gone_flag = callback_data;
|
||||
*gone_flag = TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
nautilus_bonobo_object_force_destroy (BonoboObject *object)
|
||||
{
|
||||
gboolean gone;
|
||||
|
||||
if (object == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
g_return_if_fail (BONOBO_IS_OBJECT (object));
|
||||
g_return_if_fail (!GTK_OBJECT_DESTROYED (object));
|
||||
|
||||
gone = FALSE;
|
||||
gtk_signal_connect (GTK_OBJECT (object), "destroy",
|
||||
set_gone_flag, &gone);
|
||||
do {
|
||||
bonobo_object_unref (object);
|
||||
} while (!gone);
|
||||
}
|
||||
|
||||
#else /* RELY_ON_BONOBO_INTERNALS */
|
||||
|
||||
void
|
||||
nautilus_bonobo_object_force_destroy (BonoboObject *object)
|
||||
{
|
||||
StartOfBonoboAggregateObject *aggregate;
|
||||
GList *node;
|
||||
GtkObject *subobject;
|
||||
guint *id;
|
||||
|
||||
if (object == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
g_return_if_fail (BONOBO_IS_OBJECT (object));
|
||||
|
||||
aggregate = ((StartOfBonoboObjectPrivate *) object->priv)->ao;
|
||||
|
||||
/* Do all the destroying with a normal reference count. This
|
||||
* lets us live through unrefs that happen during the destroy
|
||||
* process.
|
||||
*/
|
||||
bonobo_object_ref (object);
|
||||
for (node = aggregate->objs; node != NULL; node = node->next) {
|
||||
subobject = GTK_OBJECT (node->data);
|
||||
id = &((StartOfBonoboObjectPrivate *) BONOBO_OBJECT (subobject)->priv)->destroy_id;
|
||||
if (*id != 0) {
|
||||
gtk_signal_disconnect (subobject, *id);
|
||||
*id = 0;
|
||||
}
|
||||
gtk_object_destroy (subobject);
|
||||
}
|
||||
|
||||
/* Now force a destroy by forcing the reference count to 1. */
|
||||
aggregate->ref_count = 1;
|
||||
bonobo_object_unref (object);
|
||||
}
|
||||
|
||||
#endif /* RELY_ON_BONOBO_INTERNALS */
|
||||
|
||||
static gboolean
|
||||
destroy_later_callback (gpointer callback_data)
|
||||
{
|
||||
DestroyLaterData *data;
|
||||
|
||||
data = callback_data;
|
||||
g_assert (BONOBO_IS_OBJECT (data->object));
|
||||
|
||||
gtk_signal_disconnect (GTK_OBJECT (data->object),
|
||||
data->destroy_handler_id);
|
||||
nautilus_bonobo_object_force_destroy (data->object);
|
||||
g_free (data);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
destroyed_before_timeout_callback (GtkObject *object,
|
||||
gpointer callback_data)
|
||||
{
|
||||
DestroyLaterData *data;
|
||||
|
||||
data = callback_data;
|
||||
g_assert (data->object == BONOBO_OBJECT (object));
|
||||
|
||||
gtk_timeout_remove (data->timeout_id);
|
||||
g_free (data);
|
||||
}
|
||||
|
||||
void
|
||||
nautilus_bonobo_object_force_destroy_later (BonoboObject *object)
|
||||
{
|
||||
DestroyLaterData *data;
|
||||
|
||||
if (object == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
g_return_if_fail (BONOBO_IS_OBJECT (object));
|
||||
g_return_if_fail (!GTK_OBJECT_DESTROYED (object));
|
||||
|
||||
data = g_new (DestroyLaterData, 1);
|
||||
data->object = object;
|
||||
data->timeout_id = gtk_timeout_add
|
||||
(MINIMIZE_RACE_CONDITIONS_DELAY,
|
||||
destroy_later_callback, data);
|
||||
data->destroy_handler_id = g_signal_connect
|
||||
(G_OBJECT (object), "destroy",
|
||||
G_CALLBACK (destroyed_before_timeout_callback), data);
|
||||
}
|
||||
|
||||
/* Same as bonobo_unknown_ping, but this one works. */
|
||||
static gboolean
|
||||
object_is_gone (Bonobo_Unknown object)
|
||||
{
|
||||
CORBA_Environment ev;
|
||||
gboolean gone;
|
||||
|
||||
CORBA_exception_init (&ev);
|
||||
gone = CORBA_Object_non_existent (object, &ev);
|
||||
if (ev._major != CORBA_NO_EXCEPTION) {
|
||||
gone = TRUE;
|
||||
}
|
||||
CORBA_exception_free (&ev);
|
||||
|
||||
return gone;
|
||||
}
|
||||
|
||||
static void
|
||||
remote_check_data_free (RemoteCheckData *data)
|
||||
{
|
||||
CORBA_Environment ev;
|
||||
|
||||
if (data == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
gtk_object_remove_data (GTK_OBJECT (data->object), REMOTE_CHECK_DATA_KEY);
|
||||
|
||||
CORBA_exception_init (&ev);
|
||||
CORBA_Object_release (data->remote_object, &ev);
|
||||
CORBA_exception_free (&ev);
|
||||
|
||||
if (data->timeout_id != 0) {
|
||||
g_source_remove (data->timeout_id);
|
||||
}
|
||||
|
||||
if (data->destroy_handler_id != 0) {
|
||||
gtk_signal_disconnect (GTK_OBJECT (data->object),
|
||||
data->destroy_handler_id);
|
||||
}
|
||||
|
||||
g_free (data);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
remote_check_timed_callback (gpointer callback_data)
|
||||
{
|
||||
RemoteCheckData *data;
|
||||
BonoboObject *object;
|
||||
NautilusBonoboObjectCallback function;
|
||||
gpointer function_data;
|
||||
|
||||
data = callback_data;
|
||||
g_assert (BONOBO_IS_OBJECT (data->object));
|
||||
g_assert (!GTK_OBJECT_DESTROYED (data->object));
|
||||
g_assert (data->remote_object != CORBA_OBJECT_NIL);
|
||||
g_assert (data->timeout_id != 0);
|
||||
g_assert (data->destroy_handler_id != 0);
|
||||
g_assert (data->function != NULL);
|
||||
|
||||
if (!object_is_gone (data->remote_object)) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
object = data->object;
|
||||
function = data->function;
|
||||
function_data = data->callback_data;
|
||||
|
||||
data->timeout_id = 0;
|
||||
remote_check_data_free (data);
|
||||
|
||||
(* function) (object, function_data);
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
remote_check_destroy_callback (GtkObject *object,
|
||||
gpointer callback_data)
|
||||
{
|
||||
RemoteCheckData *data;
|
||||
|
||||
g_assert (BONOBO_IS_OBJECT (object));
|
||||
|
||||
data = callback_data;
|
||||
g_assert (data->object == BONOBO_OBJECT (object));
|
||||
g_assert (data->remote_object != CORBA_OBJECT_NIL);
|
||||
g_assert (data->timeout_id != 0);
|
||||
g_assert (data->destroy_handler_id != 0);
|
||||
g_assert (data->function != NULL);
|
||||
|
||||
remote_check_data_free (data);
|
||||
}
|
||||
|
||||
void
|
||||
nautilus_bonobo_object_call_when_remote_object_disappears (BonoboObject *object,
|
||||
Bonobo_Unknown remote_object,
|
||||
NautilusBonoboObjectCallback function,
|
||||
gpointer callback_data)
|
||||
{
|
||||
RemoteCheckData *data;
|
||||
CORBA_Environment ev;
|
||||
|
||||
g_return_if_fail (BONOBO_IS_OBJECT (object));
|
||||
|
||||
data = gtk_object_get_data (GTK_OBJECT (object), REMOTE_CHECK_DATA_KEY);
|
||||
|
||||
if (GTK_OBJECT_DESTROYED (object)
|
||||
|| remote_object == CORBA_OBJECT_NIL
|
||||
|| function == NULL) {
|
||||
remote_check_data_free (data);
|
||||
return;
|
||||
}
|
||||
|
||||
if (data == NULL) {
|
||||
data = g_new0 (RemoteCheckData, 1);
|
||||
data->object = object;
|
||||
}
|
||||
CORBA_exception_init (&ev);
|
||||
data->remote_object = CORBA_Object_duplicate (remote_object, &ev);
|
||||
CORBA_exception_free (&ev);
|
||||
data->function = function;
|
||||
data->callback_data = callback_data;
|
||||
|
||||
if (data->timeout_id == 0) {
|
||||
data->timeout_id = g_timeout_add
|
||||
(REMOTE_CHECK_TIME_INTERVAL,
|
||||
remote_check_timed_callback, data);
|
||||
}
|
||||
if (data->destroy_handler_id == 0) {
|
||||
data->destroy_handler_id = g_signal_connect
|
||||
(G_OBJECT (object), "destroy",
|
||||
G_CALLBACK (remote_check_destroy_callback), data);
|
||||
}
|
||||
|
||||
gtk_object_set_data (GTK_OBJECT (object), REMOTE_CHECK_DATA_KEY, data);
|
||||
}
|
||||
|
||||
static void
|
||||
force_destroy_cover (BonoboObject *object,
|
||||
gpointer callback_data)
|
||||
{
|
||||
nautilus_bonobo_object_force_destroy (object);
|
||||
}
|
||||
|
||||
void
|
||||
nautilus_bonobo_object_force_destroy_when_owner_disappears (BonoboObject *object,
|
||||
Bonobo_Unknown owner)
|
||||
{
|
||||
nautilus_bonobo_object_call_when_remote_object_disappears
|
||||
(object, owner, force_destroy_cover, NULL);
|
||||
}
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
|
||||
|
||||
/*
|
||||
* libnautilus: A library for nautilus view implementations.
|
||||
*
|
||||
* Copyright (C) 2000, 2001 Eazel, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library 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
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; if not, write to the Free
|
||||
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* Author: Darin Adler <darin@bentspoon.com>
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef NAUTILUS_BONOBO_WORKAROUNDS_H
|
||||
#define NAUTILUS_BONOBO_WORKAROUNDS_H
|
||||
|
||||
#include <bonobo/bonobo-object.h>
|
||||
|
||||
typedef void (* NautilusBonoboObjectCallback) (BonoboObject *object,
|
||||
gpointer callback_data);
|
||||
|
||||
/* Gets a single global one. */
|
||||
POA_Bonobo_Unknown__epv *nautilus_bonobo_object_get_epv (void);
|
||||
POA_Bonobo_Stream__epv * nautilus_bonobo_stream_get_epv (void);
|
||||
|
||||
/* Bonobo will address this problem some day. */
|
||||
void nautilus_bonobo_object_force_destroy (BonoboObject *object);
|
||||
void nautilus_bonobo_object_force_destroy_later (BonoboObject *object);
|
||||
void nautilus_bonobo_object_call_when_remote_object_disappears (BonoboObject *object,
|
||||
Bonobo_Unknown remote_object,
|
||||
NautilusBonoboObjectCallback function,
|
||||
gpointer callback_data);
|
||||
void nautilus_bonobo_object_force_destroy_when_owner_disappears (BonoboObject *object,
|
||||
Bonobo_Unknown owner);
|
||||
|
||||
#endif /* NAUTILUS_BONOBO_WORKAROUNDS_H */
|
||||
|
|
@ -59,11 +59,6 @@ struct NautilusViewDetails {
|
|||
NautilusIdleQueue *outgoing_queue;
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
POA_Nautilus_View servant;
|
||||
NautilusView *bonobo_object;
|
||||
} impl_POA_Nautilus_View;
|
||||
|
||||
typedef void (* ViewFunction) (NautilusView *view,
|
||||
gpointer callback_data);
|
||||
|
||||
|
|
@ -102,7 +97,7 @@ queue_incoming_call (PortableServer_Servant servant,
|
|||
{
|
||||
NautilusView *view;
|
||||
|
||||
view = ((impl_POA_Nautilus_View *) servant)->bonobo_object;
|
||||
view = NAUTILUS_VIEW (bonobo_object_from_servant (bonobo_object));
|
||||
|
||||
nautilus_idle_queue_add (view->details->incoming_queue,
|
||||
(GFunc) call,
|
||||
|
|
|
|||
|
|
@ -2283,6 +2283,7 @@ icon_view_move_copy_items (NautilusIconContainer *container,
|
|||
static void
|
||||
fm_icon_view_update_icon_container_fonts (FMIconView *icon_view)
|
||||
{
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
/* font size table - this isn't exactly proportional, but it looks better than computed */
|
||||
static guint font_size_table[NAUTILUS_ZOOM_LEVEL_LARGEST + 1] = {
|
||||
8, 8, 10, 12, 14, 18, 18 };
|
||||
|
|
@ -2301,6 +2302,7 @@ fm_icon_view_update_icon_container_fonts (FMIconView *icon_view)
|
|||
}
|
||||
|
||||
nautilus_icon_container_request_update_all (icon_container);
|
||||
#endif
|
||||
}
|
||||
|
||||
static int default_zoom_level_font_size = 12;
|
||||
|
|
|
|||
|
|
@ -49,6 +49,10 @@
|
|||
#include <libnautilus-private/nautilus-icon-factory.h>
|
||||
#include <libnautilus-private/nautilus-metadata.h>
|
||||
|
||||
/* Turn this whole file off until we finish with EelList and EelCList or port. */
|
||||
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
|
||||
struct FMListViewDetails {
|
||||
int sort_column;
|
||||
gboolean sort_reversed;
|
||||
|
|
@ -2275,3 +2279,5 @@ real_get_column_specification (FMListView *view,
|
|||
g_assert_not_reached ();
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -2522,6 +2522,7 @@ set_icon_callback (const char* icon_path, FMPropertiesWindow *properties_window)
|
|||
static void
|
||||
select_image_button_callback (GtkWidget *widget, FMPropertiesWindow *properties_window)
|
||||
{
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
GtkWidget *dialog;
|
||||
|
||||
g_assert (FM_IS_PROPERTIES_WINDOW (properties_window));
|
||||
|
|
@ -2531,6 +2532,7 @@ select_image_button_callback (GtkWidget *widget, FMPropertiesWindow *properties_
|
|||
GTK_WINDOW (properties_window),
|
||||
(EelIconSelectionFunction) set_icon_callback,
|
||||
properties_window);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@
|
|||
#include <eel/eel-stock-dialogs.h>
|
||||
#include <eel/eel-string.h>
|
||||
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
|
||||
/* FIXME bugzilla.gnome.org 42815: This code uses part of the
|
||||
* NautilusSearchBarCriterion class, which is really for complex
|
||||
* search bar user interface. We only need to do some non-UI
|
||||
|
|
@ -804,3 +806,5 @@ reveal_selected_items_callback (BonoboUIComponent *component, gpointer user_data
|
|||
|
||||
nautilus_file_list_free (selection);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -115,12 +115,14 @@ create_object (PortableServer_Servant servant,
|
|||
} else if (strcmp (iid, NAUTILUS_DESKTOP_ICON_VIEW_IID) == 0) {
|
||||
directory_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_desktop_icon_view_get_type (), NULL));
|
||||
object = BONOBO_OBJECT (fm_directory_view_get_nautilus_view (directory_view));
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
} else if (strcmp (iid, NAUTILUS_LIST_VIEW_IID) == 0) {
|
||||
directory_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_list_view_get_type (), NULL));
|
||||
object = BONOBO_OBJECT (fm_directory_view_get_nautilus_view (directory_view));
|
||||
} else if (strcmp (iid, SEARCH_LIST_VIEW_IID) == 0) {
|
||||
directory_view = FM_DIRECTORY_VIEW (gtk_object_new (fm_search_list_view_get_type (), NULL));
|
||||
object = BONOBO_OBJECT (fm_directory_view_get_nautilus_view (directory_view));
|
||||
#endif
|
||||
} else if (strcmp (iid, SHELL_IID) == 0) {
|
||||
application = NAUTILUS_APPLICATION (bonobo_object_from_servant (servant));
|
||||
object = BONOBO_OBJECT (nautilus_shell_new (application));
|
||||
|
|
|
|||
|
|
@ -28,9 +28,14 @@
|
|||
#include <config.h>
|
||||
#include "nautilus-complex-search-bar.h"
|
||||
|
||||
#include "gtkhwrapbox.h"
|
||||
#include "nautilus-search-bar-criterion-private.h"
|
||||
#include "nautilus-search-bar-criterion.h"
|
||||
#include "nautilus-window-private.h"
|
||||
#include <eel/eel-gdk-pixbuf-extensions.h>
|
||||
#include <eel/eel-gtk-extensions.h>
|
||||
#include <eel/eel-gtk-macros.h>
|
||||
#include <eel/eel-string.h>
|
||||
#include <gdk-pixbuf/gdk-pixbuf.h>
|
||||
#include <glib.h>
|
||||
#include <gtk/gtkeventbox.h>
|
||||
|
|
@ -39,14 +44,9 @@
|
|||
#include <libgnome/gnome-i18n.h>
|
||||
#include <libgnomeui/gnome-uidefs.h>
|
||||
#include <libgnomevfs/gnome-vfs-utils.h>
|
||||
#include <libnautilus/nautilus-clipboard.h>
|
||||
#include <eel/eel-gdk-pixbuf-extensions.h>
|
||||
#include <libnautilus-private/nautilus-global-preferences.h>
|
||||
#include <eel/eel-gtk-extensions.h>
|
||||
#include <eel/eel-gtk-macros.h>
|
||||
#include <eel/eel-string.h>
|
||||
#include <libnautilus-private/nautilus-undo-signal-handlers.h>
|
||||
#include "gtkhwrapbox.h"
|
||||
#include <libnautilus/nautilus-clipboard.h>
|
||||
|
||||
struct NautilusComplexSearchBarDetails {
|
||||
GtkVBox *bar_container;
|
||||
|
|
|
|||
|
|
@ -1011,6 +1011,8 @@ nautilus_color_selection_dialog_new (NautilusPropertyBrowser *property_browser)
|
|||
return dialog;
|
||||
}
|
||||
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
|
||||
/* add the newly selected file to the browser images */
|
||||
static void
|
||||
add_pattern_to_browser (const char *path_name, gpointer *data)
|
||||
|
|
@ -1084,6 +1086,8 @@ add_pattern_to_browser (const char *path_name, gpointer *data)
|
|||
nautilus_property_browser_update_contents (property_browser);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* here's where we initiate adding a new pattern by putting up a file selector */
|
||||
|
||||
static void
|
||||
|
|
@ -1095,6 +1099,7 @@ add_new_pattern (NautilusPropertyBrowser *property_browser)
|
|||
gdk_window_raise(property_browser->details->dialog->window);
|
||||
}
|
||||
} else {
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
property_browser->details->dialog =
|
||||
eel_gnome_icon_selector_new (_("Select an image file to add as a pattern:"),
|
||||
DATADIR "/pixmaps/tiles/",
|
||||
|
|
@ -1102,7 +1107,8 @@ add_new_pattern (NautilusPropertyBrowser *property_browser)
|
|||
(EelIconSelectionFunction) add_pattern_to_browser,
|
||||
property_browser);
|
||||
|
||||
eel_nullify_when_destroyed (&property_browser->details->dialog);
|
||||
eel_nullify_when_destroyed (&property_browser->details->dialog);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@
|
|||
#include <libgnomeui/gnome-uidefs.h>
|
||||
#include <libnautilus-private/nautilus-file-utilities.h>
|
||||
#include <libnautilus-private/nautilus-global-preferences.h>
|
||||
#include <libnautilus/nautilus-bonobo-workarounds.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
/* turn this on to enable the caveat dialog */
|
||||
|
|
|
|||
|
|
@ -161,6 +161,8 @@ smooth_font_changed_callback (gpointer callback_data)
|
|||
gtk_object_unref (GTK_OBJECT (new_bold_font));
|
||||
}
|
||||
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
|
||||
static GdkFont *
|
||||
get_non_smooth_font (int font_size)
|
||||
{
|
||||
|
|
@ -176,9 +178,7 @@ static void
|
|||
non_smooth_font_changed_callback (gpointer callback_data)
|
||||
{
|
||||
NautilusSidebarTitle *sidebar_title;
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
GdkFont *new_font;
|
||||
#endif
|
||||
|
||||
g_return_if_fail (NAUTILUS_IS_SIDEBAR_TITLE (callback_data));
|
||||
|
||||
|
|
@ -188,14 +188,14 @@ non_smooth_font_changed_callback (gpointer callback_data)
|
|||
update_title_font (sidebar_title);
|
||||
|
||||
/* Update the fixed-size "more info" font */
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
new_font = get_non_smooth_font (MORE_INFO_FONT_SIZE);
|
||||
eel_gtk_widget_set_font (sidebar_title->details->more_info_label,
|
||||
new_font);
|
||||
gdk_font_unref (new_font);
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static void
|
||||
nautilus_sidebar_title_init (NautilusSidebarTitle *sidebar_title)
|
||||
{
|
||||
|
|
@ -240,10 +240,12 @@ nautilus_sidebar_title_init (NautilusSidebarTitle *sidebar_title)
|
|||
|
||||
/* Keep track of changes in graphics trade offs */
|
||||
update_all (sidebar_title);
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_DEFAULT_FONT,
|
||||
non_smooth_font_changed_callback,
|
||||
sidebar_title,
|
||||
GTK_OBJECT (sidebar_title));
|
||||
#endif
|
||||
eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT,
|
||||
smooth_font_changed_callback,
|
||||
sidebar_title,
|
||||
|
|
@ -256,7 +258,9 @@ nautilus_sidebar_title_init (NautilusSidebarTitle *sidebar_title)
|
|||
/* initialize the label colors & fonts */
|
||||
nautilus_sidebar_title_theme_changed (sidebar_title);
|
||||
smooth_font_changed_callback (sidebar_title);
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
non_smooth_font_changed_callback (sidebar_title);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* destroy by throwing away private storage */
|
||||
|
|
@ -532,9 +536,11 @@ static void
|
|||
update_title_font (NautilusSidebarTitle *sidebar_title)
|
||||
{
|
||||
int available_width;
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
GdkFont *template_font;
|
||||
GdkFont *bold_template_font;
|
||||
GdkFont *largest_fitting_font;
|
||||
#endif
|
||||
int largest_fitting_smooth_font_size;
|
||||
EelScalableFont *smooth_font;
|
||||
|
||||
|
|
@ -564,6 +570,7 @@ update_title_font (NautilusSidebarTitle *sidebar_title)
|
|||
|
||||
gtk_object_unref (GTK_OBJECT (smooth_font));
|
||||
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
/* Update the regular font */
|
||||
template_font = get_non_smooth_font (MAX_TITLE_FONT_SIZE);
|
||||
bold_template_font = eel_gdk_font_get_bold (template_font);
|
||||
|
|
@ -579,14 +586,13 @@ update_title_font (NautilusSidebarTitle *sidebar_title)
|
|||
largest_fitting_font = eel_gdk_font_get_fixed ();
|
||||
}
|
||||
|
||||
#if GNOME2_CONVERSION_COMPLETE
|
||||
eel_gtk_widget_set_font (sidebar_title->details->title_label,
|
||||
largest_fitting_font);
|
||||
#endif
|
||||
|
||||
gdk_font_unref (largest_fitting_font);
|
||||
gdk_font_unref (bold_template_font);
|
||||
gdk_font_unref (template_font);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -29,14 +29,24 @@
|
|||
representing a data view frame. */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "nautilus-view-frame-private.h"
|
||||
|
||||
#include "nautilus-window.h"
|
||||
#include <bonobo/bonobo-main.h>
|
||||
#include <gtk/gtksignal.h>
|
||||
#include <libnautilus/nautilus-bonobo-workarounds.h>
|
||||
#include <libnautilus/nautilus-view.h>
|
||||
#include <eel/eel-gtk-extensions.h>
|
||||
#include <eel/eel-gtk-macros.h>
|
||||
#include <gtk/gtksignal.h>
|
||||
#include <libnautilus/nautilus-view.h>
|
||||
|
||||
typedef struct {
|
||||
BonoboObject parent;
|
||||
NautilusViewFrame *widget;
|
||||
} NautilusViewFrameCorbaPart;
|
||||
|
||||
typedef struct {
|
||||
BonoboObjectClass parent;
|
||||
POA_Nautilus_ViewFrame__epv epv;
|
||||
} NautilusViewFrameCorbaPartClass;
|
||||
|
||||
typedef struct {
|
||||
char *from_location;
|
||||
|
|
@ -356,20 +366,50 @@ impl_Nautilus_ViewFrame_go_back (PortableServer_Servant servant,
|
|||
(servant, go_back, NULL, NULL);
|
||||
}
|
||||
|
||||
void
|
||||
nautilus_view_frame_set_up_epv (POA_Nautilus_ViewFrame__epv *epv)
|
||||
static void
|
||||
nautilus_view_frame_corba_part_class_init (NautilusViewFrameCorbaPartClass *class)
|
||||
{
|
||||
epv->open_location_in_this_window = impl_Nautilus_ViewFrame_open_location_in_this_window;
|
||||
epv->open_location_prefer_existing_window = impl_Nautilus_ViewFrame_open_location_prefer_existing_window;
|
||||
epv->open_location_force_new_window = impl_Nautilus_ViewFrame_open_location_force_new_window;
|
||||
epv->report_location_change = impl_Nautilus_ViewFrame_report_location_change;
|
||||
epv->report_redirect = impl_Nautilus_ViewFrame_report_redirect;
|
||||
epv->report_selection_change = impl_Nautilus_ViewFrame_report_selection_change;
|
||||
epv->report_status = impl_Nautilus_ViewFrame_report_status;
|
||||
epv->report_load_underway = impl_Nautilus_ViewFrame_report_load_underway;
|
||||
epv->report_load_progress = impl_Nautilus_ViewFrame_report_load_progress;
|
||||
epv->report_load_complete = impl_Nautilus_ViewFrame_report_load_complete;
|
||||
epv->report_load_failed = impl_Nautilus_ViewFrame_report_load_failed;
|
||||
epv->set_title = impl_Nautilus_ViewFrame_set_title;
|
||||
epv->go_back = impl_Nautilus_ViewFrame_go_back;
|
||||
class->epv.open_location_in_this_window = impl_Nautilus_ViewFrame_open_location_in_this_window;
|
||||
class->epv.open_location_prefer_existing_window = impl_Nautilus_ViewFrame_open_location_prefer_existing_window;
|
||||
class->epv.open_location_force_new_window = impl_Nautilus_ViewFrame_open_location_force_new_window;
|
||||
class->epv.report_location_change = impl_Nautilus_ViewFrame_report_location_change;
|
||||
class->epv.report_redirect = impl_Nautilus_ViewFrame_report_redirect;
|
||||
class->epv.report_selection_change = impl_Nautilus_ViewFrame_report_selection_change;
|
||||
class->epv.report_status = impl_Nautilus_ViewFrame_report_status;
|
||||
class->epv.report_load_underway = impl_Nautilus_ViewFrame_report_load_underway;
|
||||
class->epv.report_load_progress = impl_Nautilus_ViewFrame_report_load_progress;
|
||||
class->epv.report_load_complete = impl_Nautilus_ViewFrame_report_load_complete;
|
||||
class->epv.report_load_failed = impl_Nautilus_ViewFrame_report_load_failed;
|
||||
class->epv.set_title = impl_Nautilus_ViewFrame_set_title;
|
||||
class->epv.go_back = impl_Nautilus_ViewFrame_go_back;
|
||||
}
|
||||
|
||||
static void
|
||||
nautilus_view_frame_corba_part_init (NautilusViewFrameCorbaPart *frame)
|
||||
{
|
||||
}
|
||||
|
||||
static GType nautilus_view_frame_corba_part_get_type (void);
|
||||
|
||||
EEL_DEFINE_BONOBO_BOILERPLATE (NautilusViewFrameCorbaPart,
|
||||
nautilus_view_frame_corba_part,
|
||||
BONOBO_OBJECT_TYPE)
|
||||
|
||||
#define NAUTILUS_TYPE_VIEW_FRAME_CORBA_PART nautilus_view_frame_corba_part_get_type ()
|
||||
#define NAUTILUS_VIEW_FRAME_CORBA_PART(object) G_TYPE_CHECK_INSTANCE_CAST ((object), NAUTILUS_TYPE_VIEW_FRAME_CORBA_PART, NautilusViewFrameCorbaPart)
|
||||
|
||||
BonoboObject *
|
||||
nautilus_view_frame_create_corba_part (NautilusViewFrame *widget)
|
||||
{
|
||||
NautilusViewFrameCorbaPart *part;
|
||||
|
||||
part = NAUTILUS_VIEW_FRAME_CORBA_PART (gtk_object_new (NAUTILUS_TYPE_VIEW_FRAME_CORBA_PART, NULL));
|
||||
part->widget = widget;
|
||||
return BONOBO_OBJECT (part);
|
||||
}
|
||||
|
||||
NautilusViewFrame *
|
||||
nautilus_view_frame_from_servant (PortableServer_Servant servant)
|
||||
{
|
||||
return NAUTILUS_VIEW_FRAME_CORBA_PART (bonobo_object_from_servant (servant))->widget;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,9 +40,8 @@ void nautilus_view_frame_queue_incoming_call (Portable
|
|||
gpointer callback_data,
|
||||
GDestroyNotify destroy_callback_data);
|
||||
|
||||
BonoboObject *nautilus_view_frame_create_corba_part (NautilusViewFrame *widget,
|
||||
CORBA_Environment *ev);
|
||||
void nautilus_view_frame_set_up_epv (POA_Nautilus_ViewFrame__epv *epv);
|
||||
BonoboObject *nautilus_view_frame_create_corba_part (NautilusViewFrame *widget);
|
||||
NautilusViewFrame *nautilus_view_frame_from_servant (PortableServer_Servant servant);
|
||||
|
||||
/* ViewFrame */
|
||||
void nautilus_view_frame_open_location_in_this_window (NautilusViewFrame *view,
|
||||
|
|
|
|||
|
|
@ -45,7 +45,6 @@
|
|||
#include <libnautilus-private/nautilus-bonobo-extensions.h>
|
||||
#include <libnautilus-private/nautilus-marshal.h>
|
||||
#include <libnautilus-private/nautilus-undo-manager.h>
|
||||
#include <libnautilus/nautilus-bonobo-workarounds.h>
|
||||
#include <libnautilus/nautilus-idle-queue.h>
|
||||
#include <libnautilus/nautilus-view.h>
|
||||
#include <string.h>
|
||||
|
|
@ -119,12 +118,6 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusViewFrame,
|
|||
nautilus_view_frame,
|
||||
EEL_TYPE_GENEROUS_BIN)
|
||||
|
||||
static NautilusViewFrame *
|
||||
get_widget_from_servant (PortableServer_Servant servant)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void
|
||||
nautilus_view_frame_queue_incoming_call (PortableServer_Servant servant,
|
||||
NautilusViewFrameFunction call,
|
||||
|
|
@ -133,7 +126,7 @@ nautilus_view_frame_queue_incoming_call (PortableServer_Servant servant,
|
|||
{
|
||||
NautilusViewFrame *view;
|
||||
|
||||
view = get_widget_from_servant (servant);
|
||||
view = nautilus_view_frame_from_servant (servant);
|
||||
if (view == NULL) {
|
||||
if (destroy_callback_data != NULL) {
|
||||
(* destroy_callback_data) (callback_data);
|
||||
|
|
@ -360,8 +353,6 @@ destroy_view (NautilusViewFrame *view)
|
|||
CORBA_exception_free (&ev);
|
||||
view->details->view = CORBA_OBJECT_NIL;
|
||||
|
||||
nautilus_bonobo_object_call_when_remote_object_disappears
|
||||
(view->details->view_frame, CORBA_OBJECT_NIL, NULL, NULL);
|
||||
bonobo_object_unref (view->details->view_frame);
|
||||
view->details->view_frame = NULL;
|
||||
view->details->control_frame = NULL;
|
||||
|
|
@ -662,8 +653,7 @@ create_corba_objects (NautilusViewFrame *view)
|
|||
CORBA_exception_init (&ev);
|
||||
|
||||
/* Create a view frame. */
|
||||
view->details->view_frame = nautilus_view_frame_create_corba_part (view, &ev);
|
||||
g_assert (ev._major == CORBA_NO_EXCEPTION);
|
||||
view->details->view_frame = nautilus_view_frame_create_corba_part (view);
|
||||
|
||||
/* Create a control frame. */
|
||||
control = Bonobo_Unknown_queryInterface
|
||||
|
|
@ -720,13 +710,6 @@ queue_view_frame_failed (NautilusViewFrame *view)
|
|||
gtk_idle_add (view_frame_failed_callback, view);
|
||||
}
|
||||
|
||||
static void
|
||||
view_frame_failed_cover (BonoboObject *object,
|
||||
gpointer callback_data)
|
||||
{
|
||||
view_frame_failed (NAUTILUS_VIEW_FRAME (callback_data));
|
||||
}
|
||||
|
||||
static gboolean
|
||||
check_socket_gone_idle_callback (gpointer callback_data)
|
||||
{
|
||||
|
|
@ -852,12 +835,6 @@ attach_view (NautilusViewFrame *view,
|
|||
gtk_container_add (GTK_CONTAINER (view), widget);
|
||||
|
||||
view_frame_activated (view);
|
||||
|
||||
nautilus_bonobo_object_call_when_remote_object_disappears
|
||||
(view->details->view_frame,
|
||||
view->details->view,
|
||||
view_frame_failed_cover,
|
||||
view);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
|||
Loading…
Reference in a new issue