gnome-panel r11157 - trunk/gnome-panel

[vuntz svn gnome org]

Author: vuntz
Date: Mon Jun 30 16:25:09 2008
New Revision: 11157
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=11157&view=rev

Log:
2008-06-30  Vincent Untz  <vuntz gnome org>

	* launcher.c: (setup_button): fox crash when editing launcher
	properties on OS where NULL isn't a good idea in printf(). Patch by
	Marcel Telka <marcel telka sk>. Fix bug #528581.


Modified:
   trunk/gnome-panel/ChangeLog
   trunk/gnome-panel/launcher.c

Modified: trunk/gnome-panel/launcher.c
==============================================================================
--- trunk/gnome-panel/launcher.c	(original)
+++ trunk/gnome-panel/launcher.c	Mon Jun 30 16:25:09 2008
@@ -619,10 +619,12 @@
 						    "Comment");
 
 	/* Setup tooltip */
-	if (!PANEL_GLIB_STR_EMPTY (comment))
+	if (!PANEL_GLIB_STR_EMPTY (name) && !PANEL_GLIB_STR_EMPTY (comment))
 		str = g_strdup_printf ("%s\n%s", name, comment);
-	else
+	else if (!PANEL_GLIB_STR_EMPTY (name))
 		str = g_strdup (name);
+	else
+		str = g_strdup (comment);
 
 	g_free (name);
 	g_free (comment);