diff -rupN giommOrig//contenttype.cc giommNew//contenttype.cc
--- giommOrig//contenttype.cc	2012-10-06 14:28:36 +0200
+++ giommNew//contenttype.cc	2012-10-24 11:26:04 +0200
@@ -56,9 +56,15 @@ Glib::RefPtr<Gio::Icon> content_type_get
   return retvalue;
 }
 
-Glib::RefPtr<Gio::Icon> content_type_get_symbloic_icon(const Glib::ustring& type)
+Glib::RefPtr<Gio::Icon> content_type_get_symbolic_icon(const Glib::ustring& type)
 {
-  Glib::RefPtr<Icon> retvalue = Glib::wrap(g_content_type_get_symbolic_icon(type.c_str()));
+
+#ifdef G_OS_UNIX
+      Glib::RefPtr<Icon> retvalue = Glib::wrap(g_content_type_get_symbolic_icon(type.c_str()));
+#else
+	Glib::RefPtr<Icon> retvalue = Glib::wrap(g_content_type_get_icon(type.c_str()));
+#endif
+  
   if(retvalue)
     retvalue->reference(); //The function does not do a ref for us.
   return retvalue;
diff -rupN giommOrig//dbusconnection.cc giommNew//dbusconnection.cc
--- giommOrig//dbusconnection.cc	2012-10-21 14:01:59 +0200
+++ giommNew//dbusconnection.cc	2012-10-24 13:13:32 +0200
@@ -1214,38 +1214,41 @@ Glib::VariantContainerBase Connection::c
   return retvalue;
 }
 
-Glib::VariantContainerBase Connection::call_finish(const Glib::RefPtr<AsyncResult>& res, Glib::RefPtr<UnixFDList>& out_fd_list)
-{
-  GError* gerror = 0;
-  GUnixFDList* g_out_fd_list = 0;
-  Glib::VariantContainerBase retvalue = Glib::VariantContainerBase(g_dbus_connection_call_with_unix_fd_list_finish(gobj(), &g_out_fd_list, Glib::unwrap(res), &(gerror)), false);
-  if(gerror)
-    ::Glib::Error::throw_exception(gerror);
-out_fd_list = Glib::wrap(g_out_fd_list);
-  return retvalue;
-}
+#ifdef G_OS_UNIX
+	Glib::VariantContainerBase Connection::call_finish(const Glib::RefPtr<AsyncResult>& res, Glib::RefPtr<UnixFDList>& out_fd_list)
+	{
+	  GError* gerror = 0;
+	  GUnixFDList* g_out_fd_list = 0;
+	  Glib::VariantContainerBase retvalue = Glib::VariantContainerBase(g_dbus_connection_call_with_unix_fd_list_finish(gobj(), &g_out_fd_list, Glib::unwrap(res), &(gerror)), false);
+	  if(gerror)
+		::Glib::Error::throw_exception(gerror);
+	out_fd_list = Glib::wrap(g_out_fd_list);
+	  return retvalue;
+	}
 
-Glib::VariantContainerBase Connection::call_sync(const Glib::ustring& object_path, const Glib::ustring& interface_name, const Glib::ustring& method_name, const Glib::VariantContainerBase& parameters, const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<UnixFDList>& fd_list, Glib::RefPtr<UnixFDList>& out_fd_list, const Glib::ustring& bus_name, int timeout_msec, CallFlags flags, const Glib::VariantType& reply_type)
-{
-  GError* gerror = 0;
-  GUnixFDList* g_out_fd_list = 0;
-  Glib::VariantContainerBase retvalue = Glib::VariantContainerBase(g_dbus_connection_call_with_unix_fd_list_sync(gobj(), bus_name.c_str(), object_path.c_str(), interface_name.c_str(), method_name.c_str(), const_cast<GVariant*>((parameters).gobj()), reply_type.gobj(), ((GDBusCallFlags)(flags)), timeout_msec, Glib::unwrap(fd_list), &g_out_fd_list, const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror)), false);
-  if(gerror)
-    ::Glib::Error::throw_exception(gerror);
-out_fd_list = Glib::wrap(g_out_fd_list);
-  return retvalue;
-}
 
-Glib::VariantContainerBase Connection::call_sync(const Glib::ustring& object_path, const Glib::ustring& interface_name, const Glib::ustring& method_name, const Glib::VariantContainerBase& parameters, const Glib::RefPtr<UnixFDList>& fd_list, Glib::RefPtr<UnixFDList>& out_fd_list, const Glib::ustring& bus_name, int timeout_msec, CallFlags flags, const Glib::VariantType& reply_type)
-{
-  GError* gerror = 0;
-  GUnixFDList* g_out_fd_list = 0;
-  Glib::VariantContainerBase retvalue = Glib::VariantContainerBase(g_dbus_connection_call_with_unix_fd_list_sync(gobj(), bus_name.c_str(), object_path.c_str(), interface_name.c_str(), method_name.c_str(), const_cast<GVariant*>((parameters).gobj()), reply_type.gobj(), ((GDBusCallFlags)(flags)), timeout_msec, Glib::unwrap(fd_list), &g_out_fd_list, 0, &(gerror)), false);
-  if(gerror)
-    ::Glib::Error::throw_exception(gerror);
-out_fd_list = Glib::wrap(g_out_fd_list);
-  return retvalue;
-}
+	Glib::VariantContainerBase Connection::call_sync(const Glib::ustring& object_path, const Glib::ustring& interface_name, const Glib::ustring& method_name, const Glib::VariantContainerBase& parameters, const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<UnixFDList>& fd_list, Glib::RefPtr<UnixFDList>& out_fd_list, const Glib::ustring& bus_name, int timeout_msec, CallFlags flags, const Glib::VariantType& reply_type)
+	{
+	  GError* gerror = 0;
+	  GUnixFDList* g_out_fd_list = 0;
+	  Glib::VariantContainerBase retvalue = Glib::VariantContainerBase(g_dbus_connection_call_with_unix_fd_list_sync(gobj(), bus_name.c_str(), object_path.c_str(), interface_name.c_str(), method_name.c_str(), const_cast<GVariant*>((parameters).gobj()), reply_type.gobj(), ((GDBusCallFlags)(flags)), timeout_msec, Glib::unwrap(fd_list), &g_out_fd_list, const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror)), false);
+	  if(gerror)
+		::Glib::Error::throw_exception(gerror);
+	out_fd_list = Glib::wrap(g_out_fd_list);
+	  return retvalue;
+	}
+
+	Glib::VariantContainerBase Connection::call_sync(const Glib::ustring& object_path, const Glib::ustring& interface_name, const Glib::ustring& method_name, const Glib::VariantContainerBase& parameters, const Glib::RefPtr<UnixFDList>& fd_list, Glib::RefPtr<UnixFDList>& out_fd_list, const Glib::ustring& bus_name, int timeout_msec, CallFlags flags, const Glib::VariantType& reply_type)
+	{
+	  GError* gerror = 0;
+	  GUnixFDList* g_out_fd_list = 0;
+	  Glib::VariantContainerBase retvalue = Glib::VariantContainerBase(g_dbus_connection_call_with_unix_fd_list_sync(gobj(), bus_name.c_str(), object_path.c_str(), interface_name.c_str(), method_name.c_str(), const_cast<GVariant*>((parameters).gobj()), reply_type.gobj(), ((GDBusCallFlags)(flags)), timeout_msec, Glib::unwrap(fd_list), &g_out_fd_list, 0, &(gerror)), false);
+	  if(gerror)
+		::Glib::Error::throw_exception(gerror);
+	out_fd_list = Glib::wrap(g_out_fd_list);
+	  return retvalue;
+	}
+#endif
 
 void Connection::signal_unsubscribe(guint subscription_id)
 {
diff -rupN giommOrig//dbusproxy.cc giommNew//dbusproxy.cc
--- giommOrig//dbusproxy.cc	2012-10-21 14:02:07 +0200
+++ giommNew//dbusproxy.cc	2012-10-24 13:18:35 +0200
@@ -34,6 +34,7 @@
 #include <giomm/dbusconnection.h>
 #include <giomm/dbusintrospection.h>
 #include <giomm/slot_async.h>
+#include <giomm/unixfdlist.h>
 
 namespace Gio
 {
@@ -760,39 +761,40 @@ Glib::VariantContainerBase Proxy::call_f
   return retvalue;
 }
 
-Glib::VariantContainerBase Proxy::call_finish(const Glib::RefPtr<AsyncResult>& res, Glib::RefPtr<UnixFDList>& out_fd_list)
-{
-  GError* gerror = 0;
-  GUnixFDList* g_out_fd_list = 0;
-  Glib::VariantContainerBase retvalue = Glib::VariantContainerBase(g_dbus_proxy_call_with_unix_fd_list_finish(gobj(), &g_out_fd_list, Glib::unwrap(res), &(gerror)), false);
-  if(gerror)
-    ::Glib::Error::throw_exception(gerror);
-out_fd_list = Glib::wrap(g_out_fd_list);
-  return retvalue;
-}
-
-Glib::VariantContainerBase Proxy::call_sync(const Glib::ustring& method_name, const Glib::VariantContainerBase& parameters, const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<UnixFDList>& fd_list, Glib::RefPtr<UnixFDList>& out_fd_list, int timeout_msec, CallFlags flags)
-{
-  GError* gerror = 0;
-  GUnixFDList* g_out_fd_list = 0;
-  Glib::VariantContainerBase retvalue = Glib::VariantContainerBase(g_dbus_proxy_call_with_unix_fd_list_sync(gobj(), method_name.c_str(), const_cast<GVariant*>((parameters).gobj()), ((GDBusCallFlags)(flags)), timeout_msec, Glib::unwrap(fd_list), &g_out_fd_list, const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror)), false);
-  if(gerror)
-    ::Glib::Error::throw_exception(gerror);
-out_fd_list = Glib::wrap(g_out_fd_list);
-  return retvalue;
-}
-
-Glib::VariantContainerBase Proxy::call_sync(const Glib::ustring& method_name, const Glib::VariantContainerBase& parameters, const Glib::RefPtr<UnixFDList>& fd_list, Glib::RefPtr<UnixFDList>& out_fd_list, int timeout_msec, CallFlags flags)
-{
-  GError* gerror = 0;
-  GUnixFDList* g_out_fd_list = 0;
-  Glib::VariantContainerBase retvalue = Glib::VariantContainerBase(g_dbus_proxy_call_with_unix_fd_list_sync(gobj(), method_name.c_str(), const_cast<GVariant*>((parameters).gobj()), ((GDBusCallFlags)(flags)), timeout_msec, Glib::unwrap(fd_list), &g_out_fd_list, 0, &(gerror)), false);
-  if(gerror)
-    ::Glib::Error::throw_exception(gerror);
-out_fd_list = Glib::wrap(g_out_fd_list);
-  return retvalue;
-}
-
+#ifdef G_OS_UNIX
+	Glib::VariantContainerBase Proxy::call_finish(const Glib::RefPtr<AsyncResult>& res, Glib::RefPtr<UnixFDList>& out_fd_list)
+	{
+	  GError* gerror = 0;
+	  GUnixFDList* g_out_fd_list = 0;
+	  Glib::VariantContainerBase retvalue = Glib::VariantContainerBase(g_dbus_proxy_call_with_unix_fd_list_finish(gobj(), &g_out_fd_list, Glib::unwrap(res), &(gerror)), false);
+	  if(gerror)
+		::Glib::Error::throw_exception(gerror);
+	out_fd_list = Glib::wrap(g_out_fd_list);
+	  return retvalue;
+	}
+
+	Glib::VariantContainerBase Proxy::call_sync(const Glib::ustring& method_name, const Glib::VariantContainerBase& parameters, const Glib::RefPtr<Cancellable>& cancellable, const Glib::RefPtr<UnixFDList>& fd_list, Glib::RefPtr<UnixFDList>& out_fd_list, int timeout_msec, CallFlags flags)
+	{
+	  GError* gerror = 0;
+	  GUnixFDList* g_out_fd_list = 0;
+	  Glib::VariantContainerBase retvalue = Glib::VariantContainerBase(g_dbus_proxy_call_with_unix_fd_list_sync(gobj(), method_name.c_str(), const_cast<GVariant*>((parameters).gobj()), ((GDBusCallFlags)(flags)), timeout_msec, Glib::unwrap(fd_list), &g_out_fd_list, const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror)), false);
+	  if(gerror)
+		::Glib::Error::throw_exception(gerror);
+	out_fd_list = Glib::wrap(g_out_fd_list);
+	  return retvalue;
+	}
+
+	Glib::VariantContainerBase Proxy::call_sync(const Glib::ustring& method_name, const Glib::VariantContainerBase& parameters, const Glib::RefPtr<UnixFDList>& fd_list, Glib::RefPtr<UnixFDList>& out_fd_list, int timeout_msec, CallFlags flags)
+	{
+	  GError* gerror = 0;
+	  GUnixFDList* g_out_fd_list = 0;
+	  Glib::VariantContainerBase retvalue = Glib::VariantContainerBase(g_dbus_proxy_call_with_unix_fd_list_sync(gobj(), method_name.c_str(), const_cast<GVariant*>((parameters).gobj()), ((GDBusCallFlags)(flags)), timeout_msec, Glib::unwrap(fd_list), &g_out_fd_list, 0, &(gerror)), false);
+	  if(gerror)
+		::Glib::Error::throw_exception(gerror);
+	out_fd_list = Glib::wrap(g_out_fd_list);
+	  return retvalue;
+	}
+#endif
 
 Glib::SignalProxy2< void,const MapChangedProperties&,const std::vector<Glib::ustring>& > Proxy::signal_properties_changed()
 {