[Xfce4-commits] <xfce4-panel:andrzejr/deskbar2> launcher plugin: fixing a bug in the previous commit.

[Andrzej]

Updating branch refs/heads/andrzejr/deskbar2
         to 8a34b46a0569eb19d31055e8cdbe3d73c191df42 (commit)
       from 13cfa4cc7b5612af43f7a8eb2d2bcb8c60c5f9d3 (commit)

commit 8a34b46a0569eb19d31055e8cdbe3d73c191df42
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Thu Feb 9 20:53:28 2012 +0900

    launcher plugin: fixing a bug in the previous commit.
    
    The "small" property wasn't updated on disabling launcher label.

 plugins/launcher/launcher.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index 8af2ff5..f159d37 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -1709,17 +1709,17 @@ launcher_plugin_button_update (LauncherPlugin *plugin)
   if (G_LIKELY (plugin->items != NULL))
     item = GARCON_MENU_ITEM (plugin->items->data);
 
+  mode = xfce_panel_plugin_get_mode (XFCE_PANEL_PLUGIN (plugin));
+
+  /* disable the "small" property in the deskbar mode and the label visible */
+  if (G_UNLIKELY (plugin->show_label && mode == XFCE_PANEL_PLUGIN_MODE_DESKBAR))
+    xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (plugin), FALSE);
+  else
+    xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (plugin), TRUE);
+
   if (G_UNLIKELY (plugin->show_label))
     {
       panel_return_if_fail (GTK_IS_LABEL (plugin->child));
-      mode = xfce_panel_plugin_get_mode (XFCE_PANEL_PLUGIN (plugin));
-
-      /* disable the "small" property in the deskbar mode and the label visible */
-      if (mode == XFCE_PANEL_PLUGIN_MODE_DESKBAR &&
-          plugin->show_label)
-        xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (plugin), FALSE);
-      else
-        xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (plugin), TRUE);
 
       gtk_label_set_angle (GTK_LABEL (plugin->child),
                            (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ? 270 : 0);