# HG changeset patch
# User Darren Salt <[EMAIL PROTECTED]>
# Date 1171661288 0
# Node ID 469d762ec1091dfbb425613a8e4578788bd0d674
# Parent 59aa89e26e7638348f5d8fc64c35c05ba15a90f9
Fixed an init failure which would cause GDK assertion failures and a segfault.
This is known to affect gxine in a chrooted environment when talking to a
non-chrooted X server on the same machine; it is a partial reversion
of a change which was made between 0.5.9 and 0.5.10.
diff -r 469d762ec1091dfbb425613a8e4578788bd0d674 -r
59aa89e26e7638348f5d8fc64c35c05ba15a90f9 ChangeLog
--- a/ChangeLog Fri Feb 16 21:28:08 2007 +0000
+++ b/ChangeLog Fri Feb 16 17:19:10 2007 +0000
@@ -34,8 +34,11 @@ 0.5.900:2007/??/??
* Reworked the JS property code somewhat. No user-visible changes.
* Only display the "broken xine-lib" message (for when there is no
demuxer for the logo image) at most once.
- * Hopefully fixed a possible initialisation failure which would cause
- various GDK "window != NULL" assertion failures and a segfault.
+ * Fixed a possible initialisation failure which would cause various GDK
+ "window != NULL" assertion failures and a segfault. This is known to
+ affect gxine in a chrooted environment when talking to a non-chrooted
+ X server on the same machine, and includes a partial reversion of a
+ change which was made between 0.5.9 and 0.5.10.
* Moved the windowed-mode blanking menu item into a new submenu in
the View menu.
* Tweaked and re-rendered the splash and logo images.
diff -r 469d762ec1091dfbb425613a8e4578788bd0d674 -r
59aa89e26e7638348f5d8fc64c35c05ba15a90f9 src/noskin_window.c
--- a/src/noskin_window.c Fri Feb 16 21:28:08 2007 +0000
+++ b/src/noskin_window.c Fri Feb 16 17:19:10 2007 +0000
@@ -652,15 +652,6 @@ xevent_filter_cb (GdkXEvent *gx, GdkEven
static gboolean noskin_main_init_cb (void)
{
- xine_cfg_entry_t entry;
- if (xine_config_lookup_entry (xine, "gui.window_size", &entry))
- {
- static const gdouble scale[] = { 50, 75, 100, 150, 200 };
- gtk_video_rescale ((GtkVideo *)gtv, scale[entry.num_value]);
- }
- if (xine_config_lookup_entry (xine, "gui.magnify_lowres_video", &entry))
- gtk_video_set_auto_rescale ((GtkVideo *)gtv, entry.num_value);
-
gtk_widget_add_events (app, GDK_KEY_RELEASE_MASK);
g_object_connect (G_OBJECT (app),
"signal::key-press-event", G_CALLBACK (keypress_cb), wm_toolbar,
@@ -737,6 +728,19 @@ wm_show_hide_setup (gpointer object)
NULL);
}
+static gboolean noskin_post_init (gboolean unused)
+{
+ xine_cfg_entry_t entry;
+ if (xine_config_lookup_entry (xine, "gui.window_size", &entry))
+ {
+ static const gdouble scale[] = { 50, 75, 100, 150, 200 };
+ gtk_video_rescale ((GtkVideo *)gtv, scale[entry.num_value]);
+ }
+ if (xine_config_lookup_entry (xine, "gui.magnify_lowres_video", &entry))
+ gtk_video_set_auto_rescale ((GtkVideo *)gtv, entry.num_value);
+ return FALSE;
+}
+
void noskin_main_init (const gchar *geometry)
{
@@ -813,6 +817,8 @@ void noskin_main_init (const gchar *geom
0x04 /* press: button 2 */,
0x08 /* release: button 3 */);
+ gtk_init_add ((GSourceFunc) noskin_post_init, NULL);
+
if (!wm_toolbar)
{
/*
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
