Only in gnome-panel-2.4.1-del1/applets/clock: clock.schemas
Only in gnome-panel-2.4.1-del1/applets/fish: fish.schemas
Only in gnome-panel-2.4.1-del1/applets/fish: GNOME_FishApplet_Factory.server
Only in gnome-panel-2.4.1-del1/applets/fish: GNOME_FishApplet_Factory.server.in
Only in gnome-panel-2.4.1-del1/applets/notification_area: eggmarshalers.c
Only in gnome-panel-2.4.1-del1/applets/notification_area: eggmarshalers.h
diff -r -u gnome-panel-2.4.1/applets/wncklet/window-list.c gnome-panel-2.4.1-del1/applets/wncklet/window-list.c
--- gnome-panel-2.4.1/applets/wncklet/window-list.c	2003-07-02 19:58:45.000000000 -0400
+++ gnome-panel-2.4.1-del1/applets/wncklet/window-list.c	2003-11-08 20:48:14.000000000 -0500
@@ -32,6 +32,7 @@
 
 #include "egg-screen-help.h"
 
+
 typedef struct {
 	GtkWidget *applet;
 	GtkWidget *tasklist;
@@ -40,6 +41,7 @@
 
 	gboolean include_all_workspaces;
 	WnckTasklistGroupingType grouping;
+	WnckTasklistSortingType sorting;
 	gboolean move_unminimized_windows;
   
 	GtkOrientation orientation;
@@ -57,13 +59,16 @@
 	GtkWidget *always_group_radio;
 	GtkWidget *move_minimized_radio;
 	GtkWidget *change_workspace_radio;
+	GtkWidget *dont_sort_radio;
+	GtkWidget *application_sort_radio;
 
-	GtkWidget *minimum_size_spin;
 	GtkWidget *maximum_size_spin;
+	GtkWidget *minimum_buttons_size_spin;
+	GtkWidget *maximum_buttons_size_spin;
 	GtkWidget *about;
 
 	/* gconf listeners id */
-	guint listeners [5];
+	guint listeners [7];
 } TasklistData;
 
 static void display_properties_dialog (BonoboUIComponent *uic,
@@ -75,20 +80,20 @@
 static void display_about_dialog      (BonoboUIComponent *uic,
 				       TasklistData      *tasklist,
 				       const gchar       *verbname);
-
 static void
 tasklist_update (TasklistData *tasklist)
 {
 	if (tasklist->orientation == GTK_ORIENTATION_HORIZONTAL) {
-		gtk_widget_set_size_request (GTK_WIDGET (tasklist->tasklist),
-					     -1, tasklist->size);
+		wnck_tasklist_set_minimum_height (WNCK_TASKLIST (tasklist->tasklist), tasklist->size);
 	} else {
-		gtk_widget_set_size_request (GTK_WIDGET (tasklist->tasklist),
-					     tasklist->size, -1);
+		wnck_tasklist_set_minimum_width (WNCK_TASKLIST (tasklist->tasklist), tasklist->size);
 	}
-
+	wnck_tasklist_set_orientation (WNCK_TASKLIST (tasklist->tasklist),
+				       tasklist->orientation);
 	wnck_tasklist_set_grouping (WNCK_TASKLIST (tasklist->tasklist),
 				    tasklist->grouping);
+	wnck_tasklist_set_sorting_type (WNCK_TASKLIST (tasklist->tasklist),
+				    tasklist->sorting);
 	wnck_tasklist_set_include_all_workspaces (WNCK_TASKLIST (tasklist->tasklist),
 						  tasklist->include_all_workspaces);
 	wnck_tasklist_set_switch_workspace_on_unminimize (WNCK_TASKLIST (tasklist->tasklist),
@@ -231,7 +236,12 @@
 		return;
 
 	tasklist->size = size;
-	
+	if (tasklist->orientation == GTK_ORIENTATION_HORIZONTAL) {
+                wnck_tasklist_set_minimum_height (WNCK_TASKLIST (tasklist->tasklist), tasklist->size);
+        }
+	else {
+		wnck_tasklist_set_minimum_width (WNCK_TASKLIST (tasklist->tasklist), tasklist->size);
+	}
 	tasklist_update (tasklist);
 }
 
@@ -248,6 +258,8 @@
 	gconf_client_notify_remove (client, tasklist->listeners[2]);
 	gconf_client_notify_remove (client, tasklist->listeners[3]);
 	gconf_client_notify_remove (client, tasklist->listeners[4]);
+	gconf_client_notify_remove (client, tasklist->listeners[5]);
+	gconf_client_notify_remove (client, tasklist->listeners[6]);
 
 	g_object_unref (G_OBJECT (client));
 	
@@ -256,6 +268,8 @@
 	tasklist->listeners[2] = 0;
 	tasklist->listeners[3] = 0;
 	tasklist->listeners[4] = 0;
+	tasklist->listeners[5] = 0;
+	tasklist->listeners[6] = 0;
 
 	if (tasklist->properties_dialog)
 		gtk_widget_destroy (tasklist->properties_dialog);
@@ -336,6 +350,24 @@
 	return type;
 }
 
+static WnckTasklistSortingType
+get_sorting_type (GConfValue *value)
+{
+	WnckTasklistSortingType type = -1;
+	const char *str;
+
+	g_assert (value != NULL);
+
+	/* Backwards compat for old type: */
+	str = gconf_value_get_string (value);
+	if (g_ascii_strcasecmp (str, "dont_sort") == 0) {
+		type = WNCK_TASKLIST_DONT_SORT;
+	} else if (g_ascii_strcasecmp (str, "application_sort") == 0) {
+		type = WNCK_TASKLIST_APPLICATION_SORT;
+	}
+	return type;
+}
+
 static GtkWidget *
 get_grouping_button (TasklistData *tasklist,
 		     WnckTasklistGroupingType type)
@@ -354,6 +386,21 @@
 	}
 }
 
+static GtkWidget *
+get_sorting_button (TasklistData *tasklist,
+		     WnckTasklistSortingType type)
+{
+	switch (type) {
+	default:
+	case WNCK_TASKLIST_DONT_SORT:
+		return tasklist->dont_sort_radio;
+		break;
+	case WNCK_TASKLIST_APPLICATION_SORT:
+		return tasklist->application_sort_radio;
+		break;
+	}
+}
+
 static void
 group_windows_changed (GConfClient  *client,
 		       guint         cnxn_id,
@@ -385,6 +432,35 @@
 }
 
 static void
+sorting_type_changed (GConfClient  *client,
+		       guint         cnxn_id,
+		       GConfEntry   *entry,
+		       TasklistData *tasklist)
+{
+	WnckTasklistSortingType type;
+	GtkWidget *button;
+
+	if (!entry->value ||
+	    (entry->value->type != GCONF_VALUE_STRING))
+		return;
+
+	type = get_sorting_type (entry->value);
+	if (type == -1) {
+		g_warning ("tasklist: Unknown value for GConf key 'sorting_type'");
+		return;
+	}
+		
+	tasklist->sorting = type;
+	tasklist_update (tasklist);
+
+	button = get_sorting_button (tasklist, type);
+        if (button &&
+	    !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) {
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+	}
+}
+
+static void
 tasklist_update_unminimization_radio (TasklistData *tasklist)
 {
 	GtkWidget *button;
@@ -422,19 +498,41 @@
 	tasklist_update_unminimization_radio (tasklist);
 }
 
-/* GConf callback for changes in minimum_size */
+/* GConf callback for changes in maximum_size */
+static void
+maximum_size_changed (GConfClient  *client, guint cnxn_id,
+                      GConfEntry   *entry, TasklistData *tasklist)
+{
+	gint value;
+	GtkSpinButton *button;
+
+	if (!tasklist->maximum_size_spin)
+		return;
+
+	button = GTK_SPIN_BUTTON (tasklist->maximum_size_spin);
+	if (!entry->value || entry->value->type != GCONF_VALUE_INT)
+		return;
+	
+	value = gconf_value_get_int (entry->value);
+
+	gtk_spin_button_set_value (button, value);
+	tasklist->maximum_size = value;
+        gtk_widget_queue_resize (GTK_WIDGET (tasklist->applet));
+}
+
+/* GConf callback for changes in minimum_buttons_size */
 static void
-minimum_size_changed (GConfClient *client, guint cnxn_id,
+minimum_buttons_size_changed (GConfClient *client, guint cnxn_id,
 		      GConfEntry *entry, TasklistData *tasklist)
 {
     	WnckTasklist *wncktl = WNCK_TASKLIST (tasklist->tasklist);
 	gint value;
 	GtkSpinButton *button;
 
-	if (!tasklist->minimum_size_spin)
+	if (!tasklist->minimum_buttons_size_spin)
 		return;
 
-	button = GTK_SPIN_BUTTON (tasklist->minimum_size_spin);
+	button = GTK_SPIN_BUTTON (tasklist->minimum_buttons_size_spin);
 
 	if (!entry->value || entry->value->type != GCONF_VALUE_INT)
 		return;
@@ -442,34 +540,30 @@
 	value = gconf_value_get_int (entry->value);
 	
 	gtk_spin_button_set_value (button, value);
-	if (tasklist->orientation == GTK_ORIENTATION_HORIZONTAL)
-		wnck_tasklist_set_minimum_width (wncktl, value);
-	else
-		wnck_tasklist_set_minimum_height (wncktl, value);
+	wnck_tasklist_set_minimum_buttons_width (wncktl, value);
 }
 
-/* GConf callback for changes in maximum_size */
+/* GConf callback for changes in maximum_buttons_size */
 static void
-maximum_size_changed (GConfClient  *client, guint cnxn_id,
+maximum_buttons_size_changed (GConfClient  *client, guint cnxn_id,
                       GConfEntry   *entry, TasklistData *tasklist)
 {
+	WnckTasklist *wncktl = WNCK_TASKLIST (tasklist->tasklist);
 	gint value;
 	GtkSpinButton *button;
 
-	if (!tasklist->maximum_size_spin)
+	if (!tasklist->maximum_buttons_size_spin)
 		return;
 
-	button = GTK_SPIN_BUTTON (tasklist->maximum_size_spin);
+	button = GTK_SPIN_BUTTON (tasklist->maximum_buttons_size_spin);
 	if (!entry->value || entry->value->type != GCONF_VALUE_INT)
 		return;
 	
 	value = gconf_value_get_int (entry->value);
 
 	gtk_spin_button_set_value (button, value);
-	tasklist->maximum_size = value;
-        gtk_widget_queue_resize (GTK_WIDGET (tasklist->applet));
-}
-    
+	wnck_tasklist_set_maximum_buttons_width (wncktl, value);
+}   
 static void
 setup_gconf (TasklistData *tasklist)
 {
@@ -495,27 +589,40 @@
 	g_free (key);
 
 	key = panel_applet_gconf_get_full_key (PANEL_APPLET (tasklist->applet),
-					       "move_unminimized_windows");
-	tasklist->listeners[2] = gconf_client_notify_add(client, key,
-				(GConfClientNotifyFunc)move_unminimized_windows_changed,
+					       "sorting_type");
+	tasklist->listeners[4] = gconf_client_notify_add(client, key,
+				(GConfClientNotifyFunc)sorting_type_changed,
 				tasklist,
 				NULL, NULL);
 	g_free (key);
-	
+
 	key = panel_applet_gconf_get_full_key (PANEL_APPLET (tasklist->applet),
-					       "minimum_size");
-	tasklist->listeners[3] = gconf_client_notify_add(client, key,
-				(GConfClientNotifyFunc)minimum_size_changed,
+					       "move_unminimized_windows");
+	tasklist->listeners[2] = gconf_client_notify_add(client, key,
+				(GConfClientNotifyFunc)move_unminimized_windows_changed,
 				tasklist,
 				NULL, NULL);
 	g_free (key);
+	
 	key = panel_applet_gconf_get_full_key (PANEL_APPLET (tasklist->applet),
 					       "maximum_size");
-	tasklist->listeners[4] = gconf_client_notify_add(client, key,
+	tasklist->listeners[3] = gconf_client_notify_add(client, key,
 				(GConfClientNotifyFunc)maximum_size_changed,
 				tasklist,
 				NULL, NULL);
 	g_free (key);
+	key = panel_applet_gconf_get_full_key (PANEL_APPLET (tasklist->applet),
+					       "maximum_buttons_size");
+	tasklist->listeners[5] = gconf_client_notify_add(client, key,
+				 (GConfClientNotifyFunc)maximum_buttons_size_changed,
+				 tasklist,
+				 NULL, NULL);
+	key = panel_applet_gconf_get_full_key (PANEL_APPLET (tasklist->applet),
+					       "minimum_buttons_size");
+	tasklist->listeners[6] = gconf_client_notify_add(client, key,
+				 (GConfClientNotifyFunc)minimum_buttons_size_changed,
+				 tasklist,
+				 NULL, NULL);
 
 	g_object_unref (G_OBJECT (client));
 }
@@ -525,48 +632,26 @@
 		     GtkRequisition *requisition,
 		     TasklistData   *tasklist)
 {
-	int len;
-	const int *size_hints;
 	GtkRequisition child_req;
-	int i;
-	int maximum_size;
 	int *new_size_hints;
-	int new_len = 0;
     	WnckTasklist *wncktl = WNCK_TASKLIST (tasklist->tasklist);
 	gint minimum_size = 0;
 	
-	
 	if (tasklist->orientation == GTK_ORIENTATION_HORIZONTAL)
 		minimum_size = wnck_tasklist_get_minimum_width (wncktl);
 	else
 		minimum_size = wnck_tasklist_get_minimum_height (wncktl);
 	
 	gtk_widget_get_child_requisition (tasklist->applet, &child_req);
+	requisition->width=0;
+	requisition->height=0;
 	
-	size_hints = wnck_tasklist_get_size_hint_list (wncktl, &len);
-	new_size_hints = g_new0 (int, len);
-	
-	/* size_hints is an array of (max, min) int pairs
-	 * where min(i) > max (i+1)
-	 * convert it to clipped values
-	 */
-	maximum_size = tasklist->maximum_size - minimum_size;
-	g_assert (maximum_size >= 0);
-
-	for (i = 0; i < len; i += 2) {
-		if (size_hints[i + 1] <= maximum_size) {
-		        /* this one should be stored */
-			if (size_hints[i] > maximum_size)
-			    	new_size_hints[new_len] = maximum_size;
-			else
-				new_size_hints[new_len] = size_hints[i];
-			new_size_hints[new_len + 1] = size_hints[i + 1];
-			new_len += 2;
-		}
-	}
+	new_size_hints = g_new0 (int, 2);
+	new_size_hints[1] = 0;
+	new_size_hints[0] = tasklist->maximum_size;
         panel_applet_set_size_hints (PANEL_APPLET (tasklist->applet),
 		                     new_size_hints, 
-				     new_len, child_req.width - 1);
+				     2, child_req.width - 1);
 	g_free (new_size_hints);
 }
 
@@ -637,7 +722,21 @@
 	}
 	if (tasklist->grouping < 0)
 		tasklist->grouping = WNCK_TASKLIST_AUTO_GROUP; /* Default value */
+
+	
+	error = NULL;
+	tasklist->sorting = -1;
+	value = panel_applet_gconf_get_value (applet, "sorting_type", &error);
+	if (error) {
+		g_error_free (error);
+	} else if (value) {
+		tasklist->sorting = get_sorting_type (value);
+		gconf_value_free (value);
+	}
+	if (tasklist->sorting < 0)
+		tasklist->sorting = WNCK_TASKLIST_DONT_SORT; /* Default value */
 	
+
 	error = NULL;
 	tasklist->move_unminimized_windows = panel_applet_gconf_get_bool (applet, "move_unminimized_windows", &error);
 	if (error) {
@@ -672,25 +771,32 @@
         
 	/* get size preferences */
 	error = NULL;
-	sizepref = panel_applet_gconf_get_int (applet, "minimum_size", &error);
+	sizepref = panel_applet_gconf_get_int (applet, "maximum_size", &error);
 	if (error) {
-		sizepref = 50; /* Default value */
+		sizepref = 4096; /* Default value */
 		g_error_free (error);
 	}
 
-	if (tasklist->orientation == GTK_ORIENTATION_HORIZONTAL)
-		wnck_tasklist_set_minimum_width (WNCK_TASKLIST (tasklist->tasklist), sizepref);	  
-	else
-		wnck_tasklist_set_minimum_height (WNCK_TASKLIST (tasklist->tasklist), sizepref);	  
+	tasklist->maximum_size = sizepref;
 
+	/* get buttons size preference */
 	error = NULL;
-	sizepref = panel_applet_gconf_get_int (applet, "maximum_size", &error);
+	sizepref = panel_applet_gconf_get_int (applet, "minimum_buttons_size", &error);
 	if (error) {
-		sizepref = 4096; /* Default value */
+		sizepref = 10; /* Default value */
 		g_error_free (error);
 	}
 
-	tasklist->maximum_size = sizepref;
+	wnck_tasklist_set_minimum_buttons_width (WNCK_TASKLIST (tasklist->tasklist), sizepref);	  
+
+	error = NULL;
+	sizepref = panel_applet_gconf_get_int (applet, "maximum_buttons_size", &error);
+	if (error) {
+		sizepref = 150; /* Default value */
+		g_error_free (error);
+	}
+	wnck_tasklist_set_maximum_buttons_width (WNCK_TASKLIST (tasklist->tasklist), sizepref);	  
+
 
 	g_signal_connect (G_OBJECT (tasklist->tasklist), "destroy",
 			  G_CALLBACK (destroy_tasklist),
@@ -832,6 +938,20 @@
 					       NULL);
 	}
 }
+
+static void
+sorting_type_toggled (GtkToggleButton *button,
+		      TasklistData    *tasklist)
+{
+	if (gtk_toggle_button_get_active (button)) {
+		char *str;
+		str = g_object_get_data (G_OBJECT (button), "sorting_type");
+		panel_applet_gconf_set_string (PANEL_APPLET (tasklist->applet),
+					       "sorting_type", str,
+					       NULL);
+	}
+}
+
 static void
 move_minimized_toggled (GtkToggleButton *button,
 			TasklistData    *tasklist)
@@ -851,42 +971,80 @@
 				     NULL);
 }
 
-/* called when minimum width spin button is changed
+/* called when maximum width spin button is changed
+ * check if we drop below min width
+ * saves numeric GConf preference values
+ */
+static void
+spin_maximum_size_changed (GtkSpinButton *button, TasklistData *tasklist)
+{
+	GtkSpinButton *min_b_b = GTK_SPIN_BUTTON (tasklist->minimum_buttons_size_spin);
+	GtkSpinButton *max_b_b = GTK_SPIN_BUTTON (tasklist->maximum_buttons_size_spin);
+	PanelApplet *applet = PANEL_APPLET (tasklist->applet);
+	gint prop_value = gtk_spin_button_get_value (button);
+	gint min_size = gtk_spin_button_get_value (min_b_b);
+	gint max_size = gtk_spin_button_get_value (max_b_b);
+	/* check if we drop below min width */
+	if (prop_value < min_size)
+		panel_applet_gconf_set_int (applet, "minimum_buttons_size", 
+					    prop_value, NULL);
+	min_size = gtk_spin_button_get_value (max_b_b);
+	if (prop_value < max_size)
+		panel_applet_gconf_set_int (applet, "maximum_buttons_size", 
+					    prop_value, NULL);
+	panel_applet_gconf_set_int (applet, "maximum_size", prop_value, NULL);
+}
+
+/* called when minimum buttons size spin button is changed
  * check if it exceeds max width
  * saves numeric GConf preference values
  */
 static void
-spin_minimum_size_changed (GtkSpinButton *button, TasklistData *tasklist)
+spin_minimum_buttons_size_changed (GtkSpinButton *button, TasklistData *tasklist)
 {
+	GtkSpinButton *max_b_b = GTK_SPIN_BUTTON (tasklist->maximum_buttons_size_spin);
 	GtkSpinButton *max_b = GTK_SPIN_BUTTON (tasklist->maximum_size_spin);
 	PanelApplet *applet = PANEL_APPLET (tasklist->applet);
 	gint prop_value = gtk_spin_button_get_value (button);
-	gint max_size = gtk_spin_button_get_value (max_b);
+	gint max_size = gtk_spin_button_get_value (max_b_b);
+	
+	/* check if we exceed max width */
+	if (prop_value > max_size)
+	        panel_applet_gconf_set_int (applet, "maximum_buttons_size", 
+			                    prop_value, NULL);
+
+	max_size = gtk_spin_button_get_value (max_b);
 	
 	/* check if we exceed max width */
 	if (prop_value > max_size)
 	        panel_applet_gconf_set_int (applet, "maximum_size", 
 			                    prop_value, NULL);
-	panel_applet_gconf_set_int (applet, "minimum_size", prop_value, NULL);
+	panel_applet_gconf_set_int (applet, "minimum_buttons_size", prop_value, NULL);
 }
 
-/* called when maximum width spin button is changed
+/* called when maximum buttons size spin button is changed
  * check if we drop below min width
  * saves numeric GConf preference values
  */
 static void
-spin_maximum_size_changed (GtkSpinButton *button, TasklistData *tasklist)
+spin_maximum_buttons_size_changed (GtkSpinButton *button, TasklistData *tasklist)
 {
-	GtkSpinButton *min_b = GTK_SPIN_BUTTON (tasklist->minimum_size_spin);
+	GtkSpinButton *min_b_b = GTK_SPIN_BUTTON (tasklist->minimum_buttons_size_spin);
+	GtkSpinButton *max_b = GTK_SPIN_BUTTON (tasklist->maximum_size_spin);
 	PanelApplet *applet = PANEL_APPLET (tasklist->applet);
 	gint prop_value = gtk_spin_button_get_value (button);
-	gint min_size = gtk_spin_button_get_value (min_b);
+	gint min_size = gtk_spin_button_get_value (min_b_b);
+	gint max_size = gtk_spin_button_get_value (max_b);
 
 	/* check if we drop below min width */
 	if (prop_value < min_size)
-		panel_applet_gconf_set_int (applet, "minimum_size", 
+		panel_applet_gconf_set_int (applet, "minimum_buttons_size", 
 					    prop_value, NULL);
-	panel_applet_gconf_set_int (applet, "maximum_size", prop_value, NULL);
+	if (prop_value > max_size)
+		panel_applet_gconf_set_int (applet, "maximum_size", 
+					    prop_value, NULL);
+
+	panel_applet_gconf_set_int (applet, "maximum_buttons_size", prop_value, NULL);
 }
 
 static void
@@ -959,6 +1117,16 @@
 			   "always_group_radio",
 			   "group_windows" /* key */);
 
+	tasklist->dont_sort_radio = WID ("dont_sort_radio");
+	tasklist->application_sort_radio = WID ("application_sort_radio");
+
+	setup_sensitivity (tasklist, client, xml,
+			   "dont_sort_radio",
+			   "application_sort_radio",
+			   NULL,
+			   "sorting_type" /* key */);
+
+
 	tasklist->move_minimized_radio = WID ("move_minimized_radio");
 	tasklist->change_workspace_radio = WID ("change_workspace_radio");
 
@@ -968,13 +1136,6 @@
 			   NULL,
 			   "move_unminimized_windows" /* key */);
 
-	tasklist->minimum_size_spin = WID ("minimum_size");
-	setup_sensitivity (tasklist, client, xml,
-			   "minimum_size",
-			   "minimum_size_label",
-			   "minimum_size_post_label",
-			   "minimum_size" /* key */);
-
 	tasklist->maximum_size_spin = WID ("maximum_size");
 	setup_sensitivity (tasklist, client, xml,
 			   "maximum_size",
@@ -982,6 +1143,21 @@
 			   "maximum_size_post_label",
 			   "maximum_size" /* key */);
 
+	tasklist->minimum_buttons_size_spin = WID ("minimum_buttons_size");
+	setup_sensitivity (tasklist, client, xml,
+			   "minimum_buttons_size",
+			   "minimum_buttons_size_label",
+			   "minimum_buttons_size_post_label",
+			   "minimum_buttons_size" /* key */);
+	tasklist->maximum_buttons_size_spin = WID ("maximum_buttons_size");
+	setup_sensitivity (tasklist, client, xml,
+			   "maximum_buttons_size",
+			   "maximum_buttons_size_label",
+			   "maximum_buttons_size_post_label",
+			   "maximum_buttons_size" /* key */);
+
+
+
 	/* Window grouping: */
 	button = get_grouping_button (tasklist, tasklist->grouping);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
@@ -992,14 +1168,27 @@
 	g_object_set_data (G_OBJECT (tasklist->always_group_radio),
 			   "group_value", "always");
 	error = NULL;
+	/* Window sorting: */
+	button = get_sorting_button (tasklist, tasklist->sorting);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
+	g_object_set_data (G_OBJECT (tasklist->dont_sort_radio),
+			   "sorting_type", "dont_sort");
+	g_object_set_data (G_OBJECT (tasklist->application_sort_radio),
+			   "sorting_type", "application_sort");
+	error = NULL;
+
 	/* FIXME: what does one do in case of errors here ? */
 	sizepref = panel_applet_gconf_get_int (PANEL_APPLET (tasklist->applet), 
-	    				       "minimum_size", NULL);
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (tasklist->minimum_size_spin), sizepref);
-	sizepref = panel_applet_gconf_get_int (PANEL_APPLET (tasklist->applet), 
 	    				       "maximum_size", NULL);
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (tasklist->maximum_size_spin), sizepref);
 
+	sizepref = panel_applet_gconf_get_int (PANEL_APPLET (tasklist->applet),
+					       "minimum_buttons_size", NULL);
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (tasklist->minimum_buttons_size_spin), sizepref);
+	sizepref = panel_applet_gconf_get_int (PANEL_APPLET (tasklist->applet),
+					       "maximum_buttons_size", NULL);
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (tasklist->maximum_buttons_size_spin), sizepref);
+
 	g_signal_connect (G_OBJECT (tasklist->never_group_radio), "toggled",
 			  (GCallback) group_windows_toggled, tasklist);
 	g_signal_connect (G_OBJECT (tasklist->auto_group_radio), "toggled",
@@ -1007,6 +1196,11 @@
 	g_signal_connect (G_OBJECT (tasklist->always_group_radio), "toggled",
 			  (GCallback) group_windows_toggled, tasklist);
 
+	g_signal_connect (G_OBJECT (tasklist->dont_sort_radio), "toggled",
+			  (GCallback) sorting_type_toggled, tasklist);
+	g_signal_connect (G_OBJECT (tasklist->application_sort_radio), "toggled",
+			  (GCallback) sorting_type_toggled, tasklist);
+
 	/* move window when unminimizing: */
 	tasklist_update_unminimization_radio (tasklist);
 	g_signal_connect (G_OBJECT (tasklist->move_minimized_radio), "toggled",
@@ -1017,14 +1211,24 @@
 	g_signal_connect (G_OBJECT (tasklist->show_all_radio), "toggled",
 			  (GCallback) display_all_workspaces_toggled, tasklist);
 
-	g_signal_connect (G_OBJECT (tasklist->minimum_size_spin), 
-		          "value_changed", 
-			  (GCallback) spin_minimum_size_changed,
-			  tasklist);
 	g_signal_connect (G_OBJECT (tasklist->maximum_size_spin), 
 		          "value_changed", 
 			  (GCallback) spin_maximum_size_changed,
 			  tasklist);
+
+	g_signal_connect (G_OBJECT (tasklist->minimum_buttons_size_spin),
+			  "value_changed",
+			  (GCallback) spin_minimum_buttons_size_changed,
+			  tasklist);
+
+	g_signal_connect (G_OBJECT (tasklist->maximum_buttons_size_spin),
+			  "value_changed",
+			  (GCallback) spin_maximum_buttons_size_changed,
+			  tasklist);
+
+
+
+
 	g_signal_connect_swapped (WID ("done_button"), "clicked",
 				  (GCallback) gtk_widget_hide, 
 				  tasklist->properties_dialog);
diff -r -u gnome-panel-2.4.1/applets/wncklet/window-list.glade gnome-panel-2.4.1-del1/applets/wncklet/window-list.glade
--- gnome-panel-2.4.1/applets/wncklet/window-list.glade	2003-08-20 05:18:37.000000000 -0400
+++ gnome-panel-2.4.1-del1/applets/wncklet/window-list.glade	2003-11-07 14:32:42.000000000 -0500
@@ -209,15 +209,15 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkVBox" id="vbox11">
+		    <widget class="GtkVBox" id="vbox18">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label3">
+			<widget class="GtkLabel" id="label23">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Window Grouping&lt;/b&gt;</property>
+			  <property name="label" translatable="yes">&lt;b&gt;Restoring Minimized Windows&lt;/b&gt;</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -236,13 +236,13 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkHBox" id="hbox5">
+			<widget class="GtkHBox" id="hbox15">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">0</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="label11">
+			    <widget class="GtkLabel" id="label24">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">    </property>
 			      <property name="use_underline">False</property>
@@ -263,40 +263,21 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkVBox" id="vbox12">
+			    <widget class="GtkVBox" id="vbox19">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
 			      <property name="spacing">6</property>
 
 			      <child>
-				<widget class="GtkRadioButton" id="never_group_radio">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Never group windows</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkRadioButton" id="auto_group_radio">
+				<widget class="GtkRadioButton" id="move_minimized_radio">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Group windows when _space is limited</property>
+				  <property name="label" translatable="yes">Restore to current _workspace</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <property name="group">never_group_radio</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -306,16 +287,16 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkRadioButton" id="always_group_radio">
+				<widget class="GtkRadioButton" id="change_workspace_radio">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Always group windows</property>
+				  <property name="label" translatable="yes">Restore to na_tive workspace</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <property name="group">never_group_radio</property>
+				  <property name="group">move_minimized_radio</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -354,7 +335,7 @@
 		      <child>
 			<widget class="GtkLabel" id="label2">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Restoring Minimized Windows&lt;/b&gt;</property>
+			  <property name="label" translatable="yes">&lt;b&gt;Windows Sorting&lt;/b&gt;</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -406,10 +387,10 @@
 			      <property name="spacing">6</property>
 
 			      <child>
-				<widget class="GtkRadioButton" id="move_minimized_radio">
+				<widget class="GtkRadioButton" id="dont_sort_radio">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Restore to current _workspace</property>
+				  <property name="label" translatable="yes">Do _not sort windows</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="active">False</property>
@@ -424,16 +405,16 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkRadioButton" id="change_workspace_radio">
+				<widget class="GtkRadioButton" id="application_sort_radio">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Restore to na_tive workspace</property>
+				  <property name="label" translatable="yes">Sort windows by _application</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <property name="group">move_minimized_radio</property>
+				  <property name="group">dont_sort_radio</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -479,7 +460,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label12">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Behavior</property>
+	      <property name="label" translatable="yes">Content</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -503,7 +484,7 @@
 	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label4">
+		<widget class="GtkLabel" id="label25">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes">&lt;b&gt;Window List Size&lt;/b&gt;</property>
 		  <property name="use_underline">False</property>
@@ -559,16 +540,16 @@
 		      <child>
 			<widget class="GtkTable" id="table2">
 			  <property name="visible">True</property>
-			  <property name="n_rows">2</property>
+			  <property name="n_rows">3</property>
 			  <property name="n_columns">2</property>
 			  <property name="homogeneous">False</property>
 			  <property name="row_spacing">6</property>
 			  <property name="column_spacing">12</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="minimum_size_label">
+			    <widget class="GtkLabel" id="label26">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">M_inimum size:</property>
+			      <property name="label" translatable="yes">Ma_ximum size:</property>
 			      <property name="use_underline">True</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -578,7 +559,6 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">minimum_size</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -591,9 +571,65 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkLabel" id="maximum_size_label">
+			    <widget class="GtkHBox" id="hbox16">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Ma_ximum size:</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">6</property>
+
+			      <child>
+				<widget class="GtkSpinButton" id="maximum_size">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="climb_rate">1</property>
+				  <property name="digits">0</property>
+				  <property name="numeric">False</property>
+				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+				  <property name="snap_to_ticks">False</property>
+				  <property name="wrap">False</property>
+				  <property name="adjustment">512 0 4096 1 10 0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label27">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">pixels</property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="label28">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">M_inimum buttons size:</property>
 			      <property name="use_underline">True</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -603,7 +639,6 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">maximum_size</property>
 			    </widget>
 			    <packing>
 			      <property name="left_attach">0</property>
@@ -616,13 +651,13 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox7">
+			    <widget class="GtkHBox" id="hbox17">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
 			      <property name="spacing">6</property>
 
 			      <child>
-				<widget class="GtkSpinButton" id="minimum_size">
+				<widget class="GtkSpinButton" id="minimum_buttons_size">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
 				  <property name="climb_rate">1</property>
@@ -631,7 +666,7 @@
 				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 				  <property name="snap_to_ticks">False</property>
 				  <property name="wrap">False</property>
-				  <property name="adjustment">128 0 4096 1 10 10</property>
+				  <property name="adjustment">128 0 4096 1 10 0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -641,7 +676,7 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkLabel" id="minimum_size_post_label">
+				<widget class="GtkLabel" id="label29">
 				  <property name="visible">True</property>
 				  <property name="label" translatable="yes">pixels</property>
 				  <property name="use_underline">False</property>
@@ -664,20 +699,45 @@
 			    <packing>
 			      <property name="left_attach">1</property>
 			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
 			      <property name="y_options">fill</property>
 			    </packing>
 			  </child>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox8">
+			    <widget class="GtkLabel" id="label30">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Ma_ximum buttons size:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkHBox" id="hbox18">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
 			      <property name="spacing">6</property>
 
 			      <child>
-				<widget class="GtkSpinButton" id="maximum_size">
+				<widget class="GtkSpinButton" id="maximum_buttons_size">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
 				  <property name="climb_rate">1</property>
@@ -686,7 +746,7 @@
 				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 				  <property name="snap_to_ticks">False</property>
 				  <property name="wrap">False</property>
-				  <property name="adjustment">256 0 4096 1 10 10</property>
+				  <property name="adjustment">256 0 4096 1 10 0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -696,7 +756,7 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkLabel" id="maximum_size_post_label">
+				<widget class="GtkLabel" id="label31">
 				  <property name="visible">True</property>
 				  <property name="label" translatable="yes">pixels</property>
 				  <property name="use_underline">False</property>
@@ -719,8 +779,8 @@
 			    <packing>
 			      <property name="left_attach">1</property>
 			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
 			      <property name="x_options">fill</property>
 			      <property name="y_options">fill</property>
 			    </packing>
@@ -746,6 +806,130 @@
 		  <property name="fill">True</property>
 		</packing>
 	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label32">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">&lt;b&gt;Window Grouping&lt;/b&gt;</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkHBox" id="hbox19">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="label33">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">    </property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkVBox" id="vbox20">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
+
+		      <child>
+			<widget class="GtkRadioButton" id="never_group_radio">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Never group windows</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkRadioButton" id="auto_group_radio">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Group windows when _space is limited</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <property name="group">never_group_radio</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkRadioButton" id="always_group_radio">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Always group windows</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <property name="group">never_group_radio</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="tab_expand">False</property>
@@ -756,7 +940,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label13">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Size</property>
+	      <property name="label" translatable="yes">Size and Behavior</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
Only in gnome-panel-2.4.1-del1/applets/wncklet: window-list.glade.bak
Only in gnome-panel-2.4.1-del1/applets/wncklet: window-list.gladep
Only in gnome-panel-2.4.1-del1/applets/wncklet: window-list.gladep.bak
Only in gnome-panel-2.4.1-del1/applets/wncklet: window-list.schemas
Only in gnome-panel-2.4.1-del1/applets/wncklet: workspace-switcher.schemas
Only in gnome-panel-2.4.1-del1/gnome-panel: gnome-panel-preferences.desktop
Only in gnome-panel-2.4.1-del1/gnome-panel: gnome-panel-screenshot.schemas
Only in gnome-panel-2.4.1-del1/gnome-panel: GNOME_Panel.server
Only in gnome-panel-2.4.1-del1/gnome-panel: panel-general.schemas
Only in gnome-panel-2.4.1-del1/gnome-panel: panel-global.schemas
Only in gnome-panel-2.4.1-del1/gnome-panel: panel-object.schemas
Only in gnome-panel-2.4.1-del1/gnome-panel: panel-toplevel.schemas
Only in gnome-panel-2.4.1: gnome-panel.spec
Only in gnome-panel-2.4.1-del1: intltool-extract
Only in gnome-panel-2.4.1-del1: intltool-merge
Only in gnome-panel-2.4.1-del1: intltool-update
Only in gnome-panel-2.4.1-del1/libpanel-applet: GNOME_Panel_TestApplet.server
