? eel-ellipsizing-label.c
? eel-ellipsizing-label.h
? eel-gtk-macros.h
? eel-pango-extensions.c
? eel-pango-extensions.h
? eel-string.c
? eel-string.h
? update-from-eel.sh
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/wncklet/ChangeLog,v
retrieving revision 1.487
diff -u -r1.487 ChangeLog
--- ChangeLog	7 Oct 2003 12:49:21 -0000	1.487
+++ ChangeLog	9 Oct 2003 11:51:15 -0000
@@ -1,3 +1,16 @@
+2003-10-09  Vincent Untz  <vincent@vuntz.net>
+
+	* eel-ellipsizing-label.[ch], eel-gtk-macros.h,
+	eel-pango-extensions.[ch], eel-string.[ch], update-from-eel.sh: added
+	these.
+
+	* Makefile.am: added the stuff for eel-*.
+
+	* window-menu.c: (window_menu_image_menu_item_new_with_eel_label):
+	function to create an image menu item containing an ellipsizing label.
+	(window_menu_add_window), (window_menu_popup_menu): use above function.
+	Fix bug #119647.
+
 2003-10-07  Padraig O'Briain <padraig.obriain@sun.com>
 
 	* showdesktop.c (show_desktop_applet_fill): Set accessible name for
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/wncklet/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- Makefile.am	30 May 2003 11:30:24 -0000	1.7
+++ Makefile.am	9 Oct 2003 11:51:15 -0000
@@ -23,7 +23,8 @@
 	-DPREFIX=\"$(prefix)\" \
         -DSYSCONFDIR=\"$(sysconfdir)\" \
         -DDATADIR=\"$(datadir)\" \
-        -DLIBDIR=\"$(libdir)\"
+        -DLIBDIR=\"$(libdir)\" \
+        -DEEL_OMIT_SELF_CHECK
 
 EGGFILES = \
 	egg-screen-exec.h \
@@ -33,6 +34,15 @@
 	egg-screen-url.h \
 	egg-screen-url.c
 
+EELFILES = \
+	eel-ellipsizing-label.h \
+	eel-ellipsizing-label.c \
+	eel-pango-extensions.h \
+	eel-pango-extensions.c \
+	eel-gtk-macros.h \
+	eel-string.h \
+	eel-string.c
+
 wnck_applet_SOURCES = \
 	wncklet.c \
 	wncklet.h \
@@ -44,7 +54,8 @@
 	workspace-switcher.h \
 	showdesktop.c \
 	showdesktop.h \
-	$(EGGFILES)
+	$(EGGFILES) \
+	$(EELFILES)
 
 $(wnck_applet_OBJECTS): $(BUILT_SOURCES)
 
@@ -92,9 +103,11 @@
 	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
 
 EGGDIR = $(srcdir)/../../../libegg/libegg/screen-exec
+EELDIR = $(srcdir)/../../../eel/eel
 
 regenerate-built-sources:
 	EGGFILES="$(EGGFILES)" EGGDIR="$(EGGDIR)" $(srcdir)/update-from-egg.sh
+	EELFILES="$(EELFILES)" EELDIR="$(EELDIR)" $(srcdir)/update-from-eel.sh
 
 schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
 schemas_in_files = workspace-switcher.schemas.in window-list.schemas.in 
Index: window-menu.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/wncklet/window-menu.c,v
retrieving revision 1.6
diff -u -r1.6 window-menu.c
--- window-menu.c	7 Oct 2003 12:49:21 -0000	1.6
+++ window-menu.c	9 Oct 2003 11:51:15 -0000
@@ -39,6 +39,7 @@
 #include <libwnck/libwnck.h>
 
 #include "inlinepixbufs.h"
+#include "eel-ellipsizing-label.h"
 #include "egg-screen-help.h"
 #include "wncklet.h"
 
@@ -323,6 +324,26 @@
 	wnck_window_activate (window);
 }
 
+static GtkWidget*
+window_menu_image_menu_item_new_with_eel_label (WindowMenu  *window_menu,
+						const gchar *label)
+{
+	GtkWidget *item;
+	GtkWidget *ellipsizing_label;
+
+	item = gtk_image_menu_item_new ();
+
+	gtk_widget_set_size_request (item, gdk_screen_get_width (gtk_widget_get_screen (window_menu->applet)) / 6, -1);
+
+	ellipsizing_label = eel_ellipsizing_label_new (label);
+	gtk_misc_set_alignment (GTK_MISC (ellipsizing_label), 0.0, 0.5);
+
+	gtk_container_add (GTK_CONTAINER (item), ellipsizing_label);
+	gtk_widget_show (ellipsizing_label);
+
+	return item;
+}
+
 static void
 window_menu_add_window (WindowMenu *window_menu,
 			WnckWindow *window)
@@ -348,7 +369,7 @@
 		freeme = label;
 	}
 
-	item = gtk_image_menu_item_new_with_label (label);
+	item = window_menu_image_menu_item_new_with_eel_label (window_menu, label);
 	if (freeme)
 		g_free (freeme);
 
@@ -535,7 +556,7 @@
 	if (!l) {
 		GtkWidget *item;
 		
-		item = gtk_menu_item_new_with_label (_("No Windows Open"));
+		item = window_menu_image_menu_item_new_with_eel_label (window_menu, _("No Windows Open"));
 
 		gtk_widget_set_sensitive (item, FALSE);
 		gtk_widget_show (item);	
