diff options
| author | Armin Burgmeier <armin@arbur.net> | 2008-06-29 10:28:26 +0000 |
|---|---|---|
| committer | Armin Burgmeier <arminb@src.gnome.org> | 2008-06-29 10:28:26 +0000 |
| commit | b6df2c99d55931479a71de5b3492f0deb8928bfa (patch) | |
| tree | 66b407f387293c09b1f3d45dfe3c3a1025fa6925 /gio/src/file.ccg | |
| parent | a745d42732a3183a4606eed28db66c7fdf5772cf (diff) | |
| download | glibmm-b6df2c99d55931479a71de5b3492f0deb8928bfa.tar.gz | |
Pass NULL to the underlying C function for the etags parameter in various
2008-06-28 Armin Burgmeier <armin@arbur.net>
* gio/src/file.ccg: Pass NULL to the underlying C function for the
etags parameter in various *_replace functions. Otherwise, existing
files are not overwritten.
svn path=/trunk/; revision=678
Diffstat (limited to 'gio/src/file.ccg')
| -rw-r--r-- | gio/src/file.ccg | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gio/src/file.ccg b/gio/src/file.ccg index facfa870..ebba5410 100644 --- a/gio/src/file.ccg +++ b/gio/src/file.ccg @@ -243,7 +243,7 @@ File::replace_async(const SlotAsyncReady& slot, const Glib::RefPtr<Cancellable>& SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); g_file_replace_async(gobj(), - etag.c_str(), + etag.empty() ? NULL : etag.c_str(), make_backup, static_cast<GFileCreateFlags>(flags), io_priority, @@ -261,7 +261,7 @@ File::replace_async(const SlotAsyncReady& slot, const std::string& etag, bool ma SlotAsyncReady* slot_copy = new SlotAsyncReady(slot); g_file_replace_async(gobj(), - etag.c_str(), + etag.empty() ? NULL : etag.c_str(), make_backup, static_cast<GFileCreateFlags>(flags), io_priority, @@ -1513,7 +1513,7 @@ Glib::RefPtr<FileOutputStream> File::replace(const Glib::RefPtr<Cancellable>& ca #endif //GLIBMM_EXCEPTIONS_ENABLED { GError* gerror = 0; - Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_replace(gobj(), etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); + Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_replace(gobj(), etag.empty() ? NULL : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), const_cast<GCancellable*>(Glib::unwrap(cancellable)), &(gerror))); #ifdef GLIBMM_EXCEPTIONS_ENABLED if(gerror) ::Glib::Error::throw_exception(gerror); @@ -1532,7 +1532,7 @@ Glib::RefPtr<FileOutputStream> File::replace(const std::string& etag, bool make_ #endif //GLIBMM_EXCEPTIONS_ENABLED { GError* gerror = 0; - Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_replace(gobj(), etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), NULL, &(gerror))); + Glib::RefPtr<FileOutputStream> retvalue = Glib::wrap(g_file_replace(gobj(), etag.empty() ? NULL : etag.c_str(), static_cast<int>(make_backup), ((GFileCreateFlags)(flags)), NULL, &(gerror))); #ifdef GLIBMM_EXCEPTIONS_ENABLED if(gerror) ::Glib::Error::throw_exception(gerror); |