[gtkmm/gtkmm-3maybe] (99 commits) ...Fixed merge conflicts from master

[Murray Cumming <murrayc src gnome org>]

Summary of changes:

  00d6b83... Reference the returned statusicon because the RefPtr become (*)
  1270bdf... Stock ID stuff needs documentation (bgo#506885) (*)
  a905887... Fixed bgo #466853 â?? Gtk::Box_Helpers::BoxList::insert() h (*)
  ad76cbd... Gtk::SelectionData::get_uris() documentation fix. (*)
  a827cdd... get_model(): Use refreturn to correct the ref-counting. (*)
  494890b... Windows: Allow building gtkmm statically also when glibmm i (*)
  9caa7a8... Windows: Fixed Uninstaller to uninstall all files (*)
  4efb66f... Windows installer: Create correct zlib1.dll in redist/ dire (*)
  7700a0b... add_item(): Correct a memory allocation to avoid a crash la (*)
  408d43d... Fix the build due to a typo in the previous commit (suggest (*)
  3927a13... Fix the build with GTK+ 2.17.x (*)
  76e6db2... Added InfoBar (*)
  4da073b... * gtk/src/treepath.ccg: Gtk::TreePath::empty() must (*)
  788eeba... Fix Description of a Project (DOAP) file (*)
  aa8fc27... Fix my mail address in MAINTAINERS file (*)
  d84ae57... Increased version (*)
  e1b9cfb... add Gdk::Pixbuf::create_for_stream() and create_for_stream_ (*)
  de3fb49... remove_callback(): When just calling the C callback, becaus (*)
  4474ebb... Correct base type check in Container_Class::remove_callback (*)
  c291efd... Fixed the build. (*)
  9f38a48... Increased version, anticipating a new glibmm release. (*)
  cd79879... Marked the version in the ChangeLog (*)
  87645a0... Gtk::Builder: Fix a crash when the widget is not found. (*)
  e26ae52... GtkBuilder header is inconsistent in exception/error handli (*)
  0741944... Begin transition to mm-common build system (*)
  9b2fd7f... Skip over intermediate subdir in recursion (*)
  c3f48eb... Do not recurse into MSVC or NSI subdirectories (*)
  45cce2f... Convert main source directories to mm-common (*)
  338144b... Convert documentation to new build system (*)
  a61bbac... Correct tag reference to pangomm (*)
  eb317ef... Remove header dependency of gdkmm on gtkmm (*)
  f9a3c8e... Un-invert DISABLE_DEPRECATED_API conditional (*)
  80e5103... Fix GLIBMM vs GTKMM typo (*)
  35d02d5... Bring back demos/ and make it non-recursive (*)
  27b14fb... Remove duplicate image files for pixbuf-demo (*)
  20b2f71... Convert tests/ to non-recursive build (*)
  736bf96... Clean up remaining cruft in scripts/ (*)
  f200d7d... Distribute gtk/gtkmm/wrap_init.h (*)
  66ad584... Reference new canonical name of cairomm tag file (*)
  8505a3b... Rename scripts/ to build/ for consistency (*)
  4df3030... Get rid of obsolete GLIBMM_USING_STD() (*)
  aa245b6... Simplify and update for recent mm-common (*)
  a7cb15c... Provide pkg-config files for uninstalled use (*)
  5ee5684... Update and clean up g[dt]kmmconfig.h (*)
  e73f9f5... Add missing gdkmm dependency to pkg-config file (*)
  25dd5b8... Define *_DISABLE_DEPRECATED in config header (*)
  f7327a3... Append slash to overridden $(htmlrefpub) (*)
  866276e... Make use of new MM_DISABLE_DEPRECATED_API macro (*)
  e876292... Define {ATK,GDK,GTK}MM_BUILD macros (*)
  a8f9d22... Use parametric Doxygen alias @since{m,n} (*)
  b5d296a... Predefine ATKMM_API and GDKMM_API for Doxygen (*)
  31036cf... Substitute API version in filenames dynamically (*)
  61fc927... Do not hard-code API version in resource files (*)
  1b9294b... Rename @since back to @newin (*)
  cc8b6d5... Regenerated the main .defs files. (*)
  db1bc00... Widget, CellRenderer, PrintUnixDialog: Wrapped some new fun (*)
  dbc49a8... Fix an API break. (*)
  c25e451... Regenerated C documentation XML and wrapped some new API. (*)
  6fcf354... RecentInfo: Correct get_application_info() so it can actual (*)
  fb767fb... 2.17.9 (*)
  5000816... Reenable hierarchy graphs for each class (*)
  be7457b... Remove header and footer HTML fragments (*)
  7604620... Use shared mm-common Doxygen style sheet (*)
  89e3cf8... Increment version to 2.17.9.1 and update news (*)
  cd7a414... Remove documentation location override (*)
  6e7713d... Increment version to 2.17.9.2 and update news (*)
  23259e5... Fix documentation location in pkg-config files (*)
  48369a0... Increment version to 2.17.9.3 and update news (*)
  88505a6... Added new getters and a setter. (*)
  f0455a8... Put the usual ifdefs around the newly (*)
  c13181f... Gdk::Window: Wrapped new methods. (*)
  049ee6f... gtk/src/infobar.hg: Added class documentation. (*)
  4629c27... 2.17.11 (*)
  cca807b... Delete obsolete MAINTAINERS file (*)
  803c12d... enums.hg: Include gtkmmconfig.h because we use (*)
  9dff375... window.hg: Added set_icon_name(). (*)
  571dd7a... Correct misuse of container handle (bgo #586626) (*)
  472a36f... Require a recent pangomm. (*)
  3822209... Remove empty api_status.txt file (*)
  da25ac5... Update Doxygen configuration for Doxygen 1.6.1 (*)
  60b911d... Add a TODO comment about get_cursor(). (*)
  e92d1ed... Insert missing Autoconf macro argument separator (*)
  827ec33... Fix build with deprecated C API disabled (*)
  d3e0701... Support Automake silent rules (*)
  c58575f... style.hg: get_style_property(): Use const_cast to maybe (*)
  47c74d5... Regenerate enums .defs. (*)
  dcb749c... gtk/src/gtk_docs.xml: Regenerated. (*)
  ec994bc... * gtk/src/recentmanager.hg: Do not deprecate get_default(). (*)
  c707216... Remove old and unmaintained (major) CHANGES file. (*)
  8a40287... 2.18.1 (*)
  cd92739... 	gtkmm.h: Add infobar.h to list of includes. (*)
  bf601e5... Resurrect Widget::can_default() and can_focus() (*)
  f663bee... Increment version to 2.18.2 and update news (*)
  a1da977... Change return type of Gtk::Dialog::get_action_area(), bug # (*)
  806a238... Correct Gtk::TreeModelColumnRecord documentation (*)
  0b37b88... Update MSVC projects and installer scripts for 2.18 (*)
  a7b7c52... Add some more new files from the GTK+ bundle to the install (*)
  1a97973... VPaned documentation now says that it's vertical.
  2786159... Fixed merge conflicts from master

(*) This commit already existed in another branch; no separate mail sent