tags: patch
thanks
I applied this bugfix in Ubuntu. Other than the debian changelog and
version number this should apply cleanly and correct the problem.
It does not appear to be xines fault per se that a segfault was occuring
- rather its this xpm problem which sets up a triggerable condition that
for some people triggers immediately, for others only triggers with
xine. I haven't tracked down the why of that :[. Theres some very old
code in there from gthumb, it might be worth someone doing a bulk update
of those support widgets.
Rob
diff -u pornview-0.2pre1/debian/changelog
pornview-0.2pre1/debian/changelog
--- pornview-0.2pre1/debian/changelog
+++ pornview-0.2pre1/debian/changelog
@@ -1,3 +1,11 @@
+pornview (0.2pre1-5ubuntu1) dapper; urgency=low
+
+ * Fixed segfault bug on startup due to gtk needing the widget shown rather
+ than just realized to use xpm calls. (Closes lp: #2397)
+ * Disabled xine [temporarily] - the xine opengl plugin was killing X randomly.
+
+ -- Robert Collins <robertc@robertcollins.net> Thu, 23 Mar 2006 18:26:10 +1100
+
pornview (0.2pre1-5build1) dapper; urgency=low
* Rebuild against new libxine-main1
diff -u pornview-0.2pre1/debian/rules pornview-0.2pre1/debian/rules
--- pornview-0.2pre1/debian/rules
+++ pornview-0.2pre1/debian/rules
@@ -19,8 +19,9 @@
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- --with-gtk2 \
- --enable-xine
+ --with-gtk2
+#\
+# --enable-xine
build: build-stamp
only in patch2:
unchanged:
--- pornview-0.2pre1.orig/src/browser.c
+++ pornview-0.2pre1/src/browser.c
@@ -138,6 +138,7 @@
browser->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (GTK_WINDOW (browser->window), "PornView");
gtk_widget_realize (browser->window);
+ gtk_widget_show(browser->window);
icon_pix =
gdk_pixmap_create_from_xpm_d (G_WINDOW (browser->window), &icon_mask,
@@ -207,7 +208,7 @@
NULL);
hpaned = gedo_hpaned_new ();
- gtk_container_add (GTK_CONTAINER (vbox), hpaned);
+ gtk_box_pack_start (GTK_BOX (vbox), hpaned, TRUE, TRUE, 0);
gtk_widget_show (hpaned);
vpaned = gedo_vpaned_new ();
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.
Attachment:
signature.asc
Description: This is a digitally signed message part