[Xfce4-commits] <xfce4-panel:devel> Fix typo in the systray, backport from bug 5149.

[Nick Schermer]

Updating branch refs/heads/devel
         to aa799ce3908a38df74c05e53494ddfdd2b62d9d1 (commit)
       from e84edaa9d5515e551ffe10e8985332a6ae4a86f1 (commit)

commit aa799ce3908a38df74c05e53494ddfdd2b62d9d1
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Mar 25 21:36:00 2009 +0100

    Fix typo in the systray, backport from bug 5149.

 plugins/systray/systray-manager.c |   47 +++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/plugins/systray/systray-manager.c b/plugins/systray/systray-manager.c
index 2999885..9be223b 100644
--- a/plugins/systray/systray-manager.c
+++ b/plugins/systray/systray-manager.c
@@ -815,31 +815,28 @@ systray_manager_set_orientation (SystrayManager *manager,
   panel_return_if_fail (GTK_IS_INVISIBLE (manager->invisible));
   panel_return_if_fail (GDK_IS_WINDOW (manager->invisible->window));
 
-  if (G_LIKELY (manager->orientation != orientation))
-    {
-      /* set the new orientation */
-      manager->orientation = orientation;
-
-      /* get invisible display */
-      display = gtk_widget_get_display (manager->invisible);
-
-      /* get the xatom for the orientation property */
-      orientation_atom = gdk_x11_get_xatom_by_name_for_display (display,
-          "_NET_XFCE_SYSTRAY_MANAGER_ORIENTATION");
-
-      /* set the data we're going to send to x */
-      data[0] = (manager->orientation == GTK_ORIENTATION_HORIZONTAL ?
-                 XFCE_SYSTRAY_MANAGER_ORIENTATION_HORIZONTAL
-                 : XFCE_SYSTRAY_MANAGER_ORIENTATION_VERTICAL);
-
-      /* change the x property */
-      XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
-                       GDK_WINDOW_XWINDOW (manager->invisible->window),
-                       orientation_atom,
-                       XA_CARDINAL, 32,
-                       PropModeReplace,
-                       (guchar *) &data, 1);
-    }
+  /* set the new orientation */
+  manager->orientation = orientation;
+
+  /* get invisible display */
+  display = gtk_widget_get_display (manager->invisible);
+
+  /* get the xatom for the orientation property */
+  orientation_atom = gdk_x11_get_xatom_by_name_for_display (display,
+      "_NET_SYSTEM_TRAY_ORIENTATION");
+
+  /* set the data we're going to send to x */
+  data[0] = (manager->orientation == GTK_ORIENTATION_HORIZONTAL ?
+             XFCE_SYSTRAY_MANAGER_ORIENTATION_HORIZONTAL
+             : XFCE_SYSTRAY_MANAGER_ORIENTATION_VERTICAL);
+
+  /* change the x property */
+  XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
+                   GDK_WINDOW_XWINDOW (manager->invisible->window),
+                   orientation_atom,
+                   XA_CARDINAL, 32,
+                   PropModeReplace,
+                   (guchar *) &data, 1);
 }