summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2007-05-29 18:46:24 +0000
committerBastien Nocera <hadess@src.gnome.org>2007-05-29 18:46:24 +0000
commitb03f808e37eb78399b6b99e6d5de7a10d81342ee (patch)
treeacf108f5adbf1efcacca546134be8ab48b829e06
parentd358bfb611d2544d3d735a095762377c52ed2ba7 (diff)
downloadtotem-b03f808e37eb78399b6b99e6d5de7a10d81342ee.tar.gz
Fix a few run-time warnings Don't forget to init GStreamer when in GTK+
2007-05-29 Bastien Nocera <hadess@hadess.net> * src/backend/bacon-video-widget-gst-0.10.c: (bacon_video_widget_new): * src/totem-menu.c: (totem_lang_table_parse_start_tag): Fix a few run-time warnings * src/totem.c: (main): Don't forget to init GStreamer when in GTK+ only mode svn path=/branches/gnome-2-16/; revision=4327
-rw-r--r--ChangeLog9
-rw-r--r--src/backend/bacon-video-widget-gst-0.10.c1
-rw-r--r--src/totem-menu.c4
-rw-r--r--src/totem.c1
4 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 46e6d7f7f..5f2ef2a38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-29 Bastien Nocera <hadess@hadess.net>
+
+ * src/backend/bacon-video-widget-gst-0.10.c:
+ (bacon_video_widget_new):
+ * src/totem-menu.c: (totem_lang_table_parse_start_tag):
+ Fix a few run-time warnings
+ * src/totem.c: (main): Don't forget to init GStreamer
+ when in GTK+ only mode
+
2007-04-18 Bastien Nocera <hadess@hadess.net>
* src/backend/bacon-video-widget-gst-0.10.c:
diff --git a/src/backend/bacon-video-widget-gst-0.10.c b/src/backend/bacon-video-widget-gst-0.10.c
index fd1ecf7e7..72f29fa73 100644
--- a/src/backend/bacon-video-widget-gst-0.10.c
+++ b/src/backend/bacon-video-widget-gst-0.10.c
@@ -4285,6 +4285,7 @@ bacon_video_widget_new (int width, int height,
g_set_error (err, BVW_ERROR, BVW_ERROR_PLUGIN_LOAD,
_("Failed to create a GStreamer play object. "
"Please check your GStreamer installation."));
+ g_object_ref_sink (bvw);
g_object_unref (bvw);
return NULL;
}
diff --git a/src/totem-menu.c b/src/totem-menu.c
index 28aaba9f9..73c38b58c 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -77,14 +77,14 @@ totem_lang_table_parse_start_tag (GMarkupParseContext *ctx,
/* skip if empty */
if (**attr_values)
{
- g_return_if_fail (strlen (*attr_values) == 3);
+ g_return_if_fail (strlen (*attr_values) == 3 || strcmp (*attr_values, "qaa-qtz") == 0);
ccode_longB = *attr_values;
}
} else if (g_str_equal (*attr_names, "iso_639_2T_code")) {
/* skip if empty */
if (**attr_values)
{
- g_return_if_fail (strlen (*attr_values) == 3);
+ g_return_if_fail (strlen (*attr_values) == 3 || strcmp (*attr_values, "qaa-qtz") == 0);
ccode_longT = *attr_values;
}
} else if (g_str_equal (*attr_names, "name")) {
diff --git a/src/totem.c b/src/totem.c
index f855f5567..ebc4b6e5a 100644
--- a/src/totem.c
+++ b/src/totem.c
@@ -3664,6 +3664,7 @@ main (int argc, char **argv)
#ifdef HAVE_GTK_ONLY
gtk_init (&argc, &argv);
+ bacon_video_widget_init_backend (&argc, &argv);
#else
gnome_program_init ("totem", VERSION,
LIBGNOMEUI_MODULE,