callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make e-util depend on libunicode

Browse Source 
* 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.

svn path=/trunk/; revision=5114
This commit is contained in:
Dan Winship
2000-08-30 15:28:36 +00:00
parent 6c6dba281e
commit ccda437a9a
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e-util/ChangeLog
View File

@ -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:

2
e-util/Makefile.am
View File

@ -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

2
e-util/e-popup-menu.c
View File

@ -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){

2
widgets/misc/e-popup-menu.c
View File

@ -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){