diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-12-24 20:29:26 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-12-24 20:29:26 +0000 |
commit | 26af9ea91e7adfac1b89122cb6a1d84f34d70231 (patch) | |
tree | 07b1284b527a5eef8cd83e0e39c684e2307e7d82 /audio | |
parent | Drop html manpages. (diff) |
Fix saving in gnome-sound-recorder. See
http://bugzilla.gnome.org/show_bug.cgi?id=162185 for more details.
Reported by: h <h@erathia.be>
Notes
Notes:
svn path=/head/; revision=125091
Diffstat (limited to 'audio')
-rw-r--r-- | audio/gnome-media/Makefile | 2 | ||||
-rw-r--r-- | audio/gnome-media/files/patch-grecord_gsr-window.c | 57 | ||||
-rw-r--r-- | audio/gnomemedia2/Makefile | 2 | ||||
-rw-r--r-- | audio/gnomemedia2/files/patch-grecord_gsr-window.c | 57 |
4 files changed, 116 insertions, 2 deletions
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index da20629ba7ab..52f0782679f1 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomemedia2 PORTVERSION= 2.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-media/2.8 diff --git a/audio/gnome-media/files/patch-grecord_gsr-window.c b/audio/gnome-media/files/patch-grecord_gsr-window.c new file mode 100644 index 000000000000..7ed0b461ca1a --- /dev/null +++ b/audio/gnome-media/files/patch-grecord_gsr-window.c @@ -0,0 +1,57 @@ +--- grecord/gsr-window.c.orig Fri Dec 24 15:16:11 2004 ++++ grecord/gsr-window.c Fri Dec 24 15:16:13 2004 +@@ -29,7 +29,7 @@ + #include <unistd.h> + + #include <gnome.h> +-#include <libgnomevfs/gnome-vfs-utils.h> ++#include <libgnomevfs/gnome-vfs.h> + #include <gconf/gconf-client.h> + #include <gst/gst.h> + #include <gst/gconf/gconf.h> +@@ -475,16 +475,41 @@ + { + GSRWindowPrivate *priv; + GMAudioProfile *profile; +- char *tmp; ++ char *tmp, *src; ++ GnomeVFSURI *src_uri, *dst_uri; + + priv = window->priv; + + profile = gm_audio_profile_choose_get_active (priv->profile); + +- tmp = g_strdup_printf ("%s.%s", name, ++ tmp = g_strdup_printf ("file://%s.%s", name, + gm_audio_profile_get_extension (profile)); +- rename (priv->record_filename, tmp); +- g_free (tmp); ++ src = g_strdup_printf ("file://%s", priv->record_filename); ++ src_uri = gnome_vfs_uri_new (src); ++ dst_uri = gnome_vfs_uri_new (tmp); ++ g_free (src); ++ g_free (tmp); ++ if (src_uri && dst_uri) { ++ GnomeVFSResult result; ++ result = gnome_vfs_xfer_uri (src_uri, dst_uri, ++ GNOME_VFS_XFER_DEFAULT, ++ GNOME_VFS_XFER_ERROR_MODE_ABORT, ++ GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, ++ NULL, NULL); ++ if (result == GNOME_VFS_OK) { ++ char *title, *short_name; ++ priv->filename = g_strdup_printf ("%s.%s", ++ name, gm_audio_profile_get_extension (profile)); ++ short_name = g_path_get_basename (priv->filename); ++ title = g_strdup_printf ("%s - Sound Recorder", ++ short_name); ++ gtk_window_set_title (GTK_WINDOW (window), title); ++ priv->dirty = FALSE; ++ g_free (title); ++ } ++ gnome_vfs_uri_unref (src_uri); ++ gnome_vfs_uri_unref (dst_uri); ++ } + } + + static void diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index da20629ba7ab..52f0782679f1 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomemedia2 PORTVERSION= 2.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-media/2.8 diff --git a/audio/gnomemedia2/files/patch-grecord_gsr-window.c b/audio/gnomemedia2/files/patch-grecord_gsr-window.c new file mode 100644 index 000000000000..7ed0b461ca1a --- /dev/null +++ b/audio/gnomemedia2/files/patch-grecord_gsr-window.c @@ -0,0 +1,57 @@ +--- grecord/gsr-window.c.orig Fri Dec 24 15:16:11 2004 ++++ grecord/gsr-window.c Fri Dec 24 15:16:13 2004 +@@ -29,7 +29,7 @@ + #include <unistd.h> + + #include <gnome.h> +-#include <libgnomevfs/gnome-vfs-utils.h> ++#include <libgnomevfs/gnome-vfs.h> + #include <gconf/gconf-client.h> + #include <gst/gst.h> + #include <gst/gconf/gconf.h> +@@ -475,16 +475,41 @@ + { + GSRWindowPrivate *priv; + GMAudioProfile *profile; +- char *tmp; ++ char *tmp, *src; ++ GnomeVFSURI *src_uri, *dst_uri; + + priv = window->priv; + + profile = gm_audio_profile_choose_get_active (priv->profile); + +- tmp = g_strdup_printf ("%s.%s", name, ++ tmp = g_strdup_printf ("file://%s.%s", name, + gm_audio_profile_get_extension (profile)); +- rename (priv->record_filename, tmp); +- g_free (tmp); ++ src = g_strdup_printf ("file://%s", priv->record_filename); ++ src_uri = gnome_vfs_uri_new (src); ++ dst_uri = gnome_vfs_uri_new (tmp); ++ g_free (src); ++ g_free (tmp); ++ if (src_uri && dst_uri) { ++ GnomeVFSResult result; ++ result = gnome_vfs_xfer_uri (src_uri, dst_uri, ++ GNOME_VFS_XFER_DEFAULT, ++ GNOME_VFS_XFER_ERROR_MODE_ABORT, ++ GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, ++ NULL, NULL); ++ if (result == GNOME_VFS_OK) { ++ char *title, *short_name; ++ priv->filename = g_strdup_printf ("%s.%s", ++ name, gm_audio_profile_get_extension (profile)); ++ short_name = g_path_get_basename (priv->filename); ++ title = g_strdup_printf ("%s - Sound Recorder", ++ short_name); ++ gtk_window_set_title (GTK_WINDOW (window), title); ++ priv->dirty = FALSE; ++ g_free (title); ++ } ++ gnome_vfs_uri_unref (src_uri); ++ gnome_vfs_uri_unref (dst_uri); ++ } + } + + static void |