aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/misc/ChangeLog6
-rw-r--r--widgets/misc/e-combo-button.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 52396e7c15..1280ac2e16 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-23 Dan Winship <danw@ximian.com>
+
+ * e-combo-button.c (create_empty_pixmap_widget): Create the pixbuf
+ from empty.xpm rather than just calling gdk_pixbuf_new(), which
+ doesn't actually initialize the pixel data.
+
2003-07-11 Federico Mena Quintero <federico@ximian.com>
* e-dateedit.c (e_date_edit_mnemonic_activate): Added a handler
diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c
index b4c75073fe..5d77d9daf8 100644
--- a/widgets/misc/e-combo-button.c
+++ b/widgets/misc/e-combo-button.c
@@ -25,6 +25,7 @@
#endif
#include "e-combo-button.h"
+#include "art/empty.xpm"
#include <gtk/gtkarrow.h>
#include <gtk/gtkhbox.h>
@@ -89,7 +90,7 @@ create_empty_pixmap_widget (void)
GtkWidget *pixmap_widget;
GdkPixbuf *pixbuf;
- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 1, 1);
+ pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **)empty_xpm);
pixmap_widget = create_pixmap_widget_from_pixbuf (pixbuf);