[Xfce4-commits] <xfce4-panel:master> Pager: Fixing plugin->size updates.

[Nick Schermer]

Updating branch refs/heads/master
         to 93e0a36c3cc9e1495ff8204081dec1f3f6a624e7 (commit)
       from 7fdf98c87f22f6e1b55e89537d8be6b206e42df1 (commit)

commit 93e0a36c3cc9e1495ff8204081dec1f3f6a624e7
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Sun Jan 22 23:45:37 2012 +0900

    Pager: Fixing plugin->size updates.
    
    Error introduced in the commit with aspect ratio workaround.
    plugin->size was only updated in the deskbar-mode with WNCK pager.

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

diff --git a/plugins/pager/pager.c b/plugins/pager/pager.c
index 979df97..14be569 100644
--- a/plugins/pager/pager.c
+++ b/plugins/pager/pager.c
@@ -465,14 +465,17 @@ pager_plugin_size_changed (XfcePanelPlugin *panel_plugin,
 {
   PagerPlugin        *plugin = XFCE_PAGER_PLUGIN (panel_plugin);
 
-  /* request resize when using WNCK pager */
-  /* (its height depends on width)        */
-  if (plugin->miniature_view &&
-      plugin->size != size &&
-      xfce_panel_plugin_get_mode (panel_plugin) == XFCE_PANEL_PLUGIN_MODE_DESKBAR)
+  if (plugin->size != size)
     {
       plugin->size = size;
-      gtk_widget_queue_resize (GTK_WIDGET (panel_plugin));
+
+      /* request resize when using WNCK pager */
+      /* (its height depends on width)        */
+      if (plugin->miniature_view &&
+          xfce_panel_plugin_get_mode (panel_plugin) == XFCE_PANEL_PLUGIN_MODE_DESKBAR)
+        {
+          gtk_widget_queue_resize (GTK_WIDGET (panel_plugin));
+        }
     }
 
   /* do not set fixed size */