[Xfce4-commits] r24104 - xfce4-panel/trunk/plugins/launcher

[Jasper Huijsmans]

Author: jasper
Date: 2006-12-14 18:56:25 +0000 (Thu, 14 Dec 2006)
New Revision: 24104

Modified:
   xfce4-panel/trunk/plugins/launcher/launcher.c
Log:
Don't think we know better when the user leaves name and description empty ;-) Bug #2661.

Modified: xfce4-panel/trunk/plugins/launcher/launcher.c
===================================================================
--- xfce4-panel/trunk/plugins/launcher/launcher.c	2006-12-14 08:30:11 UTC (rev 24103)
+++ xfce4-panel/trunk/plugins/launcher/launcher.c	2006-12-14 18:56:25 UTC (rev 24104)
@@ -736,20 +736,21 @@
     gtk_image_set_from_pixbuf (GTK_IMAGE (launcher->image), pb);
     g_object_unref (G_OBJECT (pb));
     
-    if (entry->name)
+    if (entry->name || entry->comment)
     {
-        if (entry->comment)
+        if (entry->name && entry->comment)
             g_snprintf (tip, 521, "%s\n%s", entry->name, entry->comment);
+        else if (entry->name)
+            g_strlcpy (tip, entry->name, 521);
         else
-            g_strlcpy (tip, entry->name, 521);
+            g_strlcpy (tip, entry->comment, 521);
 
+        gtk_tooltips_set_tip (launcher->tips, launcher->iconbutton, tip, NULL);
     }
     else
     {
-        g_strlcpy (tip, _("This item has not yet been configured"), 512);
+        gtk_tooltips_set_tip (launcher->tips, launcher->iconbutton, NULL, NULL);
     }
-
-    gtk_tooltips_set_tip (launcher->tips, launcher->iconbutton, tip, NULL);
 }
 
 static void