Hello community,
here is the log from the commit of package gnome-vfsmm
checked in at Sat Sep 1 13:04:38 CEST 2007.
--------
--- GNOME/gnome-vfsmm/gnome-vfsmm.changes 2007-07-11 22:47:32.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-vfsmm/gnome-vfsmm.changes 2007-08-31 19:31:47.634124000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 31 19:31:26 CEST 2007 - maw(a)suse.de
+
+- Update to version 2.18.0:
+ + Cosmetic version update.
+
+-------------------------------------------------------------------
Old:
----
gnome-vfsmm-2.16.1.tar.bz2
New:
----
gnome-vfsmm-2.18.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-vfsmm.spec ++++++
--- /var/tmp/diff_new_pack.w17271/_old 2007-09-01 12:59:44.000000000 +0200
+++ /var/tmp/diff_new_pack.w17271/_new 2007-09-01 12:59:44.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-vfsmm (Version 2.16.1)
+# spec file for package gnome-vfsmm (Version 2.18.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
Name: gnome-vfsmm
BuildRequires: gcc-c++ glibmm2-devel gnome-vfs2-devel mDNSResponder-devel
-Version: 2.16.1
+Version: 2.18.0
Release: 1
Group: System/GUI/GNOME
License: LGPL v2 or later
@@ -94,6 +94,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Aug 31 2007 - maw(a)suse.de
+- Update to version 2.18.0:
+ + Cosmetic version update.
* Wed Jul 11 2007 - mauro(a)suse.de
- Update to version 2.16.1
- Bugfixes for bugs #365038 and #349334
++++++ gnome-vfsmm-2.16.1.tar.bz2 -> gnome-vfsmm-2.18.0.tar.bz2 ++++++
++++ 13129 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.16.1/ChangeLog new/gnome-vfsmm-2.18.0/ChangeLog
--- old/gnome-vfsmm-2.16.1/ChangeLog 2006-11-21 15:30:40.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/ChangeLog 2007-03-10 00:37:45.000000000 +0100
@@ -1,3 +1,9 @@
+2.18.0:
+
+2007-03-09 Murray Cumming <murrayc(a)murrayc.com>
+
+ * Increased version for the GNOME 2.18 release.
+
2.16.1:
2006-10-31 Matt Hoosier <mwhoosier(a)gmail.com>
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.16.1/configure.in new/gnome-vfsmm-2.18.0/configure.in
--- old/gnome-vfsmm-2.16.1/configure.in 2006-11-21 15:30:48.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/configure.in 2007-03-10 00:37:29.000000000 +0100
@@ -15,8 +15,8 @@
# Version and initialization
#########################################################################
LIBGNOMEVFSMM_MAJOR_VERSION=2
-LIBGNOMEVFSMM_MINOR_VERSION=16
-LIBGNOMEVFSMM_MICRO_VERSION=1
+LIBGNOMEVFSMM_MINOR_VERSION=18
+LIBGNOMEVFSMM_MICRO_VERSION=0
#
# +1 : ? : +1 == new interface that does not break old one
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.16.1/docs/reference/Doxyfile new/gnome-vfsmm-2.18.0/docs/reference/Doxyfile
--- old/gnome-vfsmm-2.16.1/docs/reference/Doxyfile 2006-11-21 15:32:58.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/docs/reference/Doxyfile 2007-03-10 00:38:34.000000000 +0100
@@ -4,7 +4,7 @@
# General configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = libgnomevfsmm
-PROJECT_NUMBER = 2.16.1
+PROJECT_NUMBER = 2.18.0
OUTPUT_DIRECTORY =
OUTPUT_LANGUAGE = English
EXTRACT_ALL = YES
@@ -51,7 +51,7 @@
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = /home/murrayc/cvs/gnome216/gnomemm/gnome-vfsmm/libgnomevfs/libgnomevfsmm/
+INPUT = /home/murrayc/svn/gnome218/gnome-vfsmm/libgnomevfs/libgnomevfsmm/
FILE_PATTERNS = *.h
RECURSIVE = NO
EXCLUDE =
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.16.1/libgnomevfs/libgnomevfsmm/application-registry.cc new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/application-registry.cc
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/application-registry.cc 2006-10-31 10:06:42.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/application-registry.cc 2007-03-10 00:26:56.000000000 +0100
@@ -1,4 +1,4 @@
-/* $Id: application-registry.cc,v 1.6 2006/10/31 09:06:42 murrayc Exp $ */
+/* $Id: application-registry.cc 864 2006-10-31 09:06:50Z murrayc $ */
/* Copyright 2003 gnome-vfsmm Development Team
*
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.16.1/libgnomevfs/libgnomevfsmm/application-registry.h new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/application-registry.h
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/application-registry.h 2006-10-31 10:06:42.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/application-registry.h 2007-03-10 00:26:56.000000000 +0100
@@ -1,4 +1,4 @@
-/* $Id: application-registry.h,v 1.5 2006/10/31 09:06:42 murrayc Exp $ */
+/* $Id: application-registry.h 864 2006-10-31 09:06:50Z murrayc $ */
/* Copyright 2003 gnome-vfsmm Development Team
*
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.16.1/libgnomevfs/libgnomevfsmm/directory-handle.cc new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/directory-handle.cc
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/directory-handle.cc 2006-10-31 10:06:42.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/directory-handle.cc 2007-03-10 00:26:56.000000000 +0100
@@ -1,4 +1,4 @@
-/* $Id: directory-handle.cc,v 1.13 2006/10/31 09:06:42 murrayc Exp $ */
+/* $Id: directory-handle.cc 864 2006-10-31 09:06:50Z murrayc $ */
/* Copyright 2003 gnome-vfsmm Development Team
*
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.16.1/libgnomevfs/libgnomevfsmm/directory-handle.h new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/directory-handle.h
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/directory-handle.h 2006-10-31 10:06:42.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/directory-handle.h 2007-03-10 00:26:56.000000000 +0100
@@ -1,4 +1,4 @@
-/* $Id: directory-handle.h,v 1.9 2006/10/31 09:06:42 murrayc Exp $ */
+/* $Id: directory-handle.h 864 2006-10-31 09:06:50Z murrayc $ */
/* Copyright 2003 gnome-vfsmm Development Team
*
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.16.1/libgnomevfs/libgnomevfsmm/handle.cc new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/handle.cc
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/handle.cc 2006-10-31 10:06:42.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/handle.cc 2007-03-10 00:26:56.000000000 +0100
@@ -1,4 +1,4 @@
-/* $Id: handle.cc,v 1.9 2006/10/31 09:06:42 murrayc Exp $ */
+/* $Id: handle.cc 864 2006-10-31 09:06:50Z murrayc $ */
/* Copyright 2003 gnome-vfsmm Development Team
*
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.16.1/libgnomevfs/libgnomevfsmm/handle.h new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/handle.h
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/handle.h 2006-10-31 10:06:42.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/handle.h 2007-03-10 00:26:56.000000000 +0100
@@ -1,4 +1,4 @@
-/* $Id: handle.h,v 1.11 2006/10/31 09:06:42 murrayc Exp $ */
+/* $Id: handle.h 864 2006-10-31 09:06:50Z murrayc $ */
/* Copyright 2003 gnome-vfsmm Development Team
*
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.16.1/libgnomevfs/libgnomevfsmm/init.cc new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/init.cc
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/init.cc 2003-12-22 18:12:00.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/init.cc 2007-03-10 00:26:56.000000000 +0100
@@ -1,5 +1,5 @@
// -*- c++ -*-
-/* $Id: init.cc,v 1.3 2003/12/22 17:12:00 murrayc Exp $ */
+/* $Id: init.cc 575 2003-12-22 17:12:01Z murrayc $ */
/* init.cc
*
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.16.1/libgnomevfs/libgnomevfsmm/init.h new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/init.h
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/init.h 2003-03-23 14:10:54.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/init.h 2007-03-10 00:26:56.000000000 +0100
@@ -1,7 +1,7 @@
// -*- c++ -*-
#ifndef _LIBGNOMEVFSMM_INIT_H
#define _LIBGNOMEVFSMM_INIT_H
-/* $Id: init.h,v 1.2 2003/03/23 13:10:54 murrayc Exp $ */
+/* $Id: init.h 415 2003-03-23 13:10:55Z murrayc $ */
/* init.h
*
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.16.1/libgnomevfs/libgnomevfsmm/mime-monitor.cc new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/mime-monitor.cc
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/mime-monitor.cc 2006-05-18 22:12:51.000000000 +0200
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/mime-monitor.cc 2007-03-10 00:27:37.000000000 +0100
@@ -40,6 +40,7 @@
namespace
{
+
static const Glib::SignalProxyInfo MimeMonitor_signal_data_changed_info =
{
"data-changed",
@@ -47,6 +48,7 @@
(GCallback) &Glib::SignalProxyNormal::slot0_void_callback
};
+
} // anonymous namespace
@@ -98,12 +100,16 @@
#ifdef GLIBMM_VFUNCS_ENABLED
#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
klass->data_changed = &data_changed_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
}
#ifdef GLIBMM_VFUNCS_ENABLED
#endif //GLIBMM_VFUNCS_ENABLED
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
void MimeMonitor_Class::data_changed_callback(GnomeVFSMIMEMonitor* self)
{
CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -141,6 +147,7 @@
(*base->data_changed)(self);
}
}
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
Glib::ObjectBase* MimeMonitor_Class::wrap_new(GObject* object)
@@ -196,6 +203,7 @@
}
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
void Gnome::Vfs::MimeMonitor::on_data_changed()
{
BaseClassType *const base = static_cast<BaseClassType*>(
@@ -205,7 +213,7 @@
if(base && base->data_changed)
(*base->data_changed)(gobj());
}
-
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
#ifdef GLIBMM_VFUNCS_ENABLED
#endif //GLIBMM_VFUNCS_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.16.1/libgnomevfs/libgnomevfsmm/mime-monitor.h new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/mime-monitor.h
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/mime-monitor.h 2006-05-18 22:12:50.000000000 +0200
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/mime-monitor.h 2007-03-10 00:27:37.000000000 +0100
@@ -103,6 +103,11 @@
static Glib::RefPtr<MimeMonitor> get();
+/**
+ * @par Prototype:
+ * <tt>void %data_changed()</tt>
+ */
+
Glib::SignalProxy0< void > signal_data_changed();
@@ -119,7 +124,9 @@
#endif //GLIBMM_VFUNCS_ENABLED
//Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
virtual void on_data_changed();
+#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.16.1/libgnomevfs/libgnomevfsmm/private/mime-monitor_p.h new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/private/mime-monitor_p.h
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/private/mime-monitor_p.h 2006-05-18 22:12:50.000000000 +0200
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/private/mime-monitor_p.h 2007-03-10 00:27:37.000000000 +0100
@@ -35,10 +35,12 @@
protected:
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
//Callbacks (default signal handlers):
//These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
//You could prevent the original default signal handlers being called by overriding the *_impl method.
static void data_changed_callback(GnomeVFSMIMEMonitor* self);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
//Callbacks (virtual functions):
#ifdef GLIBMM_VFUNCS_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.16.1/libgnomevfs/libgnomevfsmm/private/volume-monitor_p.h new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/private/volume-monitor_p.h
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/private/volume-monitor_p.h 2006-05-18 22:12:56.000000000 +0200
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/private/volume-monitor_p.h 2007-03-10 00:27:44.000000000 +0100
@@ -35,6 +35,7 @@
protected:
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
//Callbacks (default signal handlers):
//These will call the *_impl member methods, which will then call the existing default signal callbacks, if any.
//You could prevent the original default signal handlers being called by overriding the *_impl method.
@@ -43,6 +44,7 @@
static void volume_unmounted_callback(GnomeVFSVolumeMonitor* self, GnomeVFSVolume* p0);
static void drive_connected_callback(GnomeVFSVolumeMonitor* self, GnomeVFSDrive* p0);
static void drive_disconnected_callback(GnomeVFSVolumeMonitor* self, GnomeVFSDrive* p0);
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
//Callbacks (virtual functions):
#ifdef GLIBMM_VFUNCS_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.16.1/libgnomevfs/libgnomevfsmm/utils.cc new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/utils.cc
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/utils.cc 2006-10-31 10:06:42.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/utils.cc 2007-03-10 00:26:56.000000000 +0100
@@ -1,5 +1,5 @@
// -*- c++ -*-
-/* $Id: utils.cc,v 1.3 2006/10/31 09:06:42 murrayc Exp $ */
+/* $Id: utils.cc 864 2006-10-31 09:06:50Z murrayc $ */
/* utils.cc
*
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.16.1/libgnomevfs/libgnomevfsmm/utils.h new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/utils.h
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/utils.h 2006-10-31 10:06:42.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/utils.h 2007-03-10 00:26:56.000000000 +0100
@@ -1,7 +1,7 @@
// -*- c++ -*-
#ifndef _LIBGNOMEVFSMM_UTILS_H
#define _LIBGNOMEVFSMM_UTILS_H
-/* $Id: utils.h,v 1.3 2006/10/31 09:06:42 murrayc Exp $ */
+/* $Id: utils.h 864 2006-10-31 09:06:50Z murrayc $ */
/* utils.h
*
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.16.1/libgnomevfs/libgnomevfsmm/volume-monitor.cc new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/volume-monitor.cc
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/volume-monitor.cc 2006-05-18 22:12:56.000000000 +0200
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/volume-monitor.cc 2007-03-10 00:27:44.000000000 +0100
@@ -41,6 +41,7 @@
namespace
{
+
static void VolumeMonitor_signal_volume_mounted_callback(GnomeVFSVolumeMonitor* self, GnomeVFSVolume* p0,void* data)
{
using namespace Gnome::Vfs;
@@ -205,6 +206,7 @@
(GCallback) &VolumeMonitor_signal_drive_disconnected_callback
};
+
} // anonymous namespace
@@ -256,16 +258,20 @@
#ifdef GLIBMM_VFUNCS_ENABLED
#endif //GLIBMM_VFUNCS_ENABLED
+
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
klass->volume_mounted = &volume_mounted_callback;
klass->volume_pre_unmount = &volume_pre_unmount_callback;
klass->volume_unmounted = &volume_unmounted_callback;
klass->drive_connected = &drive_connected_callback;
klass->drive_disconnected = &drive_disconnected_callback;
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
}
#ifdef GLIBMM_VFUNCS_ENABLED
#endif //GLIBMM_VFUNCS_ENABLED
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
void VolumeMonitor_Class::volume_mounted_callback(GnomeVFSVolumeMonitor* self, GnomeVFSVolume* p0)
{
CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -304,7 +310,6 @@
(*base->volume_mounted)(self, p0);
}
}
-
void VolumeMonitor_Class::volume_pre_unmount_callback(GnomeVFSVolumeMonitor* self, GnomeVFSVolume* p0)
{
CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -343,7 +348,6 @@
(*base->volume_pre_unmount)(self, p0);
}
}
-
void VolumeMonitor_Class::volume_unmounted_callback(GnomeVFSVolumeMonitor* self, GnomeVFSVolume* p0)
{
CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -382,7 +386,6 @@
(*base->volume_unmounted)(self, p0);
}
}
-
void VolumeMonitor_Class::drive_connected_callback(GnomeVFSVolumeMonitor* self, GnomeVFSDrive* p0)
{
CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -421,7 +424,6 @@
(*base->drive_connected)(self, p0);
}
}
-
void VolumeMonitor_Class::drive_disconnected_callback(GnomeVFSVolumeMonitor* self, GnomeVFSDrive* p0)
{
CppObjectType *const obj = dynamic_cast<CppObjectType*>(
@@ -460,6 +462,7 @@
(*base->drive_disconnected)(self, p0);
}
}
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
Glib::ObjectBase* VolumeMonitor_Class::wrap_new(GObject* object)
@@ -513,6 +516,7 @@
return retvalue;
}
+
Glib::ListHandle< Glib::RefPtr<Volume> > VolumeMonitor::get_mounted_volumes()
{
return Glib::ListHandle< Glib::RefPtr<Volume> >(gnome_vfs_volume_monitor_get_mounted_volumes(gobj()), Glib::OWNERSHIP_SHALLOW);
@@ -599,27 +603,32 @@
return Glib::SignalProxy1< void,const Glib::RefPtr<Volume>& >(this, &VolumeMonitor_signal_volume_mounted_info);
}
+
Glib::SignalProxy1< void,const Glib::RefPtr<Volume>& > VolumeMonitor::signal_volume_pre_unmount()
{
return Glib::SignalProxy1< void,const Glib::RefPtr<Volume>& >(this, &VolumeMonitor_signal_volume_pre_unmount_info);
}
+
Glib::SignalProxy1< void,const Glib::RefPtr<Volume>& > VolumeMonitor::signal_volume_unmounted()
{
return Glib::SignalProxy1< void,const Glib::RefPtr<Volume>& >(this, &VolumeMonitor_signal_volume_unmounted_info);
}
+
Glib::SignalProxy1< void,const Glib::RefPtr<Drive>& > VolumeMonitor::signal_drive_connected()
{
return Glib::SignalProxy1< void,const Glib::RefPtr<Drive>& >(this, &VolumeMonitor_signal_drive_connected_info);
}
+
Glib::SignalProxy1< void,const Glib::RefPtr<Drive>& > VolumeMonitor::signal_drive_disconnected()
{
return Glib::SignalProxy1< void,const Glib::RefPtr<Drive>& >(this, &VolumeMonitor_signal_drive_disconnected_info);
}
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
void Gnome::Vfs::VolumeMonitor::on_volume_mounted(const Glib::RefPtr<Volume>& volume)
{
BaseClassType *const base = static_cast<BaseClassType*>(
@@ -629,7 +638,6 @@
if(base && base->volume_mounted)
(*base->volume_mounted)(gobj(),Glib::unwrap(volume));
}
-
void Gnome::Vfs::VolumeMonitor::on_volume_pre_unmount(const Glib::RefPtr<Volume>& volume)
{
BaseClassType *const base = static_cast<BaseClassType*>(
@@ -639,7 +647,6 @@
if(base && base->volume_pre_unmount)
(*base->volume_pre_unmount)(gobj(),Glib::unwrap(volume));
}
-
void Gnome::Vfs::VolumeMonitor::on_volume_unmounted(const Glib::RefPtr<Volume>& volume)
{
BaseClassType *const base = static_cast<BaseClassType*>(
@@ -649,7 +656,6 @@
if(base && base->volume_unmounted)
(*base->volume_unmounted)(gobj(),Glib::unwrap(volume));
}
-
void Gnome::Vfs::VolumeMonitor::on_drive_connected(const Glib::RefPtr<Drive>& drive)
{
BaseClassType *const base = static_cast<BaseClassType*>(
@@ -659,7 +665,6 @@
if(base && base->drive_connected)
(*base->drive_connected)(gobj(),Glib::unwrap(drive));
}
-
void Gnome::Vfs::VolumeMonitor::on_drive_disconnected(const Glib::RefPtr<Drive>& drive)
{
BaseClassType *const base = static_cast<BaseClassType*>(
@@ -669,7 +674,7 @@
if(base && base->drive_disconnected)
(*base->drive_disconnected)(gobj(),Glib::unwrap(drive));
}
-
+#endif //GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
#ifdef GLIBMM_VFUNCS_ENABLED
#endif //GLIBMM_VFUNCS_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.16.1/libgnomevfs/libgnomevfsmm/volume-monitor.h new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/volume-monitor.h
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm/volume-monitor.h 2006-05-18 22:12:56.000000000 +0200
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm/volume-monitor.h 2007-03-10 00:27:44.000000000 +0100
@@ -121,18 +121,43 @@
Glib::RefPtr<const Drive> get_drive(gulong id) const;
+/**
+ * @par Prototype:
+ * <tt>void %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>
+ */
+
Glib::SignalProxy1< void,const Glib::RefPtr<Volume>& > signal_volume_pre_unmount();
+/**
+ * @par Prototype:
+ * <tt>void %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>
+ */
+
Glib::SignalProxy1< void,const Glib::RefPtr<Drive>& > signal_drive_connected();
+/**
+ * @par Prototype:
+ * <tt>void %drive_disconnected(const Glib::RefPtr<Drive>& drive)</tt>
+ */
+
Glib::SignalProxy1< void,const Glib::RefPtr<Drive>& > signal_drive_disconnected();
@@ -149,11 +174,13 @@
#endif //GLIBMM_VFUNCS_ENABLED
//Default Signal Handlers::
+#ifdef GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
virtual void on_volume_mounted(const Glib::RefPtr<Volume>& volume);
virtual void on_volume_pre_unmount(const Glib::RefPtr<Volume>& volume);
virtual void on_volume_unmounted(const Glib::RefPtr<Volume>& volume);
virtual void on_drive_connected(const Glib::RefPtr<Drive>& drive);
virtual void on_drive_disconnected(const Glib::RefPtr<Drive>& drive);
+#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.16.1/libgnomevfs/libgnomevfsmm.h new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm.h
--- old/gnome-vfsmm-2.16.1/libgnomevfs/libgnomevfsmm.h 2004-07-17 13:41:49.000000000 +0200
+++ new/gnome-vfsmm-2.18.0/libgnomevfs/libgnomevfsmm.h 2007-03-10 00:26:56.000000000 +0100
@@ -1,4 +1,4 @@
-/* $Id: libgnomevfsmm.h,v 1.11 2004/07/17 11:41:49 murrayc Exp $ */
+/* $Id: libgnomevfsmm.h 711 2004-07-17 11:41:50Z murrayc $ */
/* libgnomevfsmm - a C++ wrapper for libgda
*
* Copyright 1999-2003 Free Software Foundation
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.16.1/NEWS new/gnome-vfsmm-2.18.0/NEWS
--- old/gnome-vfsmm-2.16.1/NEWS 2006-11-21 15:32:21.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/NEWS 2007-03-10 00:38:09.000000000 +0100
@@ -1,3 +1,7 @@
+2.18.0:
+
+* Updated version number to match GNOME version.
+
2.16.1:
* DirectoryHandle::close(): Set gobj() to null, to prevent
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.16.1/tools/extra_defs_gen/generate_defs_gnome_vfs.cc new/gnome-vfsmm-2.18.0/tools/extra_defs_gen/generate_defs_gnome_vfs.cc
--- old/gnome-vfsmm-2.16.1/tools/extra_defs_gen/generate_defs_gnome_vfs.cc 2004-03-02 10:58:06.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/tools/extra_defs_gen/generate_defs_gnome_vfs.cc 2007-03-10 00:26:55.000000000 +0100
@@ -1,4 +1,4 @@
-/* $Id: generate_defs_gnome_vfs.cc,v 1.3 2004/03/02 09:58:06 murrayc Exp $ */
+/* $Id: generate_defs_gnome_vfs.cc 601 2004-03-02 09:59:47Z murrayc $ */
/* generate_defs_gnomevfs.h
*
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.16.1/tools/m4/convert.m4 new/gnome-vfsmm-2.18.0/tools/m4/convert.m4
--- old/gnome-vfsmm-2.16.1/tools/m4/convert.m4 2003-03-07 08:42:17.000000000 +0100
+++ new/gnome-vfsmm-2.18.0/tools/m4/convert.m4 2007-03-10 00:26:55.000000000 +0100
@@ -1,4 +1,4 @@
-dnl $Id: convert.m4,v 1.1 2003/03/07 07:42:17 murrayc Exp $
+dnl $Id: convert.m4 407 2003-03-07 07:44:37Z murrayc $
# Override of the file of the same name in gtkmm.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org