[Xfce4-commits] <xfce4-appfinder:master> Bug #8490, set single line label for icon sizes < "small"

[Andrzej]

Updating branch refs/heads/master
         to 5743612275c1b2828b11b3d665d2d787d193f782 (commit)
       from 53830d5029e3537a851fbb733198a2268561f18a (commit)

commit 5743612275c1b2828b11b3d665d2d787d193f782
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Tue Feb 21 18:30:55 2012 +0900

    Bug #8490, set single line label for icon sizes < "small"
    
    Effective only when icon_view=FALSE.

 src/appfinder-model.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/appfinder-model.c b/src/appfinder-model.c
index 9bce6e2..a1cc770 100644
--- a/src/appfinder-model.c
+++ b/src/appfinder-model.c
@@ -460,7 +460,12 @@ xfce_appfinder_model_get_value (GtkTreeModel *tree_model,
               comment = garcon_menu_item_get_comment (item->item);
 
               if (comment != NULL)
-                item->abstract = g_markup_printf_escaped ("<b>%s</b>\n%s", name, comment);
+                {
+                  if (model->icon_size < XFCE_APPFINDER_ICON_SIZE_SMALL)
+                    item->abstract = g_markup_printf_escaped ("<b>%s</b> — %s", name, comment);
+                  else
+                    item->abstract = g_markup_printf_escaped ("<b>%s</b>\n%s", name, comment);
+                }
               else
                 item->abstract = g_markup_printf_escaped ("<b>%s</b>", name);
             }
@@ -2085,6 +2090,12 @@ xfce_appfinder_model_icon_theme_changed (XfceAppfinderModel *model)
           item->icon_large = NULL;
           item_changed = TRUE;
         }
+      if (item->abstract != NULL)
+        {
+          g_free (item->abstract);
+          item->abstract = NULL;
+          item_changed = TRUE;
+        }
 
       if (item->item == NULL)
         {