[glibmm/glibmm-2-20-mm-common: 155/179] Merge commit 'ebe9876bbfbd6abbd1fd1f901aa224b5ca2a8ab2' into glibmm-2-20-mm-common

[Daniel Elstner <daniel src gnome org>]

commit 67fc229caac614728eb6f2c11212a2cdfd393444
Merge: c80fe91... ebe9876...
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sat Sep 5 10:40:09 2009 +0200

    Merge commit 'ebe9876bbfbd6abbd1fd1f901aa224b5ca2a8ab2' into glibmm-2-20-mm-common

 examples/properties/properties_example.cc |    2 +-
 tests/giomm_ioerror/main.cc               |    2 +-
 tools/extra_defs_gen/generate_defs_gio.cc |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --cc examples/properties/properties_example.cc
index c534790,82ad4ae..0f7578b
--- a/examples/properties/properties_example.cc
+++ b/examples/properties/properties_example.cc
@@@ -58,11 -56,9 +58,11 @@@ void on_lastname_changed (
  { std::cout << "- lastname changed!" << std::endl; }
  void on_age_changed ()
  { std::cout << "- age changed!" << std::endl; }
 +#endif // GLIBMM_PROPERTIES_ENABLED
  
- int main (int argc, char** argv)
+ int main(int, char**)
  {
 +#ifdef GLIBMM_PROPERTIES_ENABLED
      Glib::init ();
      Person p;
      // Register some handlers that will be called when the values of the