[rhythmbox] require glib 2.36 and stop calling g_type_init
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] require glib 2.36 and stop calling g_type_init
- Date: Sun, 19 Jun 2016 03:30:39 +0000 (UTC)
commit 704ac8e4fbb8726e30abe77fbf15a0e3dbdbc351
Author: Jonathan Matthew <jonathan d14n org>
Date: Sat Jun 18 15:58:40 2016 +1000
require glib 2.36 and stop calling g_type_init
configure.ac | 2 +-
lib/libmediaplayerid/testmpid.c | 2 --
metadata/rb-metadata-dbus-service.c | 1 -
metadata/test-metadata.c | 2 --
plugins/audiocd/test-cd.c | 1 -
podcast/test-podcast-parse.c | 1 -
podcast/test-podcast-search.c | 1 -
remote/dbus/rb-client.c | 1 -
shell/main.c | 1 -
tests/test-audioscrobbler.c | 1 -
tests/test-rb-lib.c | 1 -
11 files changed, 1 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d37b15f..2ff5bf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ GTK_REQS=3.12.0
GST_REQS=1.4.0
GDK_PIXBUF_REQS=2.18.0
-GLIB_REQS=2.34.0
+GLIB_REQS=2.36.0
LIBGPOD_REQS=0.6
TOTEM_PLPARSER_REQS=3.2.0
VALA_REQS=0.9.4
diff --git a/lib/libmediaplayerid/testmpid.c b/lib/libmediaplayerid/testmpid.c
index 367c314..2e909c5 100644
--- a/lib/libmediaplayerid/testmpid.c
+++ b/lib/libmediaplayerid/testmpid.c
@@ -22,8 +22,6 @@ main (int argc, char **argv)
{
MPIDDevice *device;
- g_type_init ();
-
mpid_enable_debug (TRUE);
device = mpid_device_new (argv[1]);
diff --git a/metadata/rb-metadata-dbus-service.c b/metadata/rb-metadata-dbus-service.c
index 8280b2c..2a1f22d 100644
--- a/metadata/rb-metadata-dbus-service.c
+++ b/metadata/rb-metadata-dbus-service.c
@@ -338,7 +338,6 @@ main (int argc, char **argv)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
#endif
- g_type_init ();
gst_init (NULL, NULL);
g_set_prgname ("rhythmbox-metadata");
diff --git a/metadata/test-metadata.c b/metadata/test-metadata.c
index 50363ef..6ece435 100644
--- a/metadata/test-metadata.c
+++ b/metadata/test-metadata.c
@@ -147,8 +147,6 @@ int main(int argc, char **argv)
gboolean retval;
GError *error = NULL;
- g_type_init ();
-
context = g_option_context_new (NULL);
g_option_context_add_main_entries (context, entries, NULL);
retval = g_option_context_parse (context, &argc, &argv, &error);
diff --git a/plugins/audiocd/test-cd.c b/plugins/audiocd/test-cd.c
index e7d3526..65faa90 100644
--- a/plugins/audiocd/test-cd.c
+++ b/plugins/audiocd/test-cd.c
@@ -216,7 +216,6 @@ main (int argc, char **argv)
{
char *thing;
- g_type_init ();
gst_init (NULL, NULL);
if (argv[1] == NULL) {
diff --git a/podcast/test-podcast-parse.c b/podcast/test-podcast-parse.c
index 7ed5907..0ad8c37 100644
--- a/podcast/test-podcast-parse.c
+++ b/podcast/test-podcast-parse.c
@@ -74,7 +74,6 @@ int main (int argc, char **argv)
char datebuf[1024];
GError *error = NULL;
- g_type_init ();
setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
diff --git a/podcast/test-podcast-search.c b/podcast/test-podcast-search.c
index bd0ca43..10ea73e 100644
--- a/podcast/test-podcast-search.c
+++ b/podcast/test-podcast-search.c
@@ -123,7 +123,6 @@ int main (int argc, char **argv)
RBPodcastSearch *miroguide;
char *text;
- g_type_init ();
setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
diff --git a/remote/dbus/rb-client.c b/remote/dbus/rb-client.c
index 70e682b..9134ec6 100644
--- a/remote/dbus/rb-client.c
+++ b/remote/dbus/rb-client.c
@@ -1018,7 +1018,6 @@ main (int argc, char **argv)
#endif
/* setup */
setlocale (LC_ALL, "");
- g_type_init ();
g_set_prgname ("rhythmbox-client");
/* parse arguments */
diff --git a/shell/main.c b/shell/main.c
index 262d580..5060f65 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -59,7 +59,6 @@ main (int argc, char **argv)
}
#endif
- g_type_init ();
g_random_set_seed (time (0));
#ifdef USE_UNINSTALLED_DIRS
diff --git a/tests/test-audioscrobbler.c b/tests/test-audioscrobbler.c
index 32c7514..95d417d 100644
--- a/tests/test-audioscrobbler.c
+++ b/tests/test-audioscrobbler.c
@@ -95,7 +95,6 @@ main (int argc, char **argv)
rb_profile_start ("rb-audioscrobbler test suite");
rb_threads_init ();
- g_type_init ();
rb_debug_init (TRUE);
/* setup tests */
diff --git a/tests/test-rb-lib.c b/tests/test-rb-lib.c
index 73cb43a..f3cb4d5 100644
--- a/tests/test-rb-lib.c
+++ b/tests/test-rb-lib.c
@@ -104,7 +104,6 @@ main (int argc, char **argv)
rb_profile_start ("rb-utils test suite");
rb_threads_init ();
- g_type_init ();
rb_debug_init (TRUE);
/* setup tests */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]