Imported Upstream version 2.49.4

diff --git a/NEWS b/NEWS
index 1c98989..378b72d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+2.49.4:
+
+glib:
+* Replace some use of some deprecated libsigc++ API.
+  (Murray Cumming)
+
+Build:
+* Really enable silent builds.
+  (Sebastian Geiger) Bug #768797
+
 2.49.2:
 
 Gio:

diff --git a/configure.ac b/configure.ac
index 76cad4b..c4814d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
 ## You should have received a copy of the GNU Lesser General Public License
 ## along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([glibmm], [2.49.2],
+AC_INIT([glibmm], [2.49.4],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=glibmm],
         [glibmm], [http://www.gtkmm.org/])
 AC_PREREQ([2.59])
@@ -26,7 +26,7 @@ AC_CONFIG_MACRO_DIR([build])
 AC_CONFIG_HEADERS([config.h glib/glibmmconfig.h gio/giommconfig.h])
 
 AM_INIT_AUTOMAKE([1.9 -Wno-portability no-dist-gzip dist-xz tar-ustar no-define nostdinc])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 

diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in
index a31544e..51dec03 100644 (file)
--- a/docs/reference/Doxyfile.in
+++ b/docs/reference/Doxyfile.in
@@ -101,7 +101,7 @@ CITE_BIB_FILES         =
 #---------------------------------------------------------------------------
 # Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
-QUIET                  = NO
+QUIET                  = YES
 WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES

diff --git a/glib/glibmm/exceptionhandler.cc b/glib/glibmm/exceptionhandler.cc
index 31ddb39..95032a3 100644 (file)
--- a/glib/glibmm/exceptionhandler.cc
+++ b/glib/glibmm/exceptionhandler.cc
@@ -32,7 +32,7 @@
 namespace
 {
 
-using HandlerList = sigc::signal<void>;
+using HandlerList = std::list<sigc::slot<void()>>;
 
 // Each thread has its own list of exception handlers
 // to avoid thread synchronization problems.
@@ -108,8 +108,9 @@ add_exception_handler(const sigc::slot<void>& slot)
 #endif
   }
 
-  handler_list->slots().push_front(slot);
-  return handler_list->slots().begin();
+  handler_list->emplace_back(slot);
+  auto& added_slot = handler_list->back();
+  return sigc::connection(added_slot);
 }
 
 // internal
@@ -135,15 +136,15 @@ exception_handlers_invoke() noexcept
   if(HandlerList *const handler_list = thread_specific_handler_list.get())
 #endif
   {
-    HandlerList::iterator pslot = handler_list->slots().begin();
+    HandlerList::iterator pslot = handler_list->begin();
 
-    while (pslot != handler_list->slots().end())
+    while (pslot != handler_list->end())
     {
       // Calling an empty slot would mean ignoring the exception,
       // thus we have to check for dead slots explicitly.
       if (pslot->empty())
       {
-        pslot = handler_list->slots().erase(pslot);
+        pslot = handler_list->erase(pslot);
         continue;
       }