[totem] Substitute some deprecated Glib symbols
- From: Bastien Nocera <hadess src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [totem] Substitute some deprecated Glib symbols
- Date: Mon, 16 Nov 2009 13:05:06 +0000 (UTC)
commit 795304b11ab2463c06bc9cd6341f13b5d7ed0f82
Author: Javier Jardón <jjardon gnome org>
Date: Sat Nov 14 14:02:00 2009 +0100
Substitute some deprecated Glib symbols
Bump Glib required version to 2.22
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=601896
configure.in | 2 +-
src/plugins/bemused/totem-bemused.c | 2 +-
src/totem-object.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index f44645a..ff63733 100644
--- a/configure.in
+++ b/configure.in
@@ -36,7 +36,7 @@ AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
# Requirements
-GLIB_REQS=2.13.4
+GLIB_REQS=2.22
GTK_REQS=2.16.0
TOTEM_PLPARSER_REQS=2.27.0
GNOMEICON_REQS=2.15.90
diff --git a/src/plugins/bemused/totem-bemused.c b/src/plugins/bemused/totem-bemused.c
index f880258..43210c0 100644
--- a/src/plugins/bemused/totem-bemused.c
+++ b/src/plugins/bemused/totem-bemused.c
@@ -302,7 +302,7 @@ download_file (TotemBemusedPlugin *tp, GIOChannel *source)
return;
send_response_flush (tp, source, "DOWNACK", strlen ("DOWNACK"), FALSE);
send_response (tp, source, g_mapped_file_get_contents (file), g_mapped_file_get_length (file));
- g_mapped_file_free (file);
+ g_mapped_file_unref (file);
}
#define STUFF4(x) { \
diff --git a/src/totem-object.c b/src/totem-object.c
index 1d10be7..7c13174 100644
--- a/src/totem-object.c
+++ b/src/totem-object.c
@@ -1015,7 +1015,7 @@ totem_action_eject (Totem *totem)
totem_file_closed (totem);
/* The volume monitoring will take care of removing the items */
- g_mount_eject (mount, G_MOUNT_UNMOUNT_NONE, NULL, NULL, NULL);
+ g_mount_eject_with_operation (mount, G_MOUNT_UNMOUNT_NONE, NULL, NULL, NULL, NULL);
g_object_unref (mount);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]