Mailinglist Archive: opensuse-commit (1083 mails)
| < Previous | Next > |
commit gnome-vfsmm
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 17 Sep 2007 17:42:09 +0200
- Message-id: <20070917154209.8AD02678331@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package gnome-vfsmm
checked in at Mon Sep 17 17:42:09 CEST 2007.
--------
--- GNOME/gnome-vfsmm/gnome-vfsmm.changes 2007-08-31 19:31:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-vfsmm/gnome-vfsmm.changes 2007-09-17 17:28:29.764551000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 17 17:28:07 CEST 2007 - maw@xxxxxxx
+
+- Update to version 2.20.0:
+ + Cosmetic version update.
+
+-------------------------------------------------------------------
Old:
----
gnome-vfsmm-2.18.0.tar.bz2
New:
----
gnome-vfsmm-2.20.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-vfsmm.spec ++++++
--- /var/tmp/diff_new_pack.cA1119/_old 2007-09-17 17:42:03.000000000 +0200
+++ /var/tmp/diff_new_pack.cA1119/_new 2007-09-17 17:42:03.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-vfsmm (Version 2.18.0)
+# spec file for package gnome-vfsmm (Version 2.20.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,16 +12,16 @@
Name: gnome-vfsmm
BuildRequires: gcc-c++ glibmm2-devel gnome-vfs2-devel mDNSResponder-devel
-Version: 2.18.0
+Version: 2.20.0
Release: 1
Group: System/GUI/GNOME
License: LGPL v2 or later
Summary: C++ Wrapper for gnome-vfs
-URL: http://www.gtkmm.org/
+Url: http://www.gtkmm.org/
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.12/%{name}-%{version}.tar.bz2
Patch: %{name}-acinclude.patch
Patch1: %{name}-random.patch
-Autoreqprov: on
+AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -94,6 +94,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Sep 17 2007 - maw@xxxxxxx
+- Update to version 2.20.0:
+ + Cosmetic version update.
* Fri Aug 31 2007 - maw@xxxxxxx
- Update to version 2.18.0:
+ Cosmetic version update.
++++++ gnome-vfsmm-2.18.0.tar.bz2 -> gnome-vfsmm-2.20.0.tar.bz2 ++++++
++++ 7355 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/ChangeLog new/gnome-vfsmm-2.20.0/ChangeLog
--- old/gnome-vfsmm-2.18.0/ChangeLog 2007-03-10 00:37:45.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/ChangeLog 2007-09-14 14:43:19.000000000 +0200
@@ -1,3 +1,21 @@
+2.20:
+
+2007-09-09 Murray Cumming <murrayc@xxxxxxxxxxx>
+
+ * docs/reference/Doxyfile.in: Add defines to PREDEFINED so that documentation
+ is built wihout hiding optional API, such as use of exceptions.
+
+2007-05-20 Armin Burgmeier <armin@xxxxxxxxxxxxx>
+
+ * libgnomevfs/libgnomevfsmm/directory-handle.cc: Fixed build with
+ disabled exceptions.
+
+2007-04-24 Yselkowitz <yselkowitz@xxxxxxxxxxxxxxxxxxxxx>
+
+ * scripts/macros.m4: Check for both m4 and M4 in the GNU m4 output,
+ to fix the build on some platforms.
+ Bug #423990
+
2.18.0:
2007-03-09 Murray Cumming <murrayc@xxxxxxxxxxx>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/configure.in new/gnome-vfsmm-2.20.0/configure.in
--- old/gnome-vfsmm-2.18.0/configure.in 2007-03-10 00:37:29.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/configure.in 2007-09-14 14:44:05.000000000 +0200
@@ -15,7 +15,7 @@
# Version and initialization
#########################################################################
LIBGNOMEVFSMM_MAJOR_VERSION=2
-LIBGNOMEVFSMM_MINOR_VERSION=18
+LIBGNOMEVFSMM_MINOR_VERSION=20
LIBGNOMEVFSMM_MICRO_VERSION=0
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/docs/reference/Doxyfile new/gnome-vfsmm-2.20.0/docs/reference/Doxyfile
--- old/gnome-vfsmm-2.18.0/docs/reference/Doxyfile 2007-03-10 00:38:34.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/docs/reference/Doxyfile 2007-09-14 14:44:35.000000000 +0200
@@ -4,7 +4,7 @@
# General configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = libgnomevfsmm
-PROJECT_NUMBER = 2.18.0
+PROJECT_NUMBER = 2.20.0
OUTPUT_DIRECTORY =
OUTPUT_LANGUAGE = English
EXTRACT_ALL = YES
@@ -51,7 +51,7 @@
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = /home/murrayc/svn/gnome218/gnome-vfsmm/libgnomevfs/libgnomevfsmm/
+INPUT = /home/murrayc/svn/gnome220/branches/gnome-vfsmm-branches/gnome-2-20/libgnomevfs/libgnomevfsmm/
FILE_PATTERNS = *.h
RECURSIVE = NO
EXCLUDE =
@@ -137,7 +137,14 @@
SEARCH_INCLUDES = YES
INCLUDE_PATH =
INCLUDE_FILE_PATTERNS =
-PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS
+PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS \
+ GTKMM_USING_STD(x)= \
+ GTKMM_API \
+ GTKMM_ATKMM_ENABLED \
+ GLIBMM_VFUNCS_ENABLED \
+ GLIBMM_PROPERTIES_ENABLED \
+ GLIBMM_EXCEPTIONS_ENABLED \
+ GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/docs/reference/Doxyfile.in new/gnome-vfsmm-2.20.0/docs/reference/Doxyfile.in
--- old/gnome-vfsmm-2.18.0/docs/reference/Doxyfile.in 2007-03-10 00:26:55.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/docs/reference/Doxyfile.in 2007-09-14 14:43:19.000000000 +0200
@@ -137,7 +137,14 @@
SEARCH_INCLUDES = YES
INCLUDE_PATH =
INCLUDE_FILE_PATTERNS =
-PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS
+PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS \
+ GTKMM_USING_STD(x)= \
+ GTKMM_API \
+ GTKMM_ATKMM_ENABLED \
+ GLIBMM_VFUNCS_ENABLED \
+ GLIBMM_PROPERTIES_ENABLED \
+ GLIBMM_EXCEPTIONS_ENABLED \
+ GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/address.h new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/address.h
--- old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/address.h 2007-03-10 00:27:45.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/address.h 2007-09-14 14:44:46.000000000 +0200
@@ -119,10 +119,13 @@
namespace Glib
{
-/** @relates Gnome::Vfs::Address
- * @param object The C instance
+/** A Glib::wrap() method for this object.
+ *
+ * @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
* @result A C++ instance that wraps this C instance.
+ *
+ * @relates Gnome::Vfs::Address
*/
Gnome::Vfs::Address wrap(GnomeVFSAddress* object, bool take_copy = false);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/async-handle.h new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/async-handle.h
--- old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/async-handle.h 2007-03-10 00:27:41.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/async-handle.h 2007-09-14 14:44:44.000000000 +0200
@@ -280,10 +280,13 @@
namespace Glib
{
- /** @relates Gnome::Vfs::FileInfoResult
- * @param object The C instance
+ /** A Glib::wrap() method for this object.
+ *
+ * @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
* @result A C++ instance that wraps this C instance.
+ *
+ * @relates Gnome::Vfs::FileInfoResult
*/
Gnome::Vfs::FileInfoResult wrap(GnomeVFSGetFileInfoResult* object, bool take_copy = false);
@@ -293,10 +296,13 @@
namespace Glib
{
- /** @relates Gnome::Vfs::FindDirectoryResult
- * @param object The C instance
+ /** A Glib::wrap() method for this object.
+ *
+ * @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
* @result A C++ instance that wraps this C instance.
+ *
+ * @relates Gnome::Vfs::FindDirectoryResult
*/
Gnome::Vfs::FindDirectoryResult wrap(GnomeVFSFindDirectoryResult* object, bool take_copy = false);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/directory-handle.cc new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/directory-handle.cc
--- old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/directory-handle.cc 2007-03-10 00:26:56.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/directory-handle.cc 2007-09-14 14:43:19.000000000 +0200
@@ -109,10 +109,18 @@
}
}
+#ifdef GLIBMM_EXCEPTIONS_ENABLED
void DirectoryHandle::open(const Glib::ustring& text_uri, FileInfoOptions options) throw(exception)
+#else
+void DirectoryHandle::open(const Glib::ustring& text_uri, FileInfoOptions options, std::auto_ptr<Gnome::Vfs::exception>& error)
+#endif
{
GnomeVFSResult result = gnome_vfs_directory_open(&gobj_, text_uri.c_str(), static_cast<GnomeVFSFileInfoOptions>(options) );
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
handle_result(result);
+ #else
+ handle_result(result, error);
+ #endif
}
#ifdef GLIBMM_EXCEPTIONS_ENABLED
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/drive.cc new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/drive.cc
--- old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/drive.cc 2007-03-10 00:27:42.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/drive.cc 2007-09-14 14:44:44.000000000 +0200
@@ -269,7 +269,7 @@
#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
void Drive_Class::volume_mounted_callback(GnomeVFSDrive* self, GnomeVFSVolume* p0)
{
- CppObjectType *const obj = dynamic_cast<CppObjectType*>(
+ Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
// Non-gtkmmproc-generated custom classes implicitly call the default
@@ -277,37 +277,40 @@
// generated classes can use this optimisation, which avoids the unnecessary
// parameter conversions if there is no possibility of the virtual function
// being overridden:
- if(obj && obj->is_derived_())
+ if(obj_base && obj_base->is_derived_())
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
+ if(obj) // This can be NULL during destruction.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
- // Call the virtual member method, which derived classes might override.
- obj->on_mounted(Glib::wrap(p0)
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ {
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
+ // Call the virtual member method, which derived classes might override.
+ obj->on_mounted(Glib::wrap(p0)
);
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ return;
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ }
+ catch(...)
+ {
+ Glib::exception_handlers_invoke();
+ }
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- catch(...)
- {
- Glib::exception_handlers_invoke();
- }
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- else
- {
- BaseClassType *const base = static_cast<BaseClassType*>(
+
+ BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
);
- // Call the original underlying C function:
- if(base && base->volume_mounted)
- (*base->volume_mounted)(self, p0);
- }
+ // Call the original underlying C function:
+ if(base && base->volume_mounted)
+ (*base->volume_mounted)(self, p0);
}
void Drive_Class::volume_pre_unmount_callback(GnomeVFSDrive* self, GnomeVFSVolume* p0)
{
- CppObjectType *const obj = dynamic_cast<CppObjectType*>(
+ Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
// Non-gtkmmproc-generated custom classes implicitly call the default
@@ -315,37 +318,40 @@
// generated classes can use this optimisation, which avoids the unnecessary
// parameter conversions if there is no possibility of the virtual function
// being overridden:
- if(obj && obj->is_derived_())
+ if(obj_base && obj_base->is_derived_())
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
+ if(obj) // This can be NULL during destruction.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
- // Call the virtual member method, which derived classes might override.
- obj->on_pre_unmount(Glib::wrap(p0)
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ {
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
+ // Call the virtual member method, which derived classes might override.
+ obj->on_pre_unmount(Glib::wrap(p0)
);
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- }
- catch(...)
- {
- Glib::exception_handlers_invoke();
+ return;
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ }
+ catch(...)
+ {
+ Glib::exception_handlers_invoke();
+ }
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- else
- {
- BaseClassType *const base = static_cast<BaseClassType*>(
+
+ BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
);
- // Call the original underlying C function:
- if(base && base->volume_pre_unmount)
- (*base->volume_pre_unmount)(self, p0);
- }
+ // Call the original underlying C function:
+ if(base && base->volume_pre_unmount)
+ (*base->volume_pre_unmount)(self, p0);
}
void Drive_Class::volume_unmounted_callback(GnomeVFSDrive* self, GnomeVFSVolume* p0)
{
- CppObjectType *const obj = dynamic_cast<CppObjectType*>(
+ Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
// Non-gtkmmproc-generated custom classes implicitly call the default
@@ -353,33 +359,36 @@
// generated classes can use this optimisation, which avoids the unnecessary
// parameter conversions if there is no possibility of the virtual function
// being overridden:
- if(obj && obj->is_derived_())
+ if(obj_base && obj_base->is_derived_())
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
+ if(obj) // This can be NULL during destruction.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
- // Call the virtual member method, which derived classes might override.
- obj->on_unmounted(Glib::wrap(p0)
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ {
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
+ // Call the virtual member method, which derived classes might override.
+ obj->on_unmounted(Glib::wrap(p0)
);
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- }
- catch(...)
- {
- Glib::exception_handlers_invoke();
+ return;
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ }
+ catch(...)
+ {
+ Glib::exception_handlers_invoke();
+ }
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- else
- {
- BaseClassType *const base = static_cast<BaseClassType*>(
+
+ BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
);
- // Call the original underlying C function:
- if(base && base->volume_unmounted)
- (*base->volume_unmounted)(self, p0);
- }
+ // Call the original underlying C function:
+ if(base && base->volume_unmounted)
+ (*base->volume_unmounted)(self, p0);
}
#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/drive.h new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/drive.h
--- old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/drive.h 2007-03-10 00:27:42.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/drive.h 2007-09-14 14:44:44.000000000 +0200
@@ -147,25 +147,25 @@
void eject(const OpSlot& slot);
-/**
+ /**
* @par Prototype:
- * <tt>void %mounted(const Glib::RefPtr<Volume>& volume)</tt>
+ * <tt>void on_my_%mounted(const Glib::RefPtr<Volume>& volume)</tt>
*/
Glib::SignalProxy1< void,const Glib::RefPtr<Volume>& > signal_mounted();
-/**
+ /**
* @par Prototype:
- * <tt>void %pre_unmount(const Glib::RefPtr<Volume>& volume)</tt>
+ * <tt>void on_my_%pre_unmount(const Glib::RefPtr<Volume>& volume)</tt>
*/
Glib::SignalProxy1< void,const Glib::RefPtr<Volume>& > signal_pre_unmount();
-/**
+ /**
* @par Prototype:
- * <tt>void %unmounted(const Glib::RefPtr<Volume>& volume)</tt>
+ * <tt>void on_my_%unmounted(const Glib::RefPtr<Volume>& volume)</tt>
*/
Glib::SignalProxy1< void,const Glib::RefPtr<Volume>& > signal_unmounted();
@@ -200,10 +200,13 @@
namespace Glib
{
- /** @relates Gnome::Vfs::Drive
- * @param object The C instance
+ /** A Glib::wrap() method for this object.
+ *
+ * @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
* @result A C++ instance that wraps this C instance.
+ *
+ * @relates Gnome::Vfs::Drive
*/
Glib::RefPtr<Gnome::Vfs::Drive> wrap(GnomeVFSDrive* object, bool take_copy = false);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/file-info.h new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/file-info.h
--- old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/file-info.h 2007-03-10 00:27:33.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/file-info.h 2007-09-14 14:44:40.000000000 +0200
@@ -249,10 +249,13 @@
namespace Glib
{
- /** @relates Gnome::Vfs::FileInfo
- * @param object The C instance
+ /** A Glib::wrap() method for this object.
+ *
+ * @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
* @result A C++ instance that wraps this C instance.
+ *
+ * @relates Gnome::Vfs::FileInfo
*/
Glib::RefPtr<Gnome::Vfs::FileInfo> wrap(GnomeVFSFileInfo* object, bool take_copy = false);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/mime-application.h new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/mime-application.h
--- old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/mime-application.h 2007-03-10 00:27:38.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/mime-application.h 2007-09-14 14:44:42.000000000 +0200
@@ -199,10 +199,13 @@
namespace Glib
{
- /** @relates Gnome::Vfs::MimeApplication
- * @param object The C instance
+ /** A Glib::wrap() method for this object.
+ *
+ * @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
* @result A C++ instance that wraps this C instance.
+ *
+ * @relates Gnome::Vfs::MimeApplication
*/
Gnome::Vfs::MimeApplication wrap(GnomeVFSMimeApplication* object, bool take_copy = false);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/mime-monitor.cc new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/mime-monitor.cc
--- old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/mime-monitor.cc 2007-03-10 00:27:37.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/mime-monitor.cc 2007-09-14 14:44:41.000000000 +0200
@@ -112,7 +112,7 @@
#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
void MimeMonitor_Class::data_changed_callback(GnomeVFSMIMEMonitor* self)
{
- CppObjectType *const obj = dynamic_cast<CppObjectType*>(
+ Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
// Non-gtkmmproc-generated custom classes implicitly call the default
@@ -120,32 +120,35 @@
// generated classes can use this optimisation, which avoids the unnecessary
// parameter conversions if there is no possibility of the virtual function
// being overridden:
- if(obj && obj->is_derived_())
+ if(obj_base && obj_base->is_derived_())
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
+ if(obj) // This can be NULL during destruction.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
- // Call the virtual member method, which derived classes might override.
- obj->on_data_changed();
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ {
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
+ // Call the virtual member method, which derived classes might override.
+ obj->on_data_changed();
+ return;
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ }
+ catch(...)
+ {
+ Glib::exception_handlers_invoke();
+ }
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- catch(...)
- {
- Glib::exception_handlers_invoke();
- }
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- else
- {
- BaseClassType *const base = static_cast<BaseClassType*>(
+
+ BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
);
- // Call the original underlying C function:
- if(base && base->data_changed)
- (*base->data_changed)(self);
- }
+ // Call the original underlying C function:
+ if(base && base->data_changed)
+ (*base->data_changed)(self);
}
#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/mime-monitor.h new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/mime-monitor.h
--- old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/mime-monitor.h 2007-03-10 00:27:37.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/mime-monitor.h 2007-09-14 14:44:41.000000000 +0200
@@ -103,9 +103,9 @@
static Glib::RefPtr<MimeMonitor> get();
-/**
+ /**
* @par Prototype:
- * <tt>void %data_changed()</tt>
+ * <tt>void on_my_%data_changed()</tt>
*/
Glib::SignalProxy0< void > signal_data_changed();
@@ -137,10 +137,13 @@
namespace Glib
{
- /** @relates Gnome::Vfs::MimeMonitor
- * @param object The C instance
+ /** A Glib::wrap() method for this object.
+ *
+ * @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
* @result A C++ instance that wraps this C instance.
+ *
+ * @relates Gnome::Vfs::MimeMonitor
*/
Glib::RefPtr<Gnome::Vfs::MimeMonitor> wrap(GnomeVFSMIMEMonitor* object, bool take_copy = false);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/uri.h new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/uri.h
--- old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/uri.h 2007-03-10 00:27:34.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/uri.h 2007-09-14 14:44:40.000000000 +0200
@@ -477,10 +477,13 @@
namespace Glib
{
- /** @relates Gnome::Vfs::Uri
- * @param object The C instance
+ /** A Glib::wrap() method for this object.
+ *
+ * @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
* @result A C++ instance that wraps this C instance.
+ *
+ * @relates Gnome::Vfs::Uri
*/
Glib::RefPtr<Gnome::Vfs::Uri> wrap(GnomeVFSURI* object, bool take_copy = false);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/volume.h new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/volume.h
--- old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/volume.h 2007-03-10 00:27:43.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/volume.h 2007-09-14 14:44:45.000000000 +0200
@@ -166,10 +166,13 @@
namespace Glib
{
- /** @relates Gnome::Vfs::Volume
- * @param object The C instance
+ /** A Glib::wrap() method for this object.
+ *
+ * @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
* @result A C++ instance that wraps this C instance.
+ *
+ * @relates Gnome::Vfs::Volume
*/
Glib::RefPtr<Gnome::Vfs::Volume> wrap(GnomeVFSVolume* object, bool take_copy = false);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/volume-monitor.cc new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/volume-monitor.cc
--- old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/volume-monitor.cc 2007-03-10 00:27:44.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/volume-monitor.cc 2007-09-14 14:44:46.000000000 +0200
@@ -274,7 +274,7 @@
#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
void VolumeMonitor_Class::volume_mounted_callback(GnomeVFSVolumeMonitor* self, GnomeVFSVolume* p0)
{
- CppObjectType *const obj = dynamic_cast<CppObjectType*>(
+ Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
// Non-gtkmmproc-generated custom classes implicitly call the default
@@ -282,37 +282,40 @@
// generated classes can use this optimisation, which avoids the unnecessary
// parameter conversions if there is no possibility of the virtual function
// being overridden:
- if(obj && obj->is_derived_())
+ if(obj_base && obj_base->is_derived_())
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
+ if(obj) // This can be NULL during destruction.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
- // Call the virtual member method, which derived classes might override.
- obj->on_volume_mounted(Glib::wrap(p0)
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ {
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
+ // Call the virtual member method, which derived classes might override.
+ obj->on_volume_mounted(Glib::wrap(p0)
);
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ return;
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ }
+ catch(...)
+ {
+ Glib::exception_handlers_invoke();
+ }
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- catch(...)
- {
- Glib::exception_handlers_invoke();
- }
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- else
- {
- BaseClassType *const base = static_cast<BaseClassType*>(
+
+ BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
);
- // Call the original underlying C function:
- if(base && base->volume_mounted)
- (*base->volume_mounted)(self, p0);
- }
+ // Call the original underlying C function:
+ if(base && base->volume_mounted)
+ (*base->volume_mounted)(self, p0);
}
void VolumeMonitor_Class::volume_pre_unmount_callback(GnomeVFSVolumeMonitor* self, GnomeVFSVolume* p0)
{
- CppObjectType *const obj = dynamic_cast<CppObjectType*>(
+ Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
// Non-gtkmmproc-generated custom classes implicitly call the default
@@ -320,37 +323,40 @@
// generated classes can use this optimisation, which avoids the unnecessary
// parameter conversions if there is no possibility of the virtual function
// being overridden:
- if(obj && obj->is_derived_())
+ if(obj_base && obj_base->is_derived_())
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
+ if(obj) // This can be NULL during destruction.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
- // Call the virtual member method, which derived classes might override.
- obj->on_volume_pre_unmount(Glib::wrap(p0)
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ {
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
+ // Call the virtual member method, which derived classes might override.
+ obj->on_volume_pre_unmount(Glib::wrap(p0)
);
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- }
- catch(...)
- {
- Glib::exception_handlers_invoke();
+ return;
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ }
+ catch(...)
+ {
+ Glib::exception_handlers_invoke();
+ }
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- else
- {
- BaseClassType *const base = static_cast<BaseClassType*>(
+
+ BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
);
- // Call the original underlying C function:
- if(base && base->volume_pre_unmount)
- (*base->volume_pre_unmount)(self, p0);
- }
+ // Call the original underlying C function:
+ if(base && base->volume_pre_unmount)
+ (*base->volume_pre_unmount)(self, p0);
}
void VolumeMonitor_Class::volume_unmounted_callback(GnomeVFSVolumeMonitor* self, GnomeVFSVolume* p0)
{
- CppObjectType *const obj = dynamic_cast<CppObjectType*>(
+ Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
// Non-gtkmmproc-generated custom classes implicitly call the default
@@ -358,37 +364,40 @@
// generated classes can use this optimisation, which avoids the unnecessary
// parameter conversions if there is no possibility of the virtual function
// being overridden:
- if(obj && obj->is_derived_())
+ if(obj_base && obj_base->is_derived_())
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
+ if(obj) // This can be NULL during destruction.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
- // Call the virtual member method, which derived classes might override.
- obj->on_volume_unmounted(Glib::wrap(p0)
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ {
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
+ // Call the virtual member method, which derived classes might override.
+ obj->on_volume_unmounted(Glib::wrap(p0)
);
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ return;
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ }
+ catch(...)
+ {
+ Glib::exception_handlers_invoke();
+ }
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- catch(...)
- {
- Glib::exception_handlers_invoke();
- }
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- else
- {
- BaseClassType *const base = static_cast<BaseClassType*>(
+
+ BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
);
- // Call the original underlying C function:
- if(base && base->volume_unmounted)
- (*base->volume_unmounted)(self, p0);
- }
+ // Call the original underlying C function:
+ if(base && base->volume_unmounted)
+ (*base->volume_unmounted)(self, p0);
}
void VolumeMonitor_Class::drive_connected_callback(GnomeVFSVolumeMonitor* self, GnomeVFSDrive* p0)
{
- CppObjectType *const obj = dynamic_cast<CppObjectType*>(
+ Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
// Non-gtkmmproc-generated custom classes implicitly call the default
@@ -396,37 +405,40 @@
// generated classes can use this optimisation, which avoids the unnecessary
// parameter conversions if there is no possibility of the virtual function
// being overridden:
- if(obj && obj->is_derived_())
+ if(obj_base && obj_base->is_derived_())
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
+ if(obj) // This can be NULL during destruction.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
- // Call the virtual member method, which derived classes might override.
- obj->on_drive_connected(Glib::wrap(p0)
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ {
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
+ // Call the virtual member method, which derived classes might override.
+ obj->on_drive_connected(Glib::wrap(p0)
);
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- }
- catch(...)
- {
- Glib::exception_handlers_invoke();
+ return;
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ }
+ catch(...)
+ {
+ Glib::exception_handlers_invoke();
+ }
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- else
- {
- BaseClassType *const base = static_cast<BaseClassType*>(
+
+ BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
);
- // Call the original underlying C function:
- if(base && base->drive_connected)
- (*base->drive_connected)(self, p0);
- }
+ // Call the original underlying C function:
+ if(base && base->drive_connected)
+ (*base->drive_connected)(self, p0);
}
void VolumeMonitor_Class::drive_disconnected_callback(GnomeVFSVolumeMonitor* self, GnomeVFSDrive* p0)
{
- CppObjectType *const obj = dynamic_cast<CppObjectType*>(
+ Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
// Non-gtkmmproc-generated custom classes implicitly call the default
@@ -434,33 +446,36 @@
// generated classes can use this optimisation, which avoids the unnecessary
// parameter conversions if there is no possibility of the virtual function
// being overridden:
- if(obj && obj->is_derived_())
+ if(obj_base && obj_base->is_derived_())
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
+ if(obj) // This can be NULL during destruction.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
- // Call the virtual member method, which derived classes might override.
- obj->on_drive_disconnected(Glib::wrap(p0)
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ try // Trap C++ exceptions which would normally be lost because this is a C callback.
+ {
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
+ // Call the virtual member method, which derived classes might override.
+ obj->on_drive_disconnected(Glib::wrap(p0)
);
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
- }
- catch(...)
- {
- Glib::exception_handlers_invoke();
+ return;
+ #ifdef GLIBMM_EXCEPTIONS_ENABLED
+ }
+ catch(...)
+ {
+ Glib::exception_handlers_invoke();
+ }
+ #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
- else
- {
- BaseClassType *const base = static_cast<BaseClassType*>(
+
+ BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(self)) // Get the parent class of the object class (The original underlying C class).
);
- // Call the original underlying C function:
- if(base && base->drive_disconnected)
- (*base->drive_disconnected)(self, p0);
- }
+ // Call the original underlying C function:
+ if(base && base->drive_disconnected)
+ (*base->drive_disconnected)(self, p0);
}
#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/volume-monitor.h new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/volume-monitor.h
--- old/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/volume-monitor.h 2007-03-10 00:27:44.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/libgnomevfs/libgnomevfsmm/volume-monitor.h 2007-09-14 14:44:46.000000000 +0200
@@ -121,41 +121,41 @@
Glib::RefPtr<const Drive> get_drive(gulong id) const;
-/**
+ /**
* @par Prototype:
- * <tt>void %volume_mounted(const Glib::RefPtr<Volume>& volume)</tt>
+ * <tt>void on_my_%volume_mounted(const Glib::RefPtr<Volume>& volume)</tt>
*/
Glib::SignalProxy1< void,const Glib::RefPtr<Volume>& > signal_volume_mounted();
-/**
+ /**
* @par Prototype:
- * <tt>void %volume_pre_unmount(const Glib::RefPtr<Volume>& volume)</tt>
+ * <tt>void on_my_%volume_pre_unmount(const Glib::RefPtr<Volume>& volume)</tt>
*/
Glib::SignalProxy1< void,const Glib::RefPtr<Volume>& > signal_volume_pre_unmount();
-/**
+ /**
* @par Prototype:
- * <tt>void %volume_unmounted(const Glib::RefPtr<Volume>& volume)</tt>
+ * <tt>void on_my_%volume_unmounted(const Glib::RefPtr<Volume>& volume)</tt>
*/
Glib::SignalProxy1< void,const Glib::RefPtr<Volume>& > signal_volume_unmounted();
-/**
+ /**
* @par Prototype:
- * <tt>void %drive_connected(const Glib::RefPtr<Drive>& drive)</tt>
+ * <tt>void on_my_%drive_connected(const Glib::RefPtr<Drive>& drive)</tt>
*/
Glib::SignalProxy1< void,const Glib::RefPtr<Drive>& > signal_drive_connected();
-/**
+ /**
* @par Prototype:
- * <tt>void %drive_disconnected(const Glib::RefPtr<Drive>& drive)</tt>
+ * <tt>void on_my_%drive_disconnected(const Glib::RefPtr<Drive>& drive)</tt>
*/
Glib::SignalProxy1< void,const Glib::RefPtr<Drive>& > signal_drive_disconnected();
@@ -192,10 +192,13 @@
namespace Glib
{
- /** @relates Gnome::Vfs::VolumeMonitor
- * @param object The C instance
+ /** A Glib::wrap() method for this object.
+ *
+ * @param object The C instance.
* @param take_copy False if the result should take ownership of the C instance. True if it should take a new copy or ref.
* @result A C++ instance that wraps this C instance.
+ *
+ * @relates Gnome::Vfs::VolumeMonitor
*/
Glib::RefPtr<Gnome::Vfs::VolumeMonitor> wrap(GnomeVFSVolumeMonitor* object, bool take_copy = false);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/NEWS new/gnome-vfsmm-2.20.0/NEWS
--- old/gnome-vfsmm-2.18.0/NEWS 2007-03-10 00:38:09.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/NEWS 2007-09-14 14:43:58.000000000 +0200
@@ -1,3 +1,7 @@
+2.20.0:
+
+* Updated version number to match GNOME version.
+
2.18.0:
* Updated version number to match GNOME version.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/scripts/macros.m4 new/gnome-vfsmm-2.20.0/scripts/macros.m4
--- old/gnome-vfsmm-2.18.0/scripts/macros.m4 2007-03-10 00:26:55.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/scripts/macros.m4 2007-09-14 14:43:19.000000000 +0200
@@ -10,7 +10,7 @@
if test "$M4" = "m4"; then
AC_MSG_CHECKING(whether m4 is GNU m4)
- if $M4 --version </dev/null 2>/dev/null | grep '^GNU m4 ' >/dev/null ; then
+ if $M4 --version </dev/null 2>/dev/null | grep '^GNU [Mm]4 ' >/dev/null ; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-vfsmm-2.18.0/scripts/missing new/gnome-vfsmm-2.20.0/scripts/missing
--- old/gnome-vfsmm-2.18.0/scripts/missing 2007-02-28 15:55:20.000000000 +0100
+++ new/gnome-vfsmm-2.20.0/scripts/missing 2007-08-27 19:57:28.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@xxxxxxxxxxxxxxxx>, 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |