[Xfce4-commits] <xfce4-panel:andrzejr/deskbar-github> pager: fixed layout errors introduced in the merge.

[Andrzej]

Updating branch refs/heads/andrzejr/deskbar-github
         to 0b8900bf7f5645b9a5f0872b27e5d333ce68c3ca (commit)
       from ec72a5650af6f975c7ef95ced9c90f0b1a751f68 (commit)

commit 0b8900bf7f5645b9a5f0872b27e5d333ce68c3ca
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Mon Dec 12 02:39:22 2011 +0900

    pager: fixed layout errors introduced in the merge.

 plugins/pager/pager.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index 37ed847..39f2cb3 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -312,7 +312,7 @@ pager_plugin_screen_layout_changed (PagerPlugin *plugin)
     }
 
   mode = xfce_panel_plugin_get_mode (XFCE_PANEL_PLUGIN (plugin));
-  orientation = (mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL) ?
+  orientation = (mode != XFCE_PANEL_PLUGIN_MODE_VERTICAL) ?
     GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
 
 
@@ -322,7 +322,7 @@ pager_plugin_screen_layout_changed (PagerPlugin *plugin)
       pager_wnck_set_display_mode (XFCE_PAGER_WNCK (plugin->pager), PAGER_WNCK_DISPLAY_CONTENT);
       if (!pager_wnck_set_n_rows (XFCE_PAGER_WNCK (plugin->pager), plugin->rows))
         g_message ("Setting the pager rows returned false. Maybe the setting is not applied.");
-      if (mode != XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
+      if (mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL)
         pager_wnck_set_layout_policy (XFCE_PAGER_WNCK (plugin->pager), PAGER_LAYOUT_POLICY_WIDTH_FOR_HEIGHT);
       else
         pager_wnck_set_layout_policy (XFCE_PAGER_WNCK (plugin->pager), PAGER_LAYOUT_POLICY_HEIGHT_FOR_WIDTH);
@@ -452,7 +452,7 @@ pager_plugin_mode_changed (XfcePanelPlugin      *panel_plugin,
   PagerPlugin *plugin = XFCE_PAGER_PLUGIN (panel_plugin);
   GtkOrientation orientation;
 
-  orientation = (mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL) ?
+  orientation = (mode != XFCE_PANEL_PLUGIN_MODE_VERTICAL) ?
     GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
 
   if (plugin->miniature_view)