aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--e-util/ChangeLog9
-rw-r--r--e-util/Makefile.am2
-rw-r--r--e-util/e-popup-menu.c2
-rw-r--r--widgets/misc/e-popup-menu.c2
4 files changed, 13 insertions, 2 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index cb5d4f0a5e..cf73491624 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,12 @@
+2000-08-30 Dan Winship <danw@helixcode.com>
+
+ * Makefile.am (libeutil_la_LIBADD): make e-util depend on
+ libunicode
+
+ * e-popup-menu.c (make_item): Use GtkMenuItem rather than
+ GtkPixmapMenuItem for items with no pixmaps, so that if the whole
+ menu is pixmapless, you don't get a column of blank pixmaps.
+
2000-08-24 Lauris Kaplinski <lauris@helixcode.com>
* e-unicode.h:
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 729a402c4b..d0659bcd4a 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -46,5 +46,7 @@ libeutil_la_SOURCES = \
e-unicode.c \
e-unicode.h
+libeutil_la_LIBADD = $(UNICODE_LIBS)
+
libeutil_static_la_SOURCES = $(libeutil_la_SOURCES)
libeutil_static_la_LDFLAGS = --all-static \ No newline at end of file
diff --git a/e-util/e-popup-menu.c b/e-util/e-popup-menu.c
index 3fb382ae20..2421578dfd 100644
--- a/e-util/e-popup-menu.c
+++ b/e-util/e-popup-menu.c
@@ -33,7 +33,7 @@ make_item (GtkMenu *menu, const char *name, const char *pixname)
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
- item = gtk_pixmap_menu_item_new ();
+ item = pixname ? gtk_pixmap_menu_item_new () : gtk_menu_item_new ();
gtk_container_add (GTK_CONTAINER (item), label);
if (label_accel != GDK_VoidSymbol){
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 3fb382ae20..2421578dfd 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -33,7 +33,7 @@ make_item (GtkMenu *menu, const char *name, const char *pixname)
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
- item = gtk_pixmap_menu_item_new ();
+ item = pixname ? gtk_pixmap_menu_item_new () : gtk_menu_item_new ();
gtk_container_add (GTK_CONTAINER (item), label);
if (label_accel != GDK_VoidSymbol){