13811N/A--- tests/glibmm_ustring_compose/main.cc.orig 2008-08-07 17:29:05.299259187 +0800

13811N/A+++ tests/glibmm_ustring_compose/main.cc 2008-08-07 17:27:57.073869820 +0800

13811N/A@@ -19,7 +19,7 @@

13811N/A int i = 1;

13811N/A std::cout << Glib::ustring::compose("Compose strings: %1 and %2", 'f', &i) << std::endl;

13811N/A

13811N/A- std::cout << Glib::ustring::compose("%1 is lower than 0x%2.", 12, Glib::ustring::format(std::hex, 16)) << std::endl;

13811N/A+ //std::cout << Glib::ustring::compose("%1 is lower than 0x%2.", 12, Glib::ustring::format(std::hex, 16)) << std::endl;

13811N/A

13811N/A //TODO: More tests.

13811N/A

18458N/Adiff -ruN gio.orig/giomm/drive.cc gio/giomm/drive.cc

18458N/A--- gio.orig/giomm/drive.cc 2010-03-14 06:24:19.418208171 +0000

18458N/A+++ gio/giomm/drive.cc 2010-03-14 06:24:39.550049903 +0000

18458N/A@@ -401,10 +401,10 @@

18458N/A return g_drive_has_volumes(const_cast<GDrive*>(gobj()));

18458N/A }

18458N/A

18458N/A-Glib::ListHandle< Glib::RefPtr<Volume> > Drive::get_volumes()

18458N/A+/*Glib::ListHandle< Glib::RefPtr<Volume> > Drive::get_volumes()

18458N/A {

18458N/A return Glib::ListHandle< Glib::RefPtr<Volume> >(g_drive_get_volumes(gobj()), Glib::OWNERSHIP_SHALLOW);

18458N/A-}

18458N/A+}*/

18458N/A

18458N/A bool Drive::is_media_removable() const

18458N/A {

18552N/Adiff -ruN gio.orig/giomm/appinfo.cc gio/giomm/appinfo.cc

18552N/A--- gio.orig/giomm/appinfo.cc 2010-04-06 15:01:37.726524557 +0100

18552N/A+++ gio/giomm/appinfo.cc 2010-04-06 15:01:57.272777485 +0100

18552N/A@@ -206,6 +206,7 @@

18552N/A {

18552N/A return Glib::RefPtr<AppLaunchContext>( new AppLaunchContext() );

18552N/A }

18552N/A+/*

18552N/A std::string AppLaunchContext::get_display(const Glib::RefPtr<AppInfo>& info, const Glib::ListHandle< Glib::RefPtr<Gio::File> >& files)

18552N/A {

18552N/A return Glib::convert_return_gchar_ptr_to_stdstring(g_app_launch_context_get_display(gobj(), Glib::unwrap(info), files.data()));

18552N/A@@ -215,6 +216,7 @@

18552N/A {

18552N/A return Glib::convert_return_gchar_ptr_to_stdstring(g_app_launch_context_get_startup_notify_id(gobj(), Glib::unwrap(info), files.data()));

18552N/A }

18552N/A+*/

18552N/A

18552N/A void AppLaunchContext::launch_failed(const std::string& startup_notify_id)

18552N/A {