aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-04-26 20:15:50 +0800
committerChristian Persch <chpe@src.gnome.org>2005-04-26 20:15:50 +0800
commitacb714c91f67a95851bada8d1c272e52b579f3ab (patch)
treec405ca22c346af7bfd5f738579df04b1e5f61c09
parent02cf429a553ed39f8389a8c93ba667305162a9aa (diff)
downloadgsoc2013-epiphany-acb714c91f67a95851bada8d1c272e52b579f3ab.tar
gsoc2013-epiphany-acb714c91f67a95851bada8d1c272e52b579f3ab.tar.gz
gsoc2013-epiphany-acb714c91f67a95851bada8d1c272e52b579f3ab.tar.bz2
gsoc2013-epiphany-acb714c91f67a95851bada8d1c272e52b579f3ab.tar.lz
gsoc2013-epiphany-acb714c91f67a95851bada8d1c272e52b579f3ab.tar.xz
gsoc2013-epiphany-acb714c91f67a95851bada8d1c272e52b579f3ab.tar.zst
gsoc2013-epiphany-acb714c91f67a95851bada8d1c272e52b579f3ab.zip
Try to fix crash in toolbar editor with X composite extension. Should fix
2005-04-26 Christian Persch <chpe@cvs.gnome.org> * lib/egg/egg-editable-toolbar.c: (new_pixbuf_from_widget): Try to fix crash in toolbar editor with X composite extension. Should fix bug #159767, patch by Colin Gibbs from Control Centre bug #152490.
-rw-r--r--ChangeLog7
-rwxr-xr-xlib/egg/egg-editable-toolbar.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 80acd0e02..8419e478b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-04-26 Christian Persch <chpe@cvs.gnome.org>
+ * lib/egg/egg-editable-toolbar.c: (new_pixbuf_from_widget):
+
+ Try to fix crash in toolbar editor with X composite extension. Should fix bug
+ #159767, patch by Colin Gibbs from Control Centre bug #152490.
+
+2005-04-26 Christian Persch <chpe@cvs.gnome.org>
+
* configure.ac:
Fix filepicker check.
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index 210cebe8c..199e9e621 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -1395,7 +1395,7 @@ new_pixbuf_from_widget (GtkWidget *widget)
/* Create a pixmap */
visual = gtk_widget_get_visual (window);
- pixmap = gdk_pixmap_new (NULL, icon_width, icon_height, gdk_visual_get_best_depth());
+ pixmap = gdk_pixmap_new (NULL, icon_width, icon_height, visual->depth);
gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (window));
/* Draw the window */