From 0b564cd4f984c0879efbaed7601d445b3f6e7201 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Feb 18 2010 00:28:01 +0000
Subject: also sort keyboard status icon


---

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 679f67c..c40f181 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -22,7 +22,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.29.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.29/%{name}-%{version}.tar.bz2
 
@@ -390,6 +390,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Feb 17 2010 Matthias Clasen <mclasen@redhat.com> 2.29.6-2
+- Update icon-order patch to sort keyboard, too
+
 * Thu Feb 11 2010 Matthias Clasen <mclasen@redhat.com> 2.29.6-1
 - Update to 2.29.6
 
diff --git a/icon-order.patch b/icon-order.patch
index 91325cf..fa5503b 100644
--- a/icon-order.patch
+++ b/icon-order.patch
@@ -1,6 +1,7 @@
---- gnome-panel-2.28.0/applets/notification_area/na-tray-child.c	2009-08-11 12:56:35.000000000 -0400
-+++ hacked/applets/notification_area/na-tray-child.c	2009-10-16 00:18:25.057041777 -0400
-@@ -428,3 +428,84 @@
+diff -up gnome-panel-2.29.6/applets/notification_area/na-tray-child.c.icon-order gnome-panel-2.29.6/applets/notification_area/na-tray-child.c
+--- gnome-panel-2.29.6/applets/notification_area/na-tray-child.c.icon-order	2010-01-13 22:26:27.000000000 -0500
++++ gnome-panel-2.29.6/applets/notification_area/na-tray-child.c	2010-02-17 19:08:47.471655712 -0500
+@@ -428,3 +428,84 @@ na_tray_child_force_redraw (NaTrayChild 
  #endif
      }
  }
@@ -85,9 +86,10 @@
 +                res_class,
 +                res_name);
 +}
---- gnome-panel-2.28.0/applets/notification_area/na-tray-child.h	2009-08-11 12:55:28.000000000 -0400
-+++ hacked/applets/notification_area/na-tray-child.h	2009-10-16 00:19:19.841050913 -0400
-@@ -61,7 +61,10 @@
+diff -up gnome-panel-2.29.6/applets/notification_area/na-tray-child.h.icon-order gnome-panel-2.29.6/applets/notification_area/na-tray-child.h
+--- gnome-panel-2.29.6/applets/notification_area/na-tray-child.h.icon-order	2010-01-13 22:26:27.000000000 -0500
++++ gnome-panel-2.29.6/applets/notification_area/na-tray-child.h	2010-02-17 19:08:47.473682322 -0500
+@@ -61,7 +61,10 @@ char           *na_tray_child_get_title 
  gboolean        na_tray_child_has_alpha      (NaTrayChild *child);
  void            na_tray_child_set_composited (NaTrayChild *child,
                                                gboolean     composited);
@@ -99,9 +101,10 @@
  
  G_END_DECLS
  
---- gnome-panel-2.28.0/applets/notification_area/na-tray.c	2009-08-11 16:27:41.000000000 -0400
-+++ hacked/applets/notification_area/na-tray.c	2009-10-16 01:38:03.211041558 -0400
-@@ -117,6 +117,51 @@
+diff -up gnome-panel-2.29.6/applets/notification_area/na-tray.c.icon-order gnome-panel-2.29.6/applets/notification_area/na-tray.c
+--- gnome-panel-2.29.6/applets/notification_area/na-tray.c.icon-order	2010-01-13 22:26:27.000000000 -0500
++++ gnome-panel-2.29.6/applets/notification_area/na-tray.c	2010-02-17 19:11:27.056945278 -0500
+@@ -117,6 +117,52 @@ get_tray (TraysScreen *trays_screen)
    return trays_screen->all_trays->data;
  }
  
@@ -119,6 +122,7 @@
 +  "Gnome-volume-control-applet", "volume",
 +  "Nm-applet", "network",
 +  "Gnome-power-manager", "battery",
++  "keyboard", "keyboard",
 +  NULL,
 +};
 +
@@ -153,7 +157,7 @@
  static void
  tray_added (NaTrayManager *manager,
              GtkWidget     *icon,
-@@ -124,6 +169,11 @@
+@@ -124,6 +170,11 @@ tray_added (NaTrayManager *manager,
  {
    NaTray *tray;
    NaTrayPrivate *priv;
@@ -165,7 +169,7 @@
  
    tray = get_tray (trays_screen);
    if (tray == NULL)
-@@ -132,10 +182,45 @@
+@@ -132,10 +183,45 @@ tray_added (NaTrayManager *manager,
    priv = tray->priv;
  
    g_assert (priv->trays_screen == trays_screen);